[REF] refactor code due to change in base module

Author: sebastienbeau

shopinvader_dropoff_site_edition/__init__.py renamed to shopinvader_delivery_pickup_public_edition/__init__.py

@@ -4,8 +4,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
-    "name": "Shopinvader Dropoff site Public Edition",
-    "summary": "Shopinvader Dropoff site Public Edition",
+    "name": "Shopinvader Pickup Public Edition",
+    "summary": "Shopinvader Pickup Public Edition",
     "version": "10.0.0.0.0",
     "category": "e-commerce",
     "website": "https://akretion.com",
@@ -14,7 +14,7 @@
     "application": False,
     "installable": True,
     "external_dependencies": {"python": [], "bin": []},
-    "depends": ["shopinvader_dropoff_site"],
+    "depends": ["shopinvader_delivery_pickup"],
     "data": ["views/delivery_carrier_view.xml"],
     "demo": [],
     "qweb": [],

shopinvader_dropoff_site_edition/__manifest__.py renamed to shopinvader_delivery_pickup_public_edition/__manifest__.py

@@ -12,7 +12,7 @@
 class CartService(Component):
     _inherit = "shopinvader.cart.service"
 
-    def set_public_dropoff_site(self, **params):
+    def set_public_delivery_pickup(self, **params):
         """
             This service will create/update apply the given dropoffsite
             to the current cart
@@ -23,12 +23,12 @@ def set_public_dropoff_site(self, **params):
         if not cart:
             raise UserError(_("There is not cart"))
         else:
-            self._add_update_dropoff_site(cart, params)
-            self._set_dropoff_site(cart, params["code"])
+            dropoff_site = self._add_update_dropoff_site(cart, params)
+            self._set_delivery_pickup(cart, dropoff_site.id)
             return self._to_json(cart)
 
     # Validator
-    def _validator_set_public_dropoff_site(self):
+    def _validator_set_public_delivery_pickup(self):
         return {
             "code": {"type": "string", "required": True},
             "name": {"type": "string", "required": True},
@@ -84,3 +84,4 @@ def _add_update_dropoff_site(self, cart, dropoff_site):
             dropoff_site.write(vals)
         else:
             dropoff_site = dropoff_site_obj.create(vals)
+        return dropoff_site

shopinvader_dropoff_site_edition/models/__init__.py renamed to shopinvader_delivery_pickup_public_edition/models/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import test_pickup

shopinvader_dropoff_site_edition/models/delivery_carrier.py renamed to shopinvader_delivery_pickup_public_edition/models/delivery_carrier.py

@@ -8,9 +8,9 @@
 )
 
 
-class DropOffSiteCase(CommonCarrierCase):
+class PickupCase(CommonCarrierCase):
     def setUp(self):
-        super(DropOffSiteCase, self).setUp()
+        super(PickupCase, self).setUp()
         self.final_partner = self.cart.partner_shipping_id
         self.poste_carrier.write(
             {
@@ -19,11 +19,11 @@ def setUp(self):
             }
         )
         self._set_carrier(self.poste_carrier)
-        self._set_dropoff_site(ref="foo", name="Bar")
+        self._set_pickup(ref="foo", name="Bar")
 
-    def _set_dropoff_site(self, ref, name):
+    def _set_pickup(self, ref, name):
         self.service.dispatch(
-            "set_public_dropoff_site",
+            "set_public_delivery_pickup",
             params={
                 "code": ref,
                 "name": name,
@@ -34,27 +34,27 @@ def _set_dropoff_site(self, ref, name):
             },
         )
 
-    def test_setting_dropoff_site(self):
+    def test_setting_pickup(self):
         shipping = self.cart.partner_shipping_id
         self.assertEqual(shipping.ref, "foo")
         self.assertEqual(shipping.name, "Bar")
         self.assertEqual(
             self.cart.final_shipping_partner_id, self.final_partner
         )
 
-    def test_updating_dropoff_site(self):
+    def test_updating_pickup(self):
         shipping = self.cart.partner_shipping_id
-        self._set_dropoff_site(ref="foo", name="Updated")
+        self._set_pickup(ref="foo", name="Updated")
         self.assertEqual(self.cart.partner_shipping_id, shipping)
         self.assertEqual(shipping.ref, "foo")
         self.assertEqual(shipping.name, "Updated")
         self.assertEqual(
             self.cart.final_shipping_partner_id, self.final_partner
         )
 
-    def test_changing_dropoff_site(self):
+    def test_changing_pickup(self):
         previous_shipping = self.cart.partner_shipping_id
-        self._set_dropoff_site(ref="foo2", name="Bar2")
+        self._set_pickup(ref="foo2", name="Bar2")
         self.assertNotEqual(self.cart.partner_shipping_id, previous_shipping)
         shipping = self.cart.partner_shipping_id
         self.assertEqual(shipping.ref, "foo2")