Merge lp:~wantellets/prestashoperpconnect/prestashoperpconnect_id_shop into lp:prestashoperpconnect

[WANTELLET Sylvain]

Add id_shop for customer import_customers_since for multi-shop configuration and non-shared customers.
(requires to add id_shop to prestapyt supported filters)

[lp:~wantellets/prestashoperpconnect/prestashoperpconnect_id_shop]

252. By WANTELLET Sylvain on 2013-11-04

MERGE changes from main branch

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

The project has moved to Github https://github.com/OCA/connector-prestashop.
Please resubmit your MP on github using following procedure https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub.

I put this MP in rejected in the meanwhile.

Regards

review: Disapprove

Unmerged revisions

252. By WANTELLET Sylvain on 2013-11-04

MERGE changes from main branch

251. By WANTELLET Sylvain on 2013-08-30

Add id_shop for customer import_customers_since for multi-shop configuration and non-shared customers.
(requires to add id_shop to prestapyt supported filters)

=== modified file 'prestashoperpconnect/prestashop_model.py'
--- prestashoperpconnect/prestashop_model.py	2013-10-25 10:35:45 +0000
+++ prestashoperpconnect/prestashop_model.py	2013-11-04 13:35:22 +0000
@@ -133,12 +133,17 @@
                     backend_record.import_partners_since,
                     DEFAULT_SERVER_DATETIME_FORMAT
                 )
-            import_customers_since.delay(
-                session,
-                backend_record.id,
-                since_date,
-                priority=10,
-            )
+            shop_obj = self.pool.get('prestashop.shop')
+            list_shops = shop_obj.search(cr, uid, [('backend_id', '=', backend_record.id)])
+            shops = shop_obj.browse(cr, uid, list_shops, context=context)
+            for shop in shops:
+                import_customers_since.delay(
+                    session,
+                    backend_record.id,
+                    since_date,
+                    shop.prestashop_id,
+                    priority=10,
+                )
 
         return True
 
 
=== modified file 'prestashoperpconnect/unit/import_synchronizer.py'
--- prestashoperpconnect/unit/import_synchronizer.py	2013-10-25 12:40:37 +0000
+++ prestashoperpconnect/unit/import_synchronizer.py	2013-11-04 13:35:22 +0000
@@ -658,7 +658,7 @@
 
 
 @job
-def import_customers_since(session, backend_id, since_date=None):
+def import_customers_since(session, backend_id, since_date=None, id_shop=None):
     """ Prepare the import of partners modified on Prestashop """
     import_batch(session, 'prestashop.res.partner.category', backend_id)
 
@@ -666,6 +666,10 @@
     if since_date:
         date_str = since_date.strftime('%Y-%m-%d %H:%M:%S')
         filters = {'date': '1', 'filter[date_upd]': '>[%s]' % (date_str)}
+    if id_shop:
+        if filters is None:
+            filters = {}
+        filters.update({'id_shop': id_shop})
     import_batch(session, 'prestashop.res.partner', backend_id, filters, priority=15)
 
     now_fmt = datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)