[8.0] Migration of magentorepconnect_order_comment #174
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg | ||
| :alt: License | ||
|
|
||
| Sale order comments synchronisation | ||
| =================================== | ||
|
|
||
| Extension for **Magento Connector** | ||
|
|
||
| Features | ||
| -------- | ||
|
|
||
| * Import sale comments in the same time than 'sale order' | ||
| * Move messages from canceled order to replacing sale order (edited sale | ||
| order in magento) | ||
| * Export messages from OpenERP sale order to Magento comment | ||
| * Export of moved messages to Magento | ||
|
|
||
| Settings / options | ||
| ------------------ | ||
|
|
||
| * Ability to require Magento to send email to customer for each comment | ||
| received. Unactive by default (Connectors/Magento/Store menu). | ||
|
|
||
|
|
||
| .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas | ||
| :alt: Try me on Runbot | ||
| :target: https://runbot.odoo-community.org/runbot/107/8.0 | ||
|
|
||
| Bug Tracker | ||
| =========== | ||
|
|
||
| Bugs are tracked on `GitHub Issues | ||
| <https://github.com/OCA/connector-magento/issues>`_. In case of trouble, please | ||
| check there if your issue has already been reported. If you spotted it first, | ||
| help us smashing it by providing a detailed and welcomed `feedback | ||
| <https://github.com/OCA/ | ||
| connector-magento/issues/new?body=module:%20 | ||
| magentoerpconnect_order_comment%0Aversion:%20 | ||
| 8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
|
||
| Credits | ||
| ======= | ||
|
|
||
| Contributors | ||
| ------------ | ||
|
|
||
| * David BEAL | ||
| * Hugo Santos <[email protected]> | ||
|
|
||
| Maintainer | ||
| ---------- | ||
|
|
||
| .. image:: http://odoo-community.org/logo.png | ||
| :alt: Odoo Community Association | ||
| :target: http://odoo-community.org | ||
|
|
||
| This module is maintained by the OCA. | ||
|
|
||
| OCA, or the Odoo Community Association, is a nonprofit organization | ||
| whose mission is to support the collaborative development of Odoo | ||
| features and promote its widespread use. | ||
|
|
||
| To contribute to this module, please visit http://odoo-community.org. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,8 +18,7 @@ | |
| # | ||
| ############################################################################## | ||
|
|
||
| from openerp import models, fields, api, _ | ||
| from openerp.addons.connector.event import ( | ||
| on_record_write, | ||
| on_record_create) | ||
|
|
@@ -41,26 +40,24 @@ | |
| from bs4 import BeautifulSoup | ||
|
|
||
|
|
||
| class MailMessage(models.Model): | ||
| _inherit = "mail.message" | ||
|
|
||
| magento_sale_bind_ids = fields.One2many( | ||
| 'magento.sale.comment', | ||
| 'openerp_id', | ||
| string="Magento Bindings") | ||
|
|
||
|
|
||
| @on_record_create(model_names='mail.message') | ||
| def create_mail_message(session, model_name, record_id, vals): | ||
| if session.env.context.get('connector_no_export'): | ||
| return | ||
| if vals.get('model') == 'sale.order' and vals.get('subtype_id'): | ||
| order = session.env['sale.order'].browse(vals['res_id']) | ||
| for mag_sale in order.magento_bind_ids: | ||
| store = mag_sale.storeview_id.store_id | ||
| session.env['magento.sale.comment'].create({ | ||
| 'openerp_id': record_id, | ||
| 'subject': _('Sent to Magento'), | ||
| 'is_visible_on_front': True, | ||
|
|
@@ -69,7 +66,7 @@ def create_mail_message(session, model_name, record_id, vals): | |
| }) | ||
|
|
||
|
|
||
| class MagentoSaleOrder(models.Model): | ||
| """Allow to have a relation between | ||
| magento.sale.order and magento.sale.comment | ||
| like you have a relation between | ||
|
|
@@ -78,15 +75,13 @@ class magento_sale_order(orm.Model): | |
| """ | ||
| _inherit = 'magento.sale.order' | ||
|
|
||
| magento_order_comment_ids = fields.One2many( | ||
| 'magento.sale.comment', | ||
| 'magento_sale_order_id', | ||
| 'Magento Sale comments') | ||
|
|
||
|
|
||
| class MagentoSaleComment(models.Model): | ||
| _name = 'magento.sale.comment' | ||
| _inherit = 'magento.binding' | ||
| _description = 'Magento Sale Comment' | ||
|
|
@@ -96,66 +91,47 @@ class magento_sale_comment(orm.Model): | |
| "sale comment on Magento. \nPlease refer to the Magento " \ | ||
| "documentation for details. " | ||
|
|
||
| openerp_id = fields.Many2one( | ||
| 'mail.message', | ||
| string='Sale Comment', | ||
| required=True, | ||
| ondelete='cascade') | ||
| magento_sale_order_id = fields.Many2one( | ||
| 'magento.sale.order', | ||
| 'Magento Sale Order', | ||
| required=True, | ||
| ondelete='cascade', | ||
| select=True) | ||
| is_customer_notified = fields.Boolean( | ||
| 'Customer notified', | ||
| help=MAGENTO_HELP) | ||
| is_visible_on_front = fields.Boolean( | ||
| 'Visible on front', | ||
| help=MAGENTO_HELP) | ||
| status = fields.Char( | ||
| 'Order status', | ||
| size=64, | ||
| help=MAGENTO_HELP) | ||
| backend_id = fields.Many2one( | ||
| 'magento.backend', related='magento_sale_order_id.backend_id', | ||
| string='Magento Backend', | ||
| store=True, | ||
| readonly=True) | ||
| storeid = fields.Char( | ||
| 'Store id', | ||
| help=MAGENTO_HELP) | ||
|
|
||
| @api.model | ||
|
Member
There was a problem hiding this comment.
Member
There was a problem hiding this comment. I was sure it was inherited. This comment would tend to confirm that, but it could be wrong https://github.com/odoo/odoo/blob/9.0/openerp/api.py#L77
Member
There was a problem hiding this comment. You are right: I can't seem to reproduce any such issues with a quick test. Thanks for the pointer! |
||
| def create(self, vals): | ||
| if 'res_id' not in vals: | ||
| info = self.env['magento.sale.order'].browse( | ||
| vals['magento_sale_order_id']) | ||
| vals.update({ | ||
| 'res_id': info.openerp_id.id, | ||
| 'model': 'sale.order', | ||
| 'backend_id': info.backend_id.id | ||
| }) | ||
| return super(MagentoSaleComment, self).create(vals) | ||
|
|
||
|
|
||
| @magento(replacing=sale.SaleOrderCommentImportMapper) | ||
|
|
@@ -231,17 +207,18 @@ class SaleOrderMoveComment(sale.SaleOrderMoveComment): | |
| def move(self, binding): | ||
| """magento messages from canceled (edit) order | ||
| are moved to the new order""" | ||
| mag_messages = self.session.env['magento.sale.comment'].search([ | ||
| ('model', '=', 'sale.order'), | ||
| ('magento_sale_order_id', '!=', False), | ||
| ('res_id', '=', binding.parent_id.id)]) | ||
| mag_sale_order = self.session.env['magento.sale.order'].search([ | ||
| ('openerp_id', '=', binding.openerp_id.id) | ||
| ], limit=1) | ||
| vals = { | ||
| 'res_id': binding.openerp_id.id, | ||
| 'magento_id': False, | ||
| 'magento_sale_order_id': mag_sale_order.id} | ||
| mag_messages.write(vals) | ||
|
|
||
|
|
||
| @magento | ||
|
|
@@ -263,7 +240,7 @@ def _create(self, data): | |
| """ Create the Magento record """ | ||
| # special check on data before export | ||
| self._validate_create_data(data) # you may inherit in your own module | ||
| adapter = self.unit_for( | ||
| GenericAdapter, | ||
| 'magento.sale.order') | ||
| return adapter.add_comment(data['order_increment'], | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
at the same time as