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



            
            current_time = datetime.datetime.now()
            logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
            logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
 
            order.otg = logistics_info.otgAvailable
            order.warehouse_id = logistics_info.warehouseId
            order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
            order.logistics_provider_id = logistics_info.providerId
            order.airwaybill_no = logistics_info.airway_billno
            order.tracking_id = order.airwaybill_no

                # Need to send prepaid awb number for store pick up orders
                logistics_info = logistics_client.getLogisticsEstimation(item_id, order.customer_pincode, DeliveryType.COD)
                prepaid_logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)
                logistics_info.airway_billno = prepaid_logistics_info.airway_billno
                logistics_info.providerId = prepaid_logistics_info.providerId
                # Will not provide OTG in pickup store
                order.otg = False
            else:
                logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD, pickUp)
                order.otg = logistics_info.otgAvailable
 
            current_time = datetime.datetime.now()
            logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
            logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
            

        logistics_info = logistics_client.getLogisticsInfo(address.pin, order.lineitems[0].item_id, type, PickUpType.COURIER)
        order.tracking_id = logistics_info.airway_billno
        order.airwaybill_no = logistics_info.airway_billno
        order.logistics_provider_id = logistics_info.providerId
 
    order.otg = logistics_info.otgAvailable
    current_time = datetime.datetime.now()
    logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
    logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
 
    order.customer_name         = address.name

Subversion Repositories SmartDukaan

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

Rev 6524		Rev 6525
Line 294...		Line 294...
294		294
295	`current_time = datetime.datetime.now()`	295	`current_time = datetime.datetime.now()`
296	`logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)`	296	`logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)`
297	`logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)`	297	`logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)`
298		298
-		299	`order.otg = logistics_info.otgAvailable`
299	`order.warehouse_id = logistics_info.warehouseId`	300	`order.warehouse_id = logistics_info.warehouseId`
300	`order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId`	301	`order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId`
301	`order.logistics_provider_id = logistics_info.providerId`	302	`order.logistics_provider_id = logistics_info.providerId`
302	`order.airwaybill_no = logistics_info.airway_billno`	303	`order.airwaybill_no = logistics_info.airway_billno`
303	`order.tracking_id = order.airwaybill_no`	304	`order.tracking_id = order.airwaybill_no`
Line 334...		Line 335...
334	`# Need to send prepaid awb number for store pick up orders`	335	`# Need to send prepaid awb number for store pick up orders`
335	`logistics_info = logistics_client.getLogisticsEstimation(item_id, order.customer_pincode, DeliveryType.COD)`	336	`logistics_info = logistics_client.getLogisticsEstimation(item_id, order.customer_pincode, DeliveryType.COD)`
336	`prepaid_logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)`	337	`prepaid_logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID, pickUp)`
337	`logistics_info.airway_billno = prepaid_logistics_info.airway_billno`	338	`logistics_info.airway_billno = prepaid_logistics_info.airway_billno`
338	`logistics_info.providerId = prepaid_logistics_info.providerId`	339	`logistics_info.providerId = prepaid_logistics_info.providerId`
-		340	`# Will not provide OTG in pickup store`
-		341	`order.otg = False`
339	`else:`	342	`else:`
340	`logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD, pickUp)`	343	`logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD, pickUp)`
-		344	`order.otg = logistics_info.otgAvailable`
341		345
342	`current_time = datetime.datetime.now()`	346	`current_time = datetime.datetime.now()`
343	`logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)`	347	`logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)`
344	`logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)`	348	`logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)`
345		349
Line 2816...		Line 2820...
2816	`logistics_info = logistics_client.getLogisticsInfo(address.pin, order.lineitems[0].item_id, type, PickUpType.COURIER)`	2820	`logistics_info = logistics_client.getLogisticsInfo(address.pin, order.lineitems[0].item_id, type, PickUpType.COURIER)`
2817	`order.tracking_id = logistics_info.airway_billno`	2821	`order.tracking_id = logistics_info.airway_billno`
2818	`order.airwaybill_no = logistics_info.airway_billno`	2822	`order.airwaybill_no = logistics_info.airway_billno`
2819	`order.logistics_provider_id = logistics_info.providerId`	2823	`order.logistics_provider_id = logistics_info.providerId`
2820		2824
-		2825	`order.otg = logistics_info.otgAvailable`
2821	`current_time = datetime.datetime.now()`	2826	`current_time = datetime.datetime.now()`
2822	`logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)`	2827	`logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)`
2823	`logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)`	2828	`logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)`
2824		2829
2825	`order.customer_name = address.name`	2830	`order.customer_name = address.name`