Merge pull request #62 from aroraumang/feature/task-6786

Mark magento exception True when product does not exist #6786
openlabs · Jan 28, 2015 · 7c86143 · 7c86143
2 parents f399a60 + 90d44b2
commit 7c86143
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/sale.py b/sale.py
@@ -373,6 +373,7 @@ def add_lines_using_magento_data(self, order_data):
         unit, = Uom.search([('name', '=', 'Unit')])
 
         line_data = []
+        has_magento_exception = False
         for item in order_data['items']:
             if not item['parent_item_id']:
                 # If its a top level product, create it
@@ -386,9 +387,11 @@ def add_lines_using_magento_data(self, order_data):
                         # create magento exception
                         MagentoException.create([{
                             'origin': '%s,%s' % (self.__name__, self.id),
-                            'log': "Product does not exists."
+                            'log': "Product #%s does not exist" %
+                                item['product_id']
                         }])
                         product = None
+                        has_magento_exception = True
                     else:
                         raise
                 values = {
@@ -424,9 +427,14 @@ def add_lines_using_magento_data(self, order_data):
                 self.get_discount_line_data_using_magento_data(order_data)
             )
 
-        Sale.write([self], {
-            'lines': line_data
-        })
+        values = {
+            'lines': line_data,
+        }
+
+        if has_magento_exception:
+            values['has_magento_exception'] = has_magento_exception
+
+        Sale.write([self], values)
 
     @classmethod
     def find_or_create_using_magento_increment_id(cls, order_increment_id):

diff --git a/tests/test_sale.py b/tests/test_sale.py
@@ -260,6 +260,7 @@ def test_0030_import_sale_order_with_products_with_new(self):
                         )
 
                 self.assertEqual(order.state, 'confirmed')
+                self.assertFalse(order.has_magento_exception)
 
                 orders = Sale.search([])
                 self.assertEqual(len(orders), 1)