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

     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     from_datetime = to_datetime - datetime.timedelta(2)
     orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.DOA_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp >= from_datetime).filter(Order.doa_auth_timestamp <= to_datetime).all()
     return orders_not_picked_up
-def receive_return(order_id):
+def receive_return(order_id, receiveCondition):
     order = get_order(order_id)
     # FIXME: For Mahipal warehouse, we need to scan in items for every sales return
     if order.warehouse_id == 7:
         try:
         except:
             print sys.exc_info()[0]
             print 'Could not scan in sales return orders'
     if order.status in [OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.DOA_RETURN_IN_TRANSIT]:
+        if receiveCondition == 0:
-        order.status = OrderStatus.DOA_RECEIVED_PRESTINE
+            order.status = OrderStatus.DOA_RECEIVED_PRESTINE
-        order.statusDescription = "DOA package received"
+            order.statusDescription = "DOA package received"
+        elif receiveCondition == 1:
+            order.status = OrderStatus.DOA_RECEIVED_DAMAGED
+            order.statusDescription = "DOA received damaged"
+        elif receiveCondition == 2:
+            order.status = OrderStatus.DOA_LOST_IN_TRANSIT
+            order.statusDescription = "DOA lost in transit"
         order.received_return_timestamp = datetime.datetime.now()
         session.commit()
     elif order.status == OrderStatus.SALES_RETURN_IN_TRANSIT :
         order.status = OrderStatus.SALES_RET_RECEIVED
         order.statusDescription = "Sales return received"
         new_order = __clone_order(order, False, False)
         ret_order = __create_return_order(order)
         order.status = OrderStatus.DOA_VALID_RESHIPPED
         order.statusDescription = "Order Reshipped"
         session.commit()
+    elif order.status == OrderStatus.DOA_RECEIVED_DAMAGED:
+        new_order = __clone_order(order, False, False)
+        ret_order = __create_return_order(order)
+        order.status = OrderStatus.DOA_RESHIPPED_RCVD_DAMAGED
+        order.statusDescription = "Order Reshipped Received Damaged"
+        session.commit()
+    elif order.status == OrderStatus.DOA_LOST_IN_TRANSIT:
+        new_order = __clone_order(order, False, False)
+        order.status = OrderStatus.DOA_RESHIPPED_LOST_IN_TRANSIT
+        order.statusDescription = "Order Reshipped Lost In Transit"
+        session.commit()
     else:
         raise TransactionServiceException(112, "This order can't be reshipped")
     order.reship_timestamp = datetime.datetime.now()
     order.new_order_id = new_order.id
     if order.cod:
         logging.info("Refunding COD order with status " + str(order.status))
         status_transition = {OrderStatus.SALES_RET_RECEIVED : OrderStatus.SALES_RET_REFUNDED,
                      OrderStatus.DOA_CERT_INVALID : OrderStatus.DOA_INVALID_REFUNDED,
                      OrderStatus.DOA_CERT_VALID : OrderStatus.DOA_VALID_REFUNDED,
+                     OrderStatus.DOA_RECEIVED_DAMAGED : OrderStatus.DOA_REFUNDED_RCVD_DAMAGED,
+                     OrderStatus.DOA_LOST_IN_TRANSIT : OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT,
                      OrderStatus.INIT : OrderStatus.CANCELED,
                      OrderStatus.SUBMITTED_FOR_PROCESSING : OrderStatus.CANCELED,
                      OrderStatus.INVENTORY_LOW : OrderStatus.CANCELED,
                      OrderStatus.LOW_INV_PO_RAISED : OrderStatus.CANCELED,
                      OrderStatus.LOW_INV_REVERSAL_IN_PROCESS : OrderStatus.CANCELED,
             __create_return_order(order)
             order.statusDescription = "Order Cancelled"
         elif order.status == OrderStatus.SALES_RET_RECEIVED:
             __create_return_order(order)
             order.statusDescription = "Order Returned to origin"
-        elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID] :
+        elif order.status in [OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT] :
             __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Order Refunded"
         elif order.status == OrderStatus.CANCEL_REQUEST_CONFIRMED:
             if order.previousStatus  < OrderStatus.BILLED:
                 order.statusDescription = "Order Cancelled on customer request"
     else:
         status_transition = {OrderStatus.SALES_RET_RECEIVED : OrderStatus.SALES_RET_REFUNDED,
                      OrderStatus.DOA_CERT_INVALID : OrderStatus.DOA_INVALID_REFUNDED,
                      OrderStatus.DOA_CERT_VALID : OrderStatus.DOA_VALID_REFUNDED,
+                     OrderStatus.DOA_RECEIVED_DAMAGED : OrderStatus.DOA_REFUNDED_RCVD_DAMAGED,
+                     OrderStatus.DOA_LOST_IN_TRANSIT : OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT,
                      OrderStatus.SUBMITTED_FOR_PROCESSING : OrderStatus.REFUNDED,
                      OrderStatus.INVENTORY_LOW : OrderStatus.REFUNDED,
                      OrderStatus.LOW_INV_PO_RAISED : OrderStatus.REFUNDED,
                      OrderStatus.LOW_INV_REVERSAL_IN_PROCESS : OrderStatus.REFUNDED,
                      OrderStatus.LOW_INV_NOT_AVAILABLE_AT_HOTSPOT : OrderStatus.REFUNDED,
                      OrderStatus.PAYMENT_FLAGGED : OrderStatus.PAYMENT_FLAGGED_DENIED
+                     }
         if order.status not in status_transition.keys():
             raise TransactionServiceException(114, "This order can't be refunded")
-        if order.status in [OrderStatus.SALES_RET_RECEIVED, OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID] :
+        if order.status in [OrderStatus.SALES_RET_RECEIVED, OrderStatus.DOA_CERT_INVALID, OrderStatus.DOA_CERT_VALID, OrderStatus.DOA_RECEIVED_DAMAGED, OrderStatus.DOA_LOST_IN_TRANSIT] :
             __create_return_order(order)
             __create_refund(order)
             order.statusDescription = "Order Refunded"
         elif order.status 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]:
             __create_cancellation(order)
         litem.transfer_price = line_item.transfer_price
         litem.order = new_order
     logistics_client = LogisticsClient().get_client()
     item_id = new_order.lineitems[0].item_id
-    logistics_info = logistics_client.getLogisticsInfo(new_order.customer_pincode, item_id, DeliveryType.PREPAID) #TODO: We should be able to pass another flag to suggest ignoring the inventory situation.
+    logistics_info = logistics_client.getLogisticsInfo(new_order.customer_pincode, item_id, is_cod) #TODO: We should be able to pass another flag to suggest ignoring the inventory situation.
     logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
     new_order.warehouse_id = logistics_info.warehouseId
     new_order.logistics_provider_id = logistics_info.providerId
     new_order.airwaybill_no = logistics_info.airway_billno

Subversion Repositories SmartDukaan

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