| Line 577... |
Line 577... |
| 577 |
if pdu.isFofo:
|
577 |
if pdu.isFofo:
|
| 578 |
###For fofo always use RQuick - Surface i.e. 48
|
578 |
###For fofo always use RQuick - Surface i.e. 48
|
| 579 |
order.logistics_provider_id = 48
|
579 |
order.logistics_provider_id = 48
|
| 580 |
logistics_info.deliveryTime = logistics_info.shippingTime + 1
|
580 |
logistics_info.deliveryTime = logistics_info.shippingTime + 1
|
| 581 |
|
581 |
|
| 582 |
if fofoWarehousesMap:
|
582 |
# if fofoWarehousesMap:
|
| 583 |
order.fulfilmentWarehouseId = fofoWarehousesMap.get(item_id).id
|
583 |
# order.fulfilmentWarehouseId = fofoWarehousesMap.get(item_id).id
|
| 584 |
order.warehouse_id = fofoWarehousesMap.get(item_id).billingWarehouseId
|
584 |
# order.warehouse_id = fofoWarehousesMap.get(item_id).billingWarehouseId
|
| 585 |
else:
|
585 |
|
| 586 |
order.warehouse_id = logistics_info.warehouseId
|
586 |
order.warehouse_id = logistics_info.warehouseId
|
| 587 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
587 |
order.fulfilmentWarehouseId = logistics_info.fulfilmentWarehouseId
|
| 588 |
|
588 |
|
| 589 |
logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
|
589 |
logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
|
| 590 |
logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
|
590 |
logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
|
| 591 |
logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
|
591 |
logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
|
| 592 |
|
592 |
|
| Line 8578... |
Line 8578... |
| 8578 |
|
8578 |
|
| 8579 |
if order.cod:
|
8579 |
if order.cod:
|
| 8580 |
if totalOrdersAmount > provider.maxCodLimit:
|
8580 |
if totalOrdersAmount > provider.maxCodLimit:
|
| 8581 |
raise TransactionServiceException(210, "Logistics Partner "+provider.name+ " Max Cod Amount Collection Limit Violated i.e. "+ str(provider.maxCodLimit))
|
8581 |
raise TransactionServiceException(210, "Logistics Partner "+provider.name+ " Max Cod Amount Collection Limit Violated i.e. "+ str(provider.maxCodLimit))
|
| 8582 |
|
8582 |
|
| 8583 |
if order.logistics_provider_id!=4:
|
8583 |
if order.logistics_provider_id in [4, 48] :
|
| 8584 |
|
8584 |
|
| 8585 |
providerCodLimit = float(providerLimits.get("providerCodLimit"))
|
8585 |
providerCodLimit = float(providerLimits.get("providerCodLimit"))
|
| 8586 |
providerPrepaidLimit = float(providerLimits.get("providerPrepaidLimit"))
|
8586 |
providerPrepaidLimit = float(providerLimits.get("providerPrepaidLimit"))
|
| 8587 |
|
8587 |
|
| 8588 |
if order.cod:
|
8588 |
if order.cod:
|