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

     update_amazon_fba_order_returns, get_all_amazon_fba_order_returns, \
     get_total_sale_returns_fba_skus_curent_time,get_amazon_fba_sales_latest_snapshot_for_item_location_wise, \
     get_verification_pending_orders_fk, add_invoice_details_to_orders, get_fa_order_by_fk_order_id, \
     get_all_fa_orders_list, add_update_fa_orders_bulk, flipkart_fa_order_exists, get_recharge_order_status, \
     get_recharge_transaction_status, accept_package_orders, get_group_orders_by_logistics_txn_id, \
-    add_billing_details_for_groupped_orders
+    add_billing_details_for_groupped_orders, get_invoice_format_logistics_txn_id
 from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
 from shop2020.model.v1.order.impl.model.DigitalTransaction import \
     DigitalTransaction
 from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
     MobileRechargeOrder
             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, receiveFreebie):
+    def receiveReturn(self, orderId, receiveCondition, receiveFreebie, serialNumbers):
         """
         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.
         Parameters:
          - orderId
         """
         try:
-            return receive_return(orderId, receiveCondition, receiveFreebie)
+            return receive_return(orderId, receiveCondition, receiveFreebie, serialNumbers)
         finally:
             close_session()
     def validateDoa(self, orderId, isValid):
         """
     def getOrderForAwb(self, awb):
         """
         Parameters:
          - AirwayBill Number
         """
+        ret_Orders =[]
         try:
-            return to_t_order(get_order_for_awb(awb))
+            orderList = get_order_for_awb(awb)
+            for order in orderList:
+                ret_Orders.append(to_t_order(order))
+            return ret_Orders
         finally:
             close_session()
     def getOrdersForProviderForStatus(self, provider_id, order_status_list):
         """
         finally:
             self.closeSession()
     def getOrderForAirwayBillNo(self, airwaybillNo):
+        ret_Orders =[]
         try:
-            return to_t_order(get_order_for_airwayBillNo(airwaybillNo))
+            orderList = get_order_for_awb(airwaybillNo)
+            for order in orderList:
+                ret_Orders.append(to_t_order(order))
+            return ret_Orders
         finally:
             close_session()
     def getMinCreatedTimeStampUndeliveredOrdersForSource(self, source):
         try:
                 ret_Orders.append(to_t_order(order))
             return ret_Orders
         finally:
             self.closeSession()
-    def addBillingDetailsForGrouppedOrders(self, order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize):
+    def addBillingDetailsForGrouppedOrders(self, order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType):
         try:
-            return add_billing_details_for_groupped_orders(order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize)
+            return add_billing_details_for_groupped_orders(order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType)
+        finally:
+            self.closeSession()
+    def getInvoiceFormatLogisticsTxnId(self, transactionId, shipementSeq):
+        try:
+            return get_invoice_format_logistics_txn_id(transactionId, shipementSeq)
         finally:
             self.closeSession()
     def closeSession(self, ):
         close_session()
     def isAlive(self, ):
         """

Subversion Repositories SmartDukaan

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