From cd255d40f275e63b02176f9bec2d01667678af97 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Thu, 28 May 2020 10:28:03 -0700 Subject: [PATCH] [IMP] sale_planner: fall back calculate transit days when we have no planned date but do have an estimated delivery date (e.g. GSO) --- sale_planner/models/delivery.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sale_planner/models/delivery.py b/sale_planner/models/delivery.py index 1384b2e4..7756a955 100644 --- a/sale_planner/models/delivery.py +++ b/sale_planner/models/delivery.py @@ -50,8 +50,12 @@ class DeliveryCarrier(models.Model): elif rate.get('transit_days'): rate['date_delivered'] = self.calculate_date_delivered(date_planned, rate.get('transit_days')) elif rate: - if rate.get('date_delivered'): - rate.pop('date_delivered') + date_delivered = rate.get('date_delivered') + if date_delivered and not rate.get('transit_days'): + # we could have a date delivered based on shipping it "now" + # so we can still calculate the transit days + rate['transit_days'] = self.calculate_transit_days(fields.Datetime.now(), date_delivered) + rate.pop('date_delivered') # because we don't have a date_planned, we cannot have a guarenteed delivery return rate