From 9d2d2594b7b07cb45b7be6429eaf1336196152bb Mon Sep 17 00:00:00 2001 From: Daniel Muyshond Date: Tue, 6 Oct 2020 12:36:18 +0200 Subject: [PATCH] [TELE-694] fix postage fees is sended by mail (2nd) --- passerelle_imio_extra_fees/models.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/passerelle_imio_extra_fees/models.py b/passerelle_imio_extra_fees/models.py index 23a8590..6fb472f 100644 --- a/passerelle_imio_extra_fees/models.py +++ b/passerelle_imio_extra_fees/models.py @@ -63,17 +63,17 @@ class ExtraFees(BaseResource): for basket_item in data['data']: try: nb_documents += int(basket_item['request_data']['nb_documents']) + # Check if the item in send by mail and if so there is no postage_fee + destination = basket_item["request_data"]["form_var_destinations_raw"] + if destination and "mail" in destination: + postage_fee = 0 + postage_fee = nb_letter * postage_fee if Decimal(basket_item['request_data']['postage_fee']) > postage_fee: postage_fee = Decimal(basket_item['request_data']['postage_fee']) except KeyError: # basket item not associated with any document, no fee pass nb_letter = int(nb_documents / int(self.max_doc_in_letter)) + (((nb_documents % int(self.max_doc_in_letter)) > 0) and 1 or 0) - # Check is the item in send by mail and if so there is no postage_fee - destination = basket_item["request_data"]["form_var_destinations_raw"] - if destination and "mail" in destination: - postage_fee = 0 - postage_fee = nb_letter * postage_fee return {'data': [{'subject': force_text(_('Postage')), 'amount': str(postage_fee)}]} def namur_compute(self, request, **kwargs):