Subversion Repositories SmartDukaan

Rev

Rev 4581 | Rev 4602 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4581 Rev 4600
Line 20... Line 20...
20 
    process_return, get_return_order, mark_doas_as_picked_up,\
 20 
    process_return, get_return_order, mark_doas_as_picked_up,\
21 
    create_purchase_order, verify_order, is_alive, get_orders_by_shipping_date,\
 21 
    create_purchase_order, verify_order, is_alive, get_orders_by_shipping_date,\
22 
    update_weight, change_warehouse, change_product, add_delay_reason,\
 22 
    update_weight, change_warehouse, change_product, add_delay_reason,\
23 
    reconcile_cod_collection, get_transactions_requiring_extra_processing,\
 23 
    reconcile_cod_collection, get_transactions_requiring_extra_processing,\
24 
    mark_transaction_as_processed, get_item_wise_risky_orders_count,\
 24 
    mark_transaction_as_processed, get_item_wise_risky_orders_count,\
25 
    get_orders_in_batch, get_order_count,\
 25 
    get_orders_in_batch, get_order_count, get_ebs_settlement_summaries, \
26 
    mark_order_cancellation_request_received,\
 26 
    mark_order_cancellation_request_received,\
27 
    mark_order_cancellation_request_denied, refund_transaction,\
 27 
    mark_order_cancellation_request_denied, refund_transaction,\
28 
    mark_order_cancellation_request_confirmed,\
 28 
    mark_order_cancellation_request_confirmed,\
29 
    mark_transaction_as_payment_flag_removed, accept_orders_for_item_id,\
 29 
    mark_transaction_as_payment_flag_removed, accept_orders_for_item_id,\
30 
    mark_orders_as_po_raised, mark_orders_as_reversal_initiated,\
 30 
    mark_orders_as_po_raised, mark_orders_as_reversal_initiated,\
31 
    mark_orders_as_not_available, update_shipment_address,\
 31 
    mark_orders_as_not_available, update_shipment_address,\
32 
    mark_orders_as_timeout, get_order_for_awb,\
 32 
    mark_orders_as_timeout, get_order_for_awb,\
33 
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
 33 
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
34 
    mark_order_doa_request_received, mark_order_doa_request_authorized,\
 34 
    mark_order_doa_request_received, mark_order_doa_request_authorized,\
35 
    mark_order_return_request_received, mark_order_return_request_authorized,\
 35 
    mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, \
36 
    validate_return_product, get_orders_for_provider_for_status,\
 36 
    validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
37 
    add_invoice_number
 37 
    save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId
38 
 
 38 
 
39 
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
 39 
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
40 
    to_t_alert, to_t_order, to_t_lineitem
 40 
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
41 
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
 41 
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
42 
    LineItem, Order, TransactionServiceException
 42 
    LineItem, Order, TransactionServiceException
43 
from shop2020.utils.Utils import to_py_date, get_fdate_tdate
 43 
from shop2020.utils.Utils import to_py_date, get_fdate_tdate, to_java_date
44 
 
 44 
 
45 
class OrderServiceHandler:
 45 
class OrderServiceHandler:
46
46
47 
    def __init__(self, dbname='transaction', db_hostname='localhost'):
 47 
    def __init__(self, dbname='transaction', db_hostname='localhost'):
48 
        """
 48 
        """
Line 1156... Line 1156...
1156 
        try:
 1156 
        try:
1157 
            orders_of_provider_by_status = get_orders_for_provider_for_status(provider_id, order_status)
 1157 
            orders_of_provider_by_status = get_orders_for_provider_for_status(provider_id, order_status)
1158 
            return [to_t_order(order) for order in orders_of_provider_by_status if order != None]
 1158 
            return [to_t_order(order) for order in orders_of_provider_by_status if order != None]
1159 
        finally:
 1159 
        finally:
1160 
            close_session()
 1160 
            close_session()
- 
 
 1161
- 
 
 1162 
    def getBilledOrdersForVendor(self, vendorId, billingDateFrom, billingDateTo):
- 
 
 1163 
        '''
- 
 
 1164 
        Parameters:
- 
 
 1165 
         - vendorId
- 
 
 1166 
         - billingDateFrom
- 
 
 1167 
         - billingDateTo
- 
 
 1168 
        '''
- 
 
 1169 
        try:
- 
 
 1170 
            return [to_t_order(order) for order in get_billed_orders_for_vendor(vendorId, to_py_date(billingDateFrom), to_py_date(billingDateTo))]
- 
 
 1171 
        finally:
- 
 
 1172 
            close_session()
- 
 
 1173
- 
 
 1174 
    def getEBSSettlementSummaries(self):
- 
 
 1175 
        try:
- 
 
 1176 
            return get_ebs_settlement_summaries()
- 
 
 1177 
        finally:
- 
 
 1178 
            close_session()
1161 
 
 1179 
 
- 
 
 1180 
    def saveEBSSettlementSummary(self, settlementId, settlementDate, transactionDateFrom, transactionDateTo, amount):
- 
 
 1181 
        try:
- 
 
 1182 
            save_ebs_settlement_summary(settlementId, to_py_date(settlementDate), to_py_date(transactionDateFrom), to_py_date(transactionDateTo), amount)
- 
 
 1183 
        finally:
- 
 
 1184 
            close_session()
- 
 
 1185
- 
 
 1186 
    def getSettlementForPaymentId(self, paymentId):
- 
 
 1187 
        '''
- 
 
 1188 
        Parameters:
- 
 
 1189 
         - paymentId
- 
 
 1190 
        '''
- 
 
 1191 
        try:
- 
 
 1192 
            return to_t_payment_settlement(get_settlement_for_paymentId(paymentId))
- 
 
 1193 
        finally:
- 
 
 1194 
            close_session()
- 
 
 1195
- 
 
 1196 
    def getEBSSettlementDate(self, settlementId):
- 
 
 1197 
        try:
- 
 
 1198 
            return to_java_date(get_ebs_settlement_date(settlementId))
- 
 
 1199 
        finally:
- 
 
 1200 
            close_session()
- 
 
 1201
- 
 
 1202 
    def savePaymentSettlements(self, settlementDate, paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection):
- 
 
 1203 
        try:
- 
 
 1204 
            save_payment_settlements(to_py_date(settlementDate), paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection)
- 
 
 1205 
        finally:
- 
 
 1206 
            close_session()
- 
 
 1207
- 
 
 1208 
    def markEBSSettlementUploaded(self, settlementId):
- 
 
 1209 
        try:
- 
 
 1210 
            mark_ebs_settlement_uploaded(settlementId)
- 
 
 1211 
        finally:
- 
 
 1212 
            close_session()
- 
 
 1213
1162 
    def closeSession(self, ):
 1214 
    def closeSession(self, ):
1163 
        close_session()
 1215 
        close_session()
1164 
 
 1216 
 
1165 
    def isAlive(self, ):
 1217 
    def isAlive(self, ):
1166 
        """
 1218 
        """