| Line 688... |
Line 688... |
| 688 |
session.commit()
|
688 |
session.commit()
|
| 689 |
return True
|
689 |
return True
|
| 690 |
else:
|
690 |
else:
|
| 691 |
return False
|
691 |
return False
|
| 692 |
|
692 |
|
| - |
|
693 |
def add_invoice_number(orderId, invoiceNumber):
|
| - |
|
694 |
order = Order.get_by(id=orderId)
|
| - |
|
695 |
if not order:
|
| - |
|
696 |
raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
|
| - |
|
697 |
|
| - |
|
698 |
if order.status == OrderStatus.ACCEPTED:
|
| - |
|
699 |
order.invoice_number = invoiceNumber
|
| - |
|
700 |
session.commit()
|
| - |
|
701 |
|
| 693 |
def batch_orders(warehouseId):
|
702 |
def batch_orders(warehouseId):
|
| 694 |
if not warehouseId:
|
703 |
if not warehouseId:
|
| 695 |
raise TransactionServiceException(101, "bad warehouse id")
|
704 |
raise TransactionServiceException(101, "bad warehouse id")
|
| 696 |
|
705 |
|
| 697 |
batchno_generator = BatchNoGenerator()
|
706 |
batchno_generator = BatchNoGenerator()
|
| Line 915... |
Line 924... |
| 915 |
order.status = OrderStatus.DELIVERY_SUCCESS
|
924 |
order.status = OrderStatus.DELIVERY_SUCCESS
|
| 916 |
order.statusDescription = "Order delivered"
|
925 |
order.statusDescription = "Order delivered"
|
| 917 |
session.commit()
|
926 |
session.commit()
|
| 918 |
return True
|
927 |
return True
|
| 919 |
|
928 |
|
| 920 |
def request_pickup_number(order_id):
|
929 |
def request_pickup_number(order_id, providerId):
|
| 921 |
order = get_order(order_id)
|
930 |
order = get_order(order_id)
|
| 922 |
if order.status != OrderStatus.DELIVERY_SUCCESS and order.status != OrderStatus.DOA_REQUEST_AUTHORIZED and order.status != OrderStatus.RET_REQUEST_AUTHORIZED:
|
931 |
if order.status != OrderStatus.DELIVERY_SUCCESS and order.status != OrderStatus.DOA_REQUEST_AUTHORIZED and order.status != OrderStatus.RET_REQUEST_AUTHORIZED:
|
| 923 |
return False
|
932 |
return False
|
| 924 |
from_user = 'cnc.center@shop2020.in'
|
933 |
from_user = 'cnc.center@shop2020.in'
|
| 925 |
from_pwd = '5h0p2o2o'
|
934 |
from_pwd = '5h0p2o2o'
|
| Line 928... |
Line 937... |
| 928 |
try:
|
937 |
try:
|
| 929 |
catalog_client = CatalogClient().get_client()
|
938 |
catalog_client = CatalogClient().get_client()
|
| 930 |
warehouse = catalog_client.getWarehouse(order.warehouse_id)
|
939 |
warehouse = catalog_client.getWarehouse(order.warehouse_id)
|
| 931 |
|
940 |
|
| 932 |
logistics_client = LogisticsClient().get_client()
|
941 |
logistics_client = LogisticsClient().get_client()
|
| 933 |
provider = logistics_client.getProvider(order.logistics_provider_id)
|
942 |
provider = logistics_client.getProvider(providerId)
|
| 934 |
to_addr = provider.details[DeliveryType.PREPAID].email
|
943 |
to_addr = provider.details[DeliveryType.PREPAID].email
|
| 935 |
raw_message = '''
|
944 |
raw_message = '''
|
| 936 |
Dear Sir/Madam,
|
945 |
Dear Sir/Madam,
|
| 937 |
|
946 |
|
| 938 |
Kindly arrange a pickup today from %(customer_city)s. Pickup and delivery addresses are mentioned below.
|
947 |
Kindly arrange a pickup today from %(customer_city)s. Pickup and delivery addresses are mentioned below.
|
| Line 952... |
Line 961... |
| 952 |
Phone: %(warehouse_phone)s
|
961 |
Phone: %(warehouse_phone)s
|
| 953 |
|
962 |
|
| 954 |
Thanks and Regards
|
963 |
Thanks and Regards
|
| 955 |
Sandeep Sachdeva
|
964 |
Sandeep Sachdeva
|
| 956 |
'''
|
965 |
'''
|
| - |
|
966 |
|
| - |
|
967 |
if warehouse.id == 7:
|
| - |
|
968 |
executive = 'Amit Kumar'
|
| - |
|
969 |
executive_phone = '9911122634'
|
| - |
|
970 |
else:
|
| - |
|
971 |
executive = 'Prashant Sharma'
|
| - |
|
972 |
executive_phone = '8826894193'
|
| - |
|
973 |
|
| - |
|
974 |
|
| 957 |
message = dedent(raw_message) % { 'customer_city' : order.customer_city,
|
975 |
message = dedent(raw_message) % { 'customer_city' : order.customer_city,
|
| 958 |
'provider_code' : provider.details[DeliveryType.PREPAID].accountNo,
|
976 |
'provider_code' : provider.details[DeliveryType.PREPAID].accountNo,
|
| 959 |
'order_weight' : str(order.total_weight),
|
977 |
'order_weight' : str(order.total_weight),
|
| 960 |
'customer_address' : __get_order_address(order),
|
978 |
'customer_address' : __get_order_address(order),
|
| 961 |
'warehouse_executive' : 'Parmod Kumar',
|
979 |
'warehouse_executive' : executive,
|
| 962 |
'warehouse_address' : warehouse.location,
|
980 |
'warehouse_address' : warehouse.location,
|
| 963 |
'warehouse_pin' : warehouse.pincode,
|
981 |
'warehouse_pin' : warehouse.pincode,
|
| 964 |
'warehouse_phone': '9971573026'}
|
982 |
'warehouse_phone': executive_phone}
|
| 965 |
#FIXME Email is hardcoded for bluedart
|
983 |
#FIXME Email is hardcoded for bluedart
|
| 966 |
mail(from_user, from_pwd, [to_addr, 'sonikap@bluedart.com'], subject, message)
|
984 |
mail(from_user, from_pwd, [to_addr, 'sonikap@bluedart.com'], subject, message)
|
| 967 |
if order.status == OrderStatus.RET_REQUEST_AUTHORIZED:
|
985 |
if order.status == OrderStatus.RET_REQUEST_AUTHORIZED:
|
| 968 |
order.status = OrderStatus.RET_PICKUP_REQUEST_RAISED
|
986 |
order.status = OrderStatus.RET_PICKUP_REQUEST_RAISED
|
| 969 |
order.statusDescription = "Pick up requested for RETURN"
|
987 |
order.statusDescription = "Pick up requested for RETURN"
|