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

     create_order, get_new_transaction, get_transactions_for_customer, get_transaction_status,\
     get_line_items_for_order, get_transaction, get_transactions_for_shopping_cart_id,\
     change_transaction_status, get_orders_for_customer,get_orders_for_transaction, get_order,\
     get_returnable_orders_for_customer, get_cancellable_orders_for_customer, get_orders_by_billing_date,\
     get_all_orders, change_order_status, get_alerts, add_alert, add_billing_details,\
-    mark_orders_as_manifested, close_session, accept_order, mark_orders_as_picked_up,\
+    close_session, accept_order, mark_orders_as_picked_up,\
-    mark_orders_as_delivered, mark_orders_as_failed,\
+    mark_orders_as_delivered, mark_orders_as_rto,\
     order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
     get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
     get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
     get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
     receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
     mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
     validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
     save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId, \
     get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
     get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up, update_orders_as_PORaised,\
-    get_orders_not_met_expected_delivery_date, get_orders_where_vendor_not_paid
+    get_orders_not_met_expected_delivery_date, get_orders_where_vendor_not_paid,\
+    mark_orders_as_local_connected, mark_orders_as_destinationCityReached,\
+    mark_orders_as_firstDeliveryAttempted, get_non_delivered_orders_by_courier, get_orders_not_local_connected,\
+    get_doas_not_picked_up, get_return_orders_not_picked_up, get_orders_not_picked_up, get_rto_orders
 from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
     to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
 from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
     LineItem, Order, TransactionServiceException
         try:
             return order_outofstock(orderId)
         finally:
             close_session()
-    def markOrdersAsManifested(self, warehouseId, providerId, cod):
+    def markOrdersAsShippedFromWarehouse(self, warehouseId, providerId, cod, orderIds):
         """
         Depending on the third parameter, marks either all prepaid or all cod orders BILLED by the
-        given warehouse and were picked up by the given provider as MANIFESTED.
+        given warehouse and were picked up by the given provider as SHIPPED_FROM_WH.
         Parameters:
          - warehouseId
          - providerId
          - cod
         """
         try:
-            return mark_orders_as_manifested(warehouseId, providerId, cod)
+            return mark_orders_as_shipped_from_warehouse(warehouseId, providerId, cod, orderIds)
         finally:
             close_session()
-    def markOrdersAsShippedFromWarehouse(self, warehouseId, providerId, cod, orderIds):
+    def markOrdersAsPickedUp(self, providerId, pickupDetails):
         """
-        Depending on the third parameter, marks either all prepaid or all cod orders MANIFESTED by the
+        Marks all SHIPPED_FROM_WH orders of the previous day for a provider as SHIPPED_TO_LOGISTICS.
-        given warehouse and were picked up by the given provider as SHIPPED_FROM_WH.
+        Raises an exception if we encounter report for an AWB number that we did not ship.
         Parameters:
-         - warehouseId
          - providerId
-         - cod
+         - pickupDetails
         """
         try:
-            return mark_orders_as_shipped_from_warehouse(warehouseId, providerId, cod, orderIds)
+            mark_orders_as_picked_up(providerId, pickupDetails)
         finally:
             close_session()
-    def markOrdersAsPickedUp(self, providerId, pickupDetails):
+    def getOrdersNotPickedUp(self, providerId):
         """
-        Marks all SHIPPED_FROM_WH orders of the previous day for a provider as SHIPPED_TO_LOGISTICS.
         Returns a list of orders that were shipped from warehouse but did not appear in the pick-up report.
-        Raises an exception if we encounter report for an AWB number that we did not ship.
         Parameters:
          - providerId
-         - pickupDetails
         """
         try:
-            orders_not_picked_up = mark_orders_as_picked_up(providerId, pickupDetails)
+            orders_not_picked_up = get_orders_not_picked_up(providerId)
             return [to_t_order(order) for order in orders_not_picked_up]
         finally:
             close_session()
     def markOrdersAsDelivered(self, providerId, deliveredOrders):
             mark_order_as_delivered(orderId, to_py_date(deliveryTimestamp), receiver)
         finally:
             close_session()
-    def markOrdersAsFailed(self, providerId, returnedOrders):
+    def markAsRTOrders(self, providerId, returnedOrders):
         """
-        Mark all orders with AWBs in the given map as failed. Also sets the delivery timestamp.
+        Mark all orders with AWBs in the given map as RTO. Also sets the delivery timestamp.
         Raises an exception if we encounter report for an AWB number that we did not ship.
         Parameters:
          - providerId
          - returnedOrders
         """
         try:
-            mark_orders_as_failed(providerId, returnedOrders)
+            mark_orders_as_rto(providerId, returnedOrders)
+        finally:
+            close_session()
+    def getRTOrders(self, providerId):
+        """
+        Returns a list of orders that were returned by courier.
+        Parameters:
+         - providerId
+        """
+        try:
+            rto_orders = get_rto_orders(providerId)
+            return [to_t_order(order) for order in rto_orders]
         finally:
             close_session()
     def updateNonDeliveryReason(self, providerId, undeliveredOrders):
         """
         Parameters:
          - providerId
          - undelivered_orders
         """
         try:
-            orders_not_delivered = update_non_delivery_reason(providerId, undeliveredOrders)
+            update_non_delivery_reason(providerId, undeliveredOrders)
+        finally:
+            close_session()
+    def getNonDeliveredOrdersbyCourier(self, providerId):
+        """
+        Returns a list of orders that were picked up or shipped four days ago but did not get delivered.
+        Parameters:
+         - providerId
+        """
+        try:
+            orders_not_delivered = get_non_delivered_orders_by_courier(providerId)
             return [to_t_order(order) for order in orders_not_delivered]
         finally:
             close_session()
+    def markOrdersAsLocalConnected(self, providerId, local_connected_orders):
+        """
+        Mark all orders with AWBs in the given map as local connected. Also sets the local connected timestamp.
+        Parameters:
+         - providerId
+         - local_connected_orders
+        """
+        try:
+            mark_orders_as_local_connected(providerId, local_connected_orders)
+        finally:
+            close_session()
+    def getOrdersNotLocalConnected(self, providerId):
+        """
+        Returns a list of orders that were picked up or shipped but pending local connection.
+        Parameters:
+         - providerId
+        """
+        try:
+            orders_pending_local_connection = get_orders_not_local_connected(providerId)
+            return [to_t_order(order) for order in orders_pending_local_connection]
+        finally:
+            close_session()
+    def markOrdersAsDestinationCityReached(self, providerId, destination_city_reached_orders):
+        """
+        Mark all orders with AWBs in the given map as reached destination city. Also sets the reached destination timestamp.
+        Parameters:
+         - providerId
+         - destination_city_reached_orders
+        """
+        try:
+            mark_orders_as_destinationCityReached(providerId, destination_city_reached_orders)
+        finally:
+            close_session()
+    def markOrdersAsFirstDeliveryAttempted(self, providerId, first_atdl_orders):
+        """
+        Mark all orders with AWBs in the given map as first delivery attempt made. Also sets the first delivery attempted timestamp.
+        Parameters:
+         - providerId
+         - first_atdl_orders
+        """
+        try:
+            mark_orders_as_firstDeliveryAttempted(providerId, first_atdl_orders)
+        finally:
+            close_session()
     def getUndeliveredOrdersExpectedDeliveryDateNotMet(self):
         """
         Returns the list of orders whose expected delivery date has passed but have not been
         delivered yet.
         Returns an empty list if no such orders exist.
             close_session()
     def markDoasAsPickedUp(self, providerId, pickupDetails):
         """
         Marks all DOA_PICKUP_AUTHORIZED orders of the previous day for a provider as DOA_RETURN_IN_TRANSIT.
-        Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
         Parameters:
          - providerId
          - pickupDetails
         """
         try:
+            mark_doas_as_picked_up(providerId, pickupDetails)
+        finally:
+            close_session()
+    def getDoasNotPickedUp(self, providerId):
+        """
+        Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
+        Parameters:
+         - providerId
+        """
+        try:
-            orders_not_picked_up = mark_doas_as_picked_up(providerId, pickupDetails)
+            orders_not_picked_up = get_doas_not_picked_up(providerId)
             return [to_t_order(order) for order in orders_not_picked_up]
         finally:
             close_session()
     def markReturnOrdersAsPickedUp(self, providerId, pickupDetails):
         """
         Marks all RET_PICKUP_CONFIRMED orders of the previous day for a provider as RET_RETURN_IN_TRANSIT.
-        Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
         Parameters:
          - providerId
          - pickupDetails
         """
         try:
+            mark_return_orders_as_picked_up(providerId, pickupDetails)
+        finally:
+            close_session()
+    def getReturnOrdersNotPickedUp(self, providerId):
+        """
+        Returns a list of orders that were authorized for pickup but did not appear in the pick-up report.
+        Parameters:
+         - providerId
+        """
+        try:
-            orders_not_picked_up = mark_return_orders_as_picked_up(providerId, pickupDetails)
+            orders_not_picked_up = get_return_orders_not_picked_up(providerId)
             return [to_t_order(order) for order in orders_not_picked_up]
         finally:
             close_session()
     def receiveReturn(self, orderId, receiveCondition):
         """
         If the order status is DOA_PICKUP_CONFIRMED or DOA_RETURN_IN_TRANSIT, marks the order status as DOA_RECEIVED_PRESTINE and returns true.
         If the order is in any other state, it returns false.
         Throws an exception if the order with the given id couldn't be found.
         try:
             return to_t_order(get_order_for_awb(awb))
         finally:
             close_session()
-    def getOrdersForProviderForStatus(self, provider_id, order_status):
+    def getOrdersForProviderForStatus(self, provider_id, order_status_list):
         """
         Parameters:
          - provider id
          - order status
         """
         try:
-            orders_of_provider_by_status = get_orders_for_provider_for_status(provider_id, order_status)
+            orders_of_provider_by_status = get_orders_for_provider_for_status(provider_id, order_status_list)
             return [to_t_order(order) for order in orders_of_provider_by_status if order != None]
         finally:
             close_session()
     def getBilledOrdersForVendor(self, vendorId, billingDateFrom, billingDateTo):

Subversion Repositories SmartDukaan

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