WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py



            order.logistics_provider_id = logistics_info.providerId
            #Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013
            #order.airwaybill_no = logistics_info.airway_billno
            #order.tracking_id = order.airwaybill_no
            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
            if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:
                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
                order.promised_shipping_time = order.expected_shipping_time
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
                order.promised_delivery_time = order.expected_delivery_time

            order.logistics_provider_id = logistics_info.providerId
            #Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
            #order.airwaybill_no = logistics_info.airway_billno
            #order.tracking_id = order.airwaybill_no
            #End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013
            if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:
                order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
                order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
                order.promised_shipping_time = order.expected_shipping_time
                order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)
                order.promised_delivery_time = order.expected_delivery_time

                                         'pickup_request_no' : pickup_number,
                                         'customer_address' : __get_order_address(order),
                                         'source_name' : source_name}
        print message
        __generate_return_advice(order, warehouse, provider, filename)
        if order.source in [OrderSource.WEBSITE, OrderSource.AMAZON, OrderSource.JUNGLEE]:
            mail(help_user, help_password, [to_addr], subject, message, [get_attachment_part(filename)])
        order.pickupRequestNo = pickup_number
        if order.status == OrderStatus.RET_PICKUP_REQUEST_RAISED:
            order.status = OrderStatus.RET_PICKUP_CONFIRMED
            order.statusDescription = "RETURN pick up confirmed"

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 12594 → 12613

Rev 12594		Rev 12613
Line 416...		Line 416...
416	`order.logistics_provider_id = logistics_info.providerId`	416	`order.logistics_provider_id = logistics_info.providerId`
417	`#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013`	417	`#Start:- Added by Manish Sharma for FedEx Integration - Shipment Creation on 31-Jul-2013`
418	`#order.airwaybill_no = logistics_info.airway_billno`	418	`#order.airwaybill_no = logistics_info.airway_billno`
419	`#order.tracking_id = order.airwaybill_no`	419	`#order.tracking_id = order.airwaybill_no`
420	`#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013`	420	`#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013`
421	`if order.source != OrderSource.AMAZON:`	421	`if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:`
422	`order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	422	`order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
423	`order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	423	`order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
424	`order.promised_shipping_time = order.expected_shipping_time`	424	`order.promised_shipping_time = order.expected_shipping_time`
425	`order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	425	`order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
426	`order.promised_delivery_time = order.expected_delivery_time`	426	`order.promised_delivery_time = order.expected_delivery_time`
Line 478...		Line 478...
478	`order.logistics_provider_id = logistics_info.providerId`	478	`order.logistics_provider_id = logistics_info.providerId`
479	`#Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013`	479	`#Start:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013`
480	`#order.airwaybill_no = logistics_info.airway_billno`	480	`#order.airwaybill_no = logistics_info.airway_billno`
481	`#order.tracking_id = order.airwaybill_no`	481	`#order.tracking_id = order.airwaybill_no`
482	`#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013`	482	`#End:- Added by Manish Sharma for FedEx Integration- Shipment Creation on 31-Jul-2013`
483	`if order.source != OrderSource.AMAZON:`	483	`if order.source != OrderSource.AMAZON or order.source != OrderSource.JUNGLEE:`
484	`order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	484	`order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
485	`order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	485	`order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
486	`order.promised_shipping_time = order.expected_shipping_time`	486	`order.promised_shipping_time = order.expected_shipping_time`
487	`order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`	487	`order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=COD_SHIPPING_CUTOFF_TIME, minute=0, second=0)`
488	`order.promised_delivery_time = order.expected_delivery_time`	488	`order.promised_delivery_time = order.expected_delivery_time`
Line 2389...		Line 2389...
2389	`'pickup_request_no' : pickup_number,`	2389	`'pickup_request_no' : pickup_number,`
2390	`'customer_address' : __get_order_address(order),`	2390	`'customer_address' : __get_order_address(order),`
2391	`'source_name' : source_name}`	2391	`'source_name' : source_name}`
2392	`print message`	2392	`print message`
2393	`__generate_return_advice(order, warehouse, provider, filename)`	2393	`__generate_return_advice(order, warehouse, provider, filename)`
2394	`if order.source in [OrderSource.WEBSITE, OrderSource.AMAZON]:`	2394	`if order.source in [OrderSource.WEBSITE, OrderSource.AMAZON, OrderSource.JUNGLEE]:`
2395	`mail(help_user, help_password, [to_addr], subject, message, [get_attachment_part(filename)])`	2395	`mail(help_user, help_password, [to_addr], subject, message, [get_attachment_part(filename)])`
2396	`order.pickupRequestNo = pickup_number`	2396	`order.pickupRequestNo = pickup_number`
2397	`if order.status == OrderStatus.RET_PICKUP_REQUEST_RAISED:`	2397	`if order.status == OrderStatus.RET_PICKUP_REQUEST_RAISED:`
2398	`order.status = OrderStatus.RET_PICKUP_CONFIRMED`	2398	`order.status = OrderStatus.RET_PICKUP_CONFIRMED`
2399	`order.statusDescription = "RETURN pick up confirmed"`	2399	`order.statusDescription = "RETURN pick up confirmed"`