Subversion Repositories SmartDukaan

Rev

Rev 12246 | Rev 12280 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 12246 Rev 12248
Line 396... Line 396...
396 
            order.logistics_provider_id = logistics_info.providerId
 396 
            order.logistics_provider_id = logistics_info.providerId
397 
            #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
 397 
            #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
398 
            #order.airwaybill_no = logistics_info.airway_billno
 398 
            #order.airwaybill_no = logistics_info.airway_billno
399 
            #order.tracking_id = order.airwaybill_no
 399 
            #order.tracking_id = order.airwaybill_no
400 
            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
 400 
            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
401 
            if order.source not in (OrderSource.AMAZON):
 401 
            if order.source != OrderSource.AMAZON:
402 
                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
 402 
                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
403 
                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
 403 
                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
404 
                order.promised_shipping_time = order.expected_shipping_time
 404 
                order.promised_shipping_time = order.expected_shipping_time
405 
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
 405 
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
406 
                order.promised_delivery_time = order.expected_delivery_time
 406 
                order.promised_delivery_time = order.expected_delivery_time
Line 458... Line 458...
458 
            order.logistics_provider_id = logistics_info.providerId
 458 
            order.logistics_provider_id = logistics_info.providerId
459 
            #Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
 459 
            #Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
460 
            #order.airwaybill_no = logistics_info.airway_billno
 460 
            #order.airwaybill_no = logistics_info.airway_billno
461 
            #order.tracking_id = order.airwaybill_no
 461 
            #order.tracking_id = order.airwaybill_no
462 
            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
 462 
            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
463 
            if order.source not in (OrderSource.AMAZON):
 463 
            if order.source != OrderSource.AMAZON:
464 
                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
 464 
                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
465 
                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
 465 
                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
466 
                order.promised_shipping_time = order.expected_shipping_time
 466 
                order.promised_shipping_time = order.expected_shipping_time
467 
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
 467 
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
468 
                order.promised_delivery_time = order.expected_delivery_time
 468 
                order.promised_delivery_time = order.expected_delivery_time