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

     mark_orders_as_po_raised, mark_orders_as_reversal_initiated, mark_orders_as_not_available, update_shipment_address,\
     mark_orders_as_timeout, get_order_for_awb, mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
     mark_order_doa_request_received, mark_order_doa_request_authorized,\
     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_referenceId, \
+    save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_Prepaid, \
     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_order_distribution_by_status, 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, get_order_list,\
     get_order_ids_for_status, update_orders_as_paid_to_vendor, update_COD_agent,\
-    get_refunded_orders_marked_paid
+    get_refunded_orders_marked_paid, get_settlement_for_Cod, get_order_list_for_vendor, update_order_only_as_paid_to_vendor
 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
             orders = get_order_list(order_ids)
             return [to_t_order(order) for order in orders]
         finally:
             close_session()
+    def getOrderListForVendor(self, order_ids, vendorId):
+        """
+        Parameters:
+         - order_ids
+         - vendorId
+        """
+        try:
+            orders = get_order_list_for_vendor(order_ids, vendorId)
+            return [to_t_order(order) for order in orders]
+        finally:
+            close_session()
     def getLineItemsForOrder(self, orderId):
         """
         Parameters:
          - orderId
         """
         try:
             save_ebs_settlement_summary(settlementId, to_py_date(settlementDate), to_py_date(transactionDateFrom), to_py_date(transactionDateTo), amount)
         finally:
             close_session()
-    def getSettlementForReferenceId(self, referenceId, paymentGatewayId, isRefund):
+    def getSettlementForPrepaid(self, referenceId, isRefund):
         '''
         Parameters:
          - referenceId
          - isRefund
         '''
         try:
-            return to_t_payment_settlement(get_settlement_for_referenceId(referenceId, paymentGatewayId, isRefund))
+            return to_t_payment_settlement(get_settlement_for_Prepaid(referenceId, isRefund))
         finally:
             close_session()
+    def getSettlementForCod(self, orderId, isRefund):
+        '''
+        Parameters:
+         - orderId
+         - isRefund
+        '''
+        try:
+            return to_t_payment_settlement(get_settlement_for_Cod(orderId, isRefund))
+        finally:
+            close_session()
     def getEBSSettlementDate(self, settlementId):
         try:
             return to_java_date(get_ebs_settlement_date(settlementId))
         finally:
             close_session()
         try:
             update_COD_agent(agentEmailId, orderId)
         finally:
             close_session()
+    def updateOrderOnlyAsPaidToVendor(self, orderId):
+        try:
+            update_order_only_as_paid_to_vendor(orderId)
+        finally:
+            close_session()
     def getRefundedOrdersMarkedPaid(self):
         try:
             return [to_t_order(order) for order in get_refunded_orders_marked_paid()]
         finally:
             close_session()

Subversion Repositories SmartDukaan

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