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

     order.statusDescription = "Low Inventory"
     order.outofstock_timestamp = datetime.datetime.now()
     session.commit()
     return True
-def mark_orders_as_manifested(warehouse_id, provider_id, cod):
-    try:
-        orders = Order.query.filter_by(warehouse_id = warehouse_id, logistics_provider_id = provider_id, status = OrderStatus.BILLED, cod = cod).all()
-        for order in orders:
-            order.status = OrderStatus.MANIFESTED
-            order.statusDescription = "Order manifested"
-        session.commit()
-        return True
-    except:
-        return False
 def mark_orders_as_shipped_from_warehouse(warehouseId, providerId, cod, orderIds):
     try:
         current_timestamp = datetime.datetime.now()
         orders = Order.query.filter_by(warehouse_id = warehouseId, logistics_provider_id = providerId, status = OrderStatus.BILLED, cod = cod).all()
         for order in orders:
         order.status = OrderStatus.SHIPPED_TO_LOGST
         order.statusDescription = "Order picked up by Courier Company"
         order.pickup_timestamp = pickup_timestamp
     session.commit()
+def get_orders_not_picked_up(provider_id):
     current_time = datetime.datetime.now()
     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     orders_not_picked_up = Order.query.filter_by(logistics_provider_id = provider_id).filter_by(status=OrderStatus.SHIPPED_FROM_WH).filter(Order.shipping_timestamp <= to_datetime).all()
     return orders_not_picked_up
 def mark_orders_as_delivered(provider_id, delivered_orders):
     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]:
+        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)
         order.status = OrderStatus.DELIVERY_SUCCESS
         order.statusDescription = "Order delivered"
-        order.delivery_timestamp, order.receiver = detail.split('|')
+        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.DOA_PICKUP_REQUEST_RAISED, OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_RECEIVED, OrderStatus.RET_PICKUP_CONFIRMED, OrderStatus.RET_REQUEST_AUTHORIZED, OrderStatus.RTO_IN_TRANSIT]:
+    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.RTO_IN_TRANSIT]:
         raise TransactionServiceException(101, "Either wrond order id or invalid state " + str(orderId))
-    if order.status in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.RTO_IN_TRANSIT]:
+    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]:
         order.delivery_timestamp = deliveryTimestamp
         order.receiver = receiver
     order.status = OrderStatus.DELIVERY_SUCCESS
     order.statusDescription = "Order delivered"
     update_trust_level(order)
     session.commit()
-def mark_orders_as_failed(provider_id, returned_orders):
+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]:
+        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)
         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()
+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()
+    return rto_orders
 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:
             continue
             #raise TransactionServiceException(103, "No order found for the awb:" + awb)
         order.statusDescription = reason
     session.commit()
+def get_non_delivered_orders_by_courier(provider_id):
     current_time = datetime.datetime.now()
     today_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     upto_datetime = today_datetime - datetime.timedelta(4)
-    orders_not_delivered = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST))).filter(or_(Order.shipping_timestamp <= upto_datetime, Order.pickup_timestamp <= upto_datetime)).all()
+    orders_not_delivered = Order.query.filter_by(logistics_provider_id = provider_id).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))).filter(or_(Order.shipping_timestamp <= upto_datetime, Order.pickup_timestamp <= upto_datetime)).all()
     return orders_not_delivered
+def mark_orders_as_local_connected(provider_id, local_connected_orders):
+    for awb, timestamp in local_connected_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]:
+            #raise TransactionServiceException(102, "No order found for the awb: " + awb)
+            continue
+        order.status = OrderStatus.SHIPPED_TO_DESTINATION_CITY
+        order.statusDescription = "Left Out of Origin City"
+        order.local_connected_timestamp = timestamp
+    session.commit()
+def get_orders_not_local_connected(provider_id):
+    current_time = datetime.datetime.now()
+    to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
+    orders_pending_local_connection = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST))).filter(or_(Order.shipping_timestamp <= to_datetime, Order.pickup_timestamp <= to_datetime)).all()
+    return orders_pending_local_connection
+def mark_orders_as_destinationCityReached(provider_id, destination_city_reached_orders):
+    for awb, timestamp in destination_city_reached_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]:
+            continue
+            #raise TransactionServiceException(103, "No order found for the awb:" + awb)
+        order.status = OrderStatus.REACHED_DESTINATION_CITY
+        order.statusDescription = "Reached Destination City"
+        order.reached_destination_timestamp = timestamp
+    session.commit()
+def mark_orders_as_firstDeliveryAttempted(provider_id, first_atdl_orders):
+    for awb, detail in first_atdl_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]:
+            continue
+            #raise TransactionServiceException(103, "No order found for the awb:" + awb)
+        order.status = OrderStatus.FIRST_DELIVERY_ATTEMPT_MADE
+        order.first_dlvyatmp_timestamp, reason = detail.split('|')
+        order.statusDescription = reason
+    session.commit()
 def get_orders_not_met_expected_delivery_date():
     current_time = datetime.datetime.now()
     today_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
-    orders_not_delivered = Order.query.filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST))).filter(Order.expected_delivery_time <= today_datetime).all()
+    orders_not_delivered = Order.query.filter(Order.status.in_((OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.SHIPPED_TO_DESTINATION_CITY, OrderStatus.REACHED_DESTINATION_CITY))).filter(Order.expected_delivery_time <= today_datetime).all()
     return orders_not_delivered
 def get_alerts(type, warehouseId, status, timestamp):
     query = Alert.query.filter(Alert.warehouseId == warehouseId)
     if type != -1 :
         order.status = OrderStatus.DOA_RETURN_IN_TRANSIT
         order.statusDescription = "DOA picked up by Courier Company"
         order.doa_pickup_timestamp = doa_pickup_timestamp
     session.commit()
+def get_doas_not_picked_up(provider_id):
     current_time = datetime.datetime.now()
     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     orders_not_picked_up = Order.query.filter_by(doa_logistics_provider_id = provider_id).filter_by(status=OrderStatus.DOA_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
     return orders_not_picked_up
         order.status = OrderStatus.RET_RETURN_IN_TRANSIT
         order.statusDescription = "Return order picked up by Courier Company"
         order.doa_pickup_timestamp = return_order_pickup_timestamp
     session.commit()
+def get_return_orders_not_picked_up(provider_id):
     current_time = datetime.datetime.now()
     to_datetime = datetime.datetime(current_time.year, current_time.month, current_time.day)
     orders_not_picked_up = Order.query.filter_by(doa_logistics_provider_id = provider_id).filter_by(status=OrderStatus.RET_PICKUP_CONFIRMED).filter(Order.doa_auth_timestamp <= to_datetime).all()
     return orders_not_picked_up
     """
     Parameters:
      - orderId
     """
     order = get_order(orderId)
-    if order.status not in [OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST]:
+    if 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]:
         raise TransactionServiceException(115, "This order can't be marked as lost in transit")
     order.status = OrderStatus.LOST_IN_TRANSIT
     order.statusDescription = "Lost in Transit"
     session.commit()
     if not order:
         raise TransactionServiceException(108, "no such order")
     return order
-def get_orders_for_provider_for_status(provider_id, order_status):
+def get_orders_for_provider_for_status(provider_id, order_status_list):
-    if not provider_id or not order_status:
+    if not provider_id or not order_status_list:
         raise TransactionServiceException(101, "bad provider id or order status")
+    doa_provider = False
+    for order_status in order_status_list:
-    if order_status in [OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_PICKUP_CONFIRMED]:
+        if order_status in [OrderStatus.DOA_PICKUP_CONFIRMED, OrderStatus.RET_PICKUP_CONFIRMED]:
+            doa_provider = True
+    if doa_provider:
-        query = Order.query.filter_by(doa_logistics_provider_id = provider_id, status = order_status)
+        query = Order.query.filter_by(doa_logistics_provider_id = provider_id).filter(Order.status.in_(order_status_list))
     else:
-        query = Order.query.filter_by(logistics_provider_id = provider_id, status = order_status)
+        query = Order.query.filter_by(logistics_provider_id = provider_id).filter(Order.status.in_(order_status_list))
     return query.all()
 def get_billed_orders_for_vendor(vendor_id, billing_date_from, billing_date_to):
     query = Order.query.filter_by(vendorId = vendor_id)
     query = query.filter(Order.status != OrderStatus.PAYMENT_PENDING)

Subversion Repositories SmartDukaan

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