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

     order.total_weight = t_order.total_weight
     if t_order.created_timestamp:
         order.created_timestamp = to_py_date(t_order.created_timestamp)
     else:
         order.created_timestamp = datetime.datetime.now()
+    order.pickupStoreId = t_order.pickupStoreId
     return order
 def create_transaction(t_transaction):
     t_orders = t_transaction.orders
     if not t_orders:
             order.orderType = orderType
             #After we got payment success, we will set logistics info also
             logistics_client = LogisticsClient().get_client()
             #FIXME line item is only one now. If multiple will come, need to fix.
             item_id = order.lineitems[0].item_id
+            if order.pickupStoreId:
-            logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD)
+                logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.PREPAID)
+            else:
+                logistics_info = logistics_client.getLogisticsInfo(order.customer_pincode, item_id, DeliveryType.COD)
             current_time = datetime.datetime.now()
             logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
             logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
             order.warehouse_id = logistics_info.warehouseId
     for awb, detail in delivered_orders.iteritems():
         order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
         if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE]:
             continue
             #raise TransactionServiceException(103, "No order found for the awb:" + awb)
+        if order.pickupStoreId:
+            order.status = OrderStatus.DELIVERED_AT_STORE
+            order.statusDescription = "Order delivered At Store"
+        else:
-        order.status = OrderStatus.DELIVERY_SUCCESS
+            order.status = OrderStatus.DELIVERY_SUCCESS
-        order.statusDescription = "Order delivered"
+            order.statusDescription = "Order delivered"
         timestamp, receiver = detail.split('|')
         if order.first_dlvyatmp_timestamp is None:
             order.first_dlvyatmp_timestamp = timestamp
         order.delivery_timestamp = timestamp
         order.receiver = receiver
         update_trust_level(order)
     session.commit()
 def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
     order = Order.get_by(id=orderId)
-    if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DOA_PICKUP_REQUEST_RAISED, OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_RECEIVED, OrderStatus.RET_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RET_PICKUP_REQUEST_RAISED, OrderStatus.RTO_IN_TRANSIT, OrderStatus.BILLED]:
+    if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE, OrderStatus.DOA_PICKUP_REQUEST_RAISED, OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_RECEIVED, OrderStatus.RET_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RET_PICKUP_REQUEST_RAISED, OrderStatus.RTO_IN_TRANSIT, OrderStatus.BILLED, OrderStatus.RECEIVED_AT_STORE]:
         raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
     # Provider is 4 is for self pickup and hardcoded. We should figure out a way to not to hard code.
     if order.status == OrderStatus.BILLED and order.logistics_provider_id != 4:
             raise TransactionServiceException(101, "Order is not marked for self pickup: " + str(orderId))
-    if 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.RTO_IN_TRANSIT, OrderStatus.BILLED]:
+    if 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.RTO_IN_TRANSIT, OrderStatus.BILLED, OrderStatus.RECEIVED_AT_STORE]:
         order.delivery_timestamp = deliveryTimestamp
         order.receiver = receiver
     order.status = OrderStatus.DELIVERY_SUCCESS
     order.statusDescription = "Order delivered"
     update_trust_level(order)
     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]:
+        order.status = OrderStatus.RECEIVED_AT_STORE
+        order.statusDescription = "Order received at store"
+        order.delivery_timestamp = deliveryTimestamp
+    session.commit()
 def mark_orders_as_rto(provider_id, returned_orders):
     for awb, detail in returned_orders.iteritems():
         order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
         if order == None or order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY, OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE]:
             continue
     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()
     return rto_orders
+def get_receive_pending_orders(storeId):
+    return Order.query.filter_by(pickupStoreId = storeId).filter(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))).all()
+def get_received_at_store_orders(storeId):
+    return Order.query.filter_by(pickupStoreId = storeId).filter_by(status = OrderStatus.RECEIVED_AT_STORE).all()
 def update_non_delivery_reason(provider_id, undelivered_orders):
     for awb, reason in undelivered_orders.iteritems():
         order = Order.query.filter_by(airwaybill_no=awb, logistics_provider_id = provider_id).first()
         if order == None or order.status == OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE:
             continue

Subversion Repositories SmartDukaan

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