Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[13.0][PORT] 739 and 615 from 12.0 #821

Merged
merged 3 commits into from
Jan 25, 2021
Merged

[13.0][PORT] 739 and 615 from 12.0 #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2781d1
Change args order to be consistent with ./delivery_carrier.py/_perpa…
hparfr Apr 21, 2020
41872a5
[IMP] add carrier code into api response and remove duplicated code #417
sebastienbeau Aug 25, 2020
f0ae548
[FIX] fix exporting code and description and add dependency on delive…
sebastienbeau Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions shopinvader_delivery_carrier/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"queue_job",
"shopinvader",
"sale_shipping_info_helper",
"delivery_carrier_info",
],
"data": ["views/backend_view.xml", "data/cart_step.xml"],
"demo": [
Expand Down
26 changes: 11 additions & 15 deletions shopinvader_delivery_carrier/services/abstract_sale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ class AbstractSaleService(AbstractComponent):

def _convert_shipping(self, cart):
res = super(AbstractSaleService, self)._convert_shipping(cart)
selected_carrier = {}
if cart.carrier_id:
carrier = cart.carrier_id
selected_carrier = {
"id": carrier.id,
"name": carrier.name,
"description": carrier.name,
}
# we do not need an estimation of the price
# so we do not pass the cart to the _prepare_carrier method
# and we remove the field
selected_carrier = self._prepare_carrier(cart.carrier_id)
selected_carrier.pop("price")
else:
selected_carrier = {}
res.update(
{
"amount": {
Expand Down Expand Up @@ -55,18 +55,14 @@ def _convert_amount(self, sale):
)
return result

def _prepare_carrier(self, cart, carrier):
return {
"id": carrier.id,
"name": carrier.name,
"description": carrier.name,
"price": carrier.rate_shipment(cart).get("price", 0.0),
}
def _prepare_carrier(self, carrier, cart=None):
service = self.component(usage="delivery_carrier")
return service._prepare_carrier(carrier, cart=cart)

# TODO: this method seems not used
def _get_available_carrier(self, cart):
return [
self._prepare_carrier(cart, carrier)
self._prepare_carrier(carrier, cart)
for carrier in cart._invader_available_carriers()
]

Expand Down
7 changes: 6 additions & 1 deletion shopinvader_delivery_carrier/services/delivery_carrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ def _validator_return_search(self):
"required": False,
"nullable": True,
},
"code": {
"type": "string",
"required": False,
"nullable": True,
},
"description": {
"type": "string",
"required": False,
Expand Down Expand Up @@ -149,4 +154,4 @@ def allowed_carrier_types(self):

@property
def _json_parser_carrier(self):
return ["id", "name", "name:description"]
return ["id", "name", "code", "description"]
4 changes: 4 additions & 0 deletions shopinvader_delivery_carrier/tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +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.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

Expand Down
22 changes: 22 additions & 0 deletions shopinvader_delivery_carrier/tests/test_carrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ def test_deprecated_apply_delivery_method(self):
def test_setting_free_carrier(self):
cart = self._set_carrier(self.free_carrier)
self.assertEqual(cart["shipping"]["amount"]["total"], 0)
self.assertEqual(
cart["shipping"]["selected_carrier"],
{
"description": self.free_carrier.description,
"id": self.free_carrier.id,
"name": self.free_carrier.name,
"code": self.free_carrier.code,
"type": None,
},
)

def test_setting_poste_carrier(self):
cart = self._set_carrier(self.poste_carrier)
Expand Down Expand Up @@ -59,6 +69,18 @@ def test_setting_poste_carrier(self):
cart_amount["tax_without_shipping"], tax_without_shipping
)

# Check Selected carrier
self.assertEqual(
cart["shipping"]["selected_carrier"],
{
"description": self.poste_carrier.description,
"id": self.poste_carrier.id,
"name": self.poste_carrier.name,
"code": self.poste_carrier.code,
"type": None,
},
)

def test_reset_carrier_on_add_item(self):
self._apply_carrier_and_assert_set()
cart = self.add_item(self.product_1.id, 2)
Expand Down
18 changes: 12 additions & 6 deletions shopinvader_delivery_carrier/tests/test_delivery_carrier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,18 @@ 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,
"type": None,
},
],
Expand All @@ -43,16 +45,18 @@ 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,
"type": None,
},
],
Expand All @@ -72,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,
}
],
Expand Down Expand Up @@ -123,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,
}
],
Expand Down