[FIX] fix exporting code and description and add dependency on delive…

…ry_carrier_info
shopinvader · Jan 25, 2021 · f0ae548 · f0ae548
1 parent 41872a5
commit f0ae548
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/shopinvader_delivery_carrier/__manifest__.py b/shopinvader_delivery_carrier/__manifest__.py
@@ -18,6 +18,7 @@
         "queue_job",
         "shopinvader",
         "sale_shipping_info_helper",
+        "delivery_carrier_info",
     ],
     "data": ["views/backend_view.xml", "data/cart_step.xml"],
     "demo": [

diff --git a/shopinvader_delivery_carrier/services/delivery_carrier.py b/shopinvader_delivery_carrier/services/delivery_carrier.py
@@ -154,4 +154,4 @@ def allowed_carrier_types(self):
 
     @property
     def _json_parser_carrier(self):
-        return ["id", "name", "name:description"]
+        return ["id", "name", "code", "description"]
diff --git a/shopinvader_delivery_carrier/tests/common.py b/shopinvader_delivery_carrier/tests/common.py
@@ -11,8 +11,10 @@ def setUpClass(cls):
         super(CommonCarrierCase, cls).setUpClass()
         cls.free_carrier = cls.env.ref("delivery.free_delivery_carrier")
         cls.poste_carrier = cls.env.ref("delivery.delivery_carrier")
-        cls.free_carrier.default_code = "FREE"
-        cls.poste_carrier.default_code = "POSTE"
+        cls.free_carrier.code = "FREE"
+        cls.free_carrier.description = "delivery in 5 days"
+        cls.poste_carrier.code = "POSTE"
+        cls.poste_carrier.description = "delivery in 2 days"
         cls.product_1 = cls.env.ref("product.product_product_4b")
         cls.precision = 2
 

diff --git a/shopinvader_delivery_carrier/tests/test_carrier.py b/shopinvader_delivery_carrier/tests/test_carrier.py
@@ -24,7 +24,7 @@ def test_setting_free_carrier(self):
         self.assertEqual(
             cart["shipping"]["selected_carrier"],
             {
-                "description": self.free_carrier.description or None,
+                "description": self.free_carrier.description,
                 "id": self.free_carrier.id,
                 "name": self.free_carrier.name,
                 "code": self.free_carrier.code,
@@ -73,7 +73,7 @@ def test_setting_poste_carrier(self):
         self.assertEqual(
             cart["shipping"]["selected_carrier"],
             {
-                "description": self.poste_carrier.description or None,
+                "description": self.poste_carrier.description,
                 "id": self.poste_carrier.id,
                 "name": self.poste_carrier.name,
                 "code": self.poste_carrier.code,

diff --git a/shopinvader_delivery_carrier/tests/test_delivery_carrier.py b/shopinvader_delivery_carrier/tests/test_delivery_carrier.py
@@ -20,15 +20,15 @@ def test_search_all(self):
             "data": [
                 {
                     "price": 0.0,
-                    "description": self.free_carrier.name or None,
+                    "description": self.free_carrier.description,
                     "id": self.free_carrier.id,
                     "name": self.free_carrier.name,
                     "code": self.free_carrier.code,
                     "type": None,
                 },
                 {
                     "price": 0.0,
-                    "description": self.poste_carrier.name or None,
+                    "description": self.poste_carrier.description,
                     "id": self.poste_carrier.id,
                     "name": self.poste_carrier.name,
                     "code": self.poste_carrier.code,
@@ -45,15 +45,15 @@ def test_search_current_cart(self):
             "data": [
                 {
                     "price": 0.0,
-                    "description": self.free_carrier.name or None,
+                    "description": self.free_carrier.description,
                     "id": self.free_carrier.id,
                     "name": self.free_carrier.name,
                     "code": self.free_carrier.code,
                     "type": None,
                 },
                 {
                     "price": 20.0,
-                    "description": self.poste_carrier.name or None,
+                    "description": self.poste_carrier.description,
                     "id": self.poste_carrier.id,
                     "name": self.poste_carrier.name,
                     "code": self.poste_carrier.code,
@@ -76,9 +76,10 @@ def test_search_current_cart_country(self):
             "data": [
                 {
                     "price": 0.0,
-                    "description": self.free_carrier.name or None,
+                    "description": self.free_carrier.description,
                     "id": self.free_carrier.id,
                     "name": self.free_carrier.name,
+                    "code": self.free_carrier.code,
                     "type": None,
                 }
             ],
@@ -127,9 +128,10 @@ def test_search_current_cart_zip(self):
             "data": [
                 {
                     "price": 0.0,
-                    "description": self.poste_carrier.name or None,
+                    "description": self.poste_carrier.description,
                     "id": self.poste_carrier.id,
                     "name": self.poste_carrier.name,
+                    "code": self.poste_carrier.code,
                     "type": None,
                 }
             ],