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

             if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
                 return False
             order.status = OrderStatus.RTO_IN_TRANSIT
             order.delivery_timestamp = datetime.datetime.now()
             order.statusDescription = "Order Returned to Origin"
-            update_trust_level(order)
-            session.commit()
             try:
                 alert_client = AlertClient().get_client()
                 alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
             except Exception as e:
                 print "Exception in ending alert in MarkOrderAsRTO method"
                 print e
+        update_trust_level(orders[0])
+        session.commit()
     else:
         if selectedOrder == None or selectedOrder.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERED_AT_STORE, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERY_SUCCESS]:
             return False
         selectedOrder.status = OrderStatus.RTO_IN_TRANSIT
         selectedOrder.delivery_timestamp = datetime.datetime.now()
 def update_trust_level(order):
     try:
         trust_level_delta = 0
         if order.cod == True:
+            if order.status in [OrderStatus.RTO_RESHIPPED] and order.logisticsTransactionId:
+                earlierMarkedReshipped = Order.query.filter(Order.logisticsTransactionId == order.logisticsTransactionId).filter(Order.status==OrderStatus.RTO_RESHIPPED).first()
+                if earlierMarkedReshipped is None:
+                    trust_level_delta = ORDER_STATUS_TO_USER_TRUST_LEVEL_DELTA_DICT.get(order.status, 0)
+            else:
-            trust_level_delta = ORDER_STATUS_TO_USER_TRUST_LEVEL_DELTA_DICT.get(order.status, 0)
+                trust_level_delta = ORDER_STATUS_TO_USER_TRUST_LEVEL_DELTA_DICT.get(order.status, 0)
         if (trust_level_delta != 0):
             user_client = UserClient().get_client()
             user_client.increaseTrustLevel(order.customer_id, trust_level_delta)
     except Exception as e:
                 except Exception as e:
                     print e
             else:
                 order.status = OrderStatus.DELIVERY_SUCCESS
                 order.statusDescription = "Order delivered"
-                update_trust_level(order)
                 if order.insuranceDetails:
                     try:
                         update_insurance_details(order)
                     except:
                         print "Error generating insurance file for order " + str(order.id)
                     print e
     for logisticsTxnId, ordersList in logisticsTxnIdOrdersMap.iteritems():
         if enqueue_delivery_success_mail(logisticsTxnId, ordersList) :
             order = ordersList[0]
+            update_trust_level(order)
             if order.transaction.payment_option == capitalFloatPayMethod:
                 total_amount = 0
                 for ordObj in ordersList:
                     total_amount = total_amount + ordObj.total_amount + ordObj.shippingCost - ordObj.gvAmount
                 creditObj = __creditHistoryObj(order.customer_id, 1, order.transaction.id, total_amount, CreditTxnType.LOAN, order.logisticsTransactionId)
             if order.first_dlvyatmp_timestamp is None:
                 order.first_dlvyatmp_timestamp = deliveryTimestamp
             order.receiver = receiver
         order.status = OrderStatus.DELIVERY_SUCCESS
         order.statusDescription = "Order delivered"
-        update_trust_level(order)
         if order.insuranceDetails:
             try:
                 update_insurance_details(order)
             except:
                 print "Error generating insurance file for order " + str(order.id)
             order.dataInsuranceDetails[0].expiryDate = order.delivery_timestamp + timedelta(days = 90)
         if order.source == 2:
             sod = StoreOrderDetail.get_by(orderId = order.id)
             sod.payStatus = StorePaymentStatus.FULL_PAY_RECEIVED
-        session.commit()
         if order.pickupStoreId and order.cod:
             __push_collection_to_hotspot(order, "SALE")
         for logisticsTxnId, ordersList in logisticsTxnIdOrdersMap.iteritems():
             alert_client = AlertClient().get_client()
             alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
         except Exception as e:
             print "Exception in ending alert in MarkOrderAsDelivered method"
             print e
+    update_trust_level(grouppedOrdersList[0])
+    session.commit()
 def mark_order_as_received_at_store(orderId, deliveryTimestamp):
     order = Order.get_by(id=orderId)
     if order != None or order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DELIVERED_AT_STORE]:
                 continue
                 #raise TransactionServiceException(103, "No order found for the awb:" + awb)
             order.status = OrderStatus.RTO_IN_TRANSIT
             order.delivery_timestamp, reason = detail.split('|')
             order.statusDescription = "Order Returned to Origin:" + reason
-            update_trust_level(order)
-            session.commit()
             try:
                 alert_client = AlertClient().get_client()
                 alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
             except Exception as e:
                 print "Exception in ending alert in MarkOrderAsRTO method"
                 print e
+        update_trust_level(orders[0])
+        session.commit()
 def get_rto_orders(provider_id):
     current_time = datetime.datetime.now()
     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     rto_orders = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.RTO_IN_TRANSIT).filter(Order.delivery_timestamp <= to_datetime).all()
         for lineitem in order.lineitems:
             inventoryClient.reduceReservationCount(lineitem.item_id, order.fulfilmentWarehouseId, sourceId, order.id, lineitem.quantity)
     except:
         print "Unable to reduce reservation count"
-def __clone_order(order, should_copy_billing_info, is_cod):
+def __clone_order(order, should_copy_billing_info, is_cod, reserved=True):
     current_time = datetime.datetime.now()
     new_order = Order()
     new_order.customer_id = order.customer_id
     new_order.customer_name = order.customer_name
     new_order.customer_city = order.customer_city
     new_order.airwaybill_no = logistics_info.airway_billno
     new_order.tracking_id = new_order.airwaybill_no
     '''
     new_order.source = order.source
+    if reserved:
-    order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+        order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-    new_order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+        new_order.expected_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-    new_order.promised_delivery_time = new_order.expected_delivery_time
+        new_order.promised_delivery_time = new_order.expected_delivery_time
-    new_order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+        new_order.expected_shipping_time = (current_time + datetime.timedelta(days=logistics_info.shippingTime)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
-    new_order.promised_shipping_time = new_order.expected_shipping_time
+        new_order.promised_shipping_time = new_order.expected_shipping_time
+    else:
+        order.courier_delivery_time = (current_time + datetime.timedelta(days=logistics_info.deliveryDelay)).replace(hour=PREPAID_SHIPPING_CUTOFF_TIME, minute=0, second=0)
+        new_order.expected_delivery_time = order.expected_delivery_time
+        new_order.promised_delivery_time = order.promised_delivery_time
+        new_order.expected_shipping_time = order.expected_shipping_time
+        new_order.promised_shipping_time = order.promised_shipping_time
     if should_copy_billing_info:
         new_order.vendorId = order.vendorId
         new_order.invoice_number = order.invoice_number
         new_order.billed_by = order.billed_by
                 new_order.airwaybill_no= logistics_client.getEmptyAWB(new_order.logistics_provider_id, DeliveryType.PREPAID)
                 new_order.tracking_id = new_order.airwaybill_no
         session.commit()
     else:
         session.commit()
+        if reserved:
-        inventoryClient = InventoryClient().get_client()
+            inventoryClient = InventoryClient().get_client()
-        inventoryClient.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, new_order.id, to_java_date(new_order.created_timestamp), to_java_date(new_order.promised_shipping_time), new_order.lineitems[0].quantity)
+            inventoryClient.reserveItemInWarehouse(item_id, logistics_info.fulfilmentWarehouseId, sourceId, new_order.id, to_java_date(new_order.created_timestamp), to_java_date(new_order.promised_shipping_time), new_order.lineitems[0].quantity)
     if order.source == 2:
         new_order.advanceAmount = order.advanceAmount
         new_order.storeId = order.storeId
         oldSod = StoreOrderDetail.query.filter(StoreOrderDetail.orderId == order.id).filter(StoreOrderDetail.storeId == order.storeId).first()
                             if warehouseDbConnection.open:
                                 warehouseDbConnection.close()
                             raise TransactionServiceException(318, "Unsufficient Quantity with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
                         usedInventory = 0
-                        if nonSerializedUsedInventoryMap.has_key(item.id):
+                        if nonSerializedUsedInventoryMap.has_key(str(item.id)+"_"+str(warehouse.id)):
-                            usedInventory = nonSerializedUsedInventoryMap.get(item.id)
+                            usedInventory = nonSerializedUsedInventoryMap.get(str(item.id)+"_"+str(warehouse.id))
                             usedInventory = usedInventory+orderQuantity
-                            nonSerializedUsedInventoryMap[item.id] = usedInventory
+                            nonSerializedUsedInventoryMap[str(item.id)+"_"+str(warehouse.id)] = usedInventory
                         else:
                             usedInventory = orderQuantity
-                            nonSerializedUsedInventoryMap[item.id] = usedInventory
+                            nonSerializedUsedInventoryMap[str(item.id)+"_"+str(warehouse.id)] = usedInventory
                         if usedInventory > totalCurrentQuantity:
                             if warehouseDbConnection.open:
                                 warehouseDbConnection.close()
                             raise TransactionServiceException(318, "Unsufficient Quantity with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
                             if warehouseDbConnection.open:
                                 warehouseDbConnection.close()
                             raise TransactionServiceException(110, "Unsufficient Quantity with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
                         usedInventory = 0
-                        if nonSerializedUsedInventoryMap.has_key(item.id):
+                        if nonSerializedUsedInventoryMap.has_key(str(item.id)+"_"+str(warehouse.id)):
-                            usedInventory = nonSerializedUsedInventoryMap.get(item.id)
+                            usedInventory = nonSerializedUsedInventoryMap.get(str(item.id)+"_"+str(warehouse.id))
                             usedInventory = usedInventory+orderQuantity
-                            nonSerializedUsedInventoryMap[item.id] = usedInventory
+                            nonSerializedUsedInventoryMap[str(item.id)+"_"+str(warehouse.id)] = usedInventory
                         else:
                             usedInventory = orderQuantity
-                            nonSerializedUsedInventoryMap[item.id] = usedInventory
+                            nonSerializedUsedInventoryMap[str(item.id)+"_"+str(warehouse.id)] = usedInventory
                         if usedInventory > totalCurrentQuantity:
                             if warehouseDbConnection.open:
                                 warehouseDbConnection.close()
                             raise TransactionServiceException(318, "Unsufficient Quantity with this item number " + itemNumbers[0]+" in Vendor Warehouse Id- "+str(warehouse.id)+" Order Id:- "+str(order.id))
     if split_order_quantity >=order.lineitems[0].quantity:
         raise TransactionServiceException(115, "Split Quantity is greater than or equal to order quantity")
     if order.status not in [OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.INVENTORY_LOW, OrderStatus.LOW_INV_PO_RAISED, OrderStatus.LOW_INV_REVERSAL_IN_PROCESS, OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT, OrderStatus.CAPTURE_IN_PROCESS, OrderStatus.REJECTED, OrderStatus.ACCEPTED]:
         raise TransactionServiceException(115, "Order not allowed to be split")
-    new_order = __clone_order(order, False, order.cod)
+    new_order = __clone_order(order, False, order.cod, False)
     new_order.lineitems[0].quantity = split_order_quantity
     new_order.lineitems[0].total_price = new_order.lineitems[0].unit_price*split_order_quantity
     new_order.lineitems[0].total_weight = new_order.lineitems[0].unit_weight*split_order_quantity
     new_order.total_amount = new_order.lineitems[0].total_price
     order.total_amount = order.lineitems[0].total_price
     order.total_weight = order.lineitems[0].total_weight
     order.shippingCost = order.shippingCost - new_order.shippingCost
     session.commit()
+    inventoryClient = InventoryClient().get_client()
+    inventoryClient.reserveItemInWarehouse(new_order.lineitems[0].item_id, new_order.fulfilmentWarehouseId, sourceId, new_order.id, to_java_date(new_order.created_timestamp), to_java_date(new_order.promised_shipping_time), new_order.lineitems[0].quantity)
+    inventoryClient.reduceReservationCount(order.lineitems[0].item_id, order.fulfilmentWarehouseId, sourceId, order.id, order.lineitems[0].quantity)
     html = """
     <html>
     <body>
     <div>
         <p>Dear Customer,</p>

Subversion Repositories SmartDukaan

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