| Line 12... |
Line 12... |
| 12 |
from shop2020.logistics.service.impl.DataAccessor import get_empty_AWB, \
|
12 |
from shop2020.logistics.service.impl.DataAccessor import get_empty_AWB, \
|
| 13 |
get_shipment_info, initialize, get_logistics_estimation, get_provider, \
|
13 |
get_shipment_info, initialize, get_logistics_estimation, get_provider, \
|
| 14 |
get_providers, close_session, get_free_awb_count, get_holidays, is_alive, \
|
14 |
get_providers, close_session, get_free_awb_count, get_holidays, is_alive, \
|
| 15 |
get_provider_for_pickup_type, get_pickup_store, get_all_pickup_stores, \
|
15 |
get_provider_for_pickup_type, get_pickup_store, get_all_pickup_stores, \
|
| 16 |
get_pickup_store_by_hotspot_id, get_destination_code, update_pincode, \
|
16 |
get_pickup_store_by_hotspot_id, get_destination_code, update_pincode, \
|
| 17 |
add_pincode, store_shipment_info, adjust_delivery_time
|
17 |
add_pincode, store_shipment_info, adjust_delivery_time,\
|
| - |
|
18 |
get_min_advance_amount
|
| 18 |
from shop2020.thriftpy.logistics.ttypes import LogisticsInfo, \
|
19 |
from shop2020.thriftpy.logistics.ttypes import LogisticsInfo, \
|
| 19 |
LogisticsServiceException, DeliveryType, PickUpType
|
20 |
LogisticsServiceException, DeliveryType, PickUpType
|
| 20 |
from shop2020.thriftpy.model.v1.catalog.ttypes import status
|
21 |
from shop2020.thriftpy.model.v1.catalog.ttypes import status
|
| 21 |
import datetime
|
22 |
import datetime
|
| 22 |
import math
|
23 |
import math
|
| Line 143... |
Line 144... |
| 143 |
try:
|
144 |
try:
|
| 144 |
todate = datetime.datetime.now()
|
145 |
todate = datetime.datetime.now()
|
| 145 |
logistics_info = self.get_logistics_estimation_with_type(itemId, destination_pin, type)
|
146 |
logistics_info = self.get_logistics_estimation_with_type(itemId, destination_pin, type)
|
| 146 |
logistics_info.deliveryTime = to_java_date(todate + datetime.timedelta(days = adjust_delivery_time(todate, logistics_info.deliveryTime)))
|
147 |
logistics_info.deliveryTime = to_java_date(todate + datetime.timedelta(days = adjust_delivery_time(todate, logistics_info.deliveryTime)))
|
| 147 |
logistics_info.shippingTime = to_java_date(todate + datetime.timedelta(days = adjust_delivery_time(todate, logistics_info.shippingTime)))
|
148 |
logistics_info.shippingTime = to_java_date(todate + datetime.timedelta(days = adjust_delivery_time(todate, logistics_info.shippingTime)))
|
| - |
|
149 |
minAdvanceAmount, logistics_info.codAllowed = get_min_advance_amount(itemId, destination_pin, logistics_info.providerId, logistics_info.codAllowed)
|
| - |
|
150 |
## Send minadvanceamount in providerId field
|
| - |
|
151 |
logistics_info.providerId = int(minAdvanceAmount)
|
| 148 |
return logistics_info
|
152 |
return logistics_info
|
| 149 |
finally:
|
153 |
finally:
|
| 150 |
close_session()
|
154 |
close_session()
|
| 151 |
|
155 |
|
| 152 |
def get_logistics_estimation_with_type(self, itemId, destination_pin, type):
|
156 |
def get_logistics_estimation_with_type(self, itemId, destination_pin, type):
|