Subversion Repositories SmartDukaan

Rev

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

Rev 4875 Rev 4905
Line 15... Line 15...
15 
    order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
 15 
    order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
16 
    get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
 16 
    get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
17 
    get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
 17 
    get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
18 
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
 18 
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
19 
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
 19 
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
20 
    process_return, get_return_order, mark_doas_as_picked_up,\
 20 
    process_return, get_return_order, mark_doas_as_picked_up, verify_order, is_alive, get_orders_by_shipping_date,\
21 
    verify_order, is_alive, get_orders_by_shipping_date,\
 - 
 
22 
    update_weight, change_warehouse, change_product, add_delay_reason,\
 21 
    update_weight, change_warehouse, change_product, add_delay_reason,\
23 
    reconcile_cod_collection, get_transactions_requiring_extra_processing,\
 22 
    reconcile_cod_collection, get_transactions_requiring_extra_processing,\
24 
    mark_transaction_as_processed, get_item_wise_risky_orders_count,\
 23 
    mark_transaction_as_processed, get_item_wise_risky_orders_count,\
25 
    get_orders_in_batch, get_order_count, get_ebs_settlement_summaries, \
 24 
    get_orders_in_batch, get_order_count, get_ebs_settlement_summaries, mark_order_cancellation_request_received,\
26 
    mark_order_cancellation_request_received,\
 - 
 
27 
    mark_order_cancellation_request_denied, refund_transaction,\
 25 
    mark_order_cancellation_request_denied, refund_transaction, mark_order_cancellation_request_confirmed,\
28 
    mark_order_cancellation_request_confirmed,\
 - 
 
29 
    mark_transaction_as_payment_flag_removed, accept_orders_for_item_id,\
 26 
    mark_transaction_as_payment_flag_removed, accept_orders_for_item_id,\
30 
    mark_orders_as_po_raised, mark_orders_as_reversal_initiated,\
 27 
    mark_orders_as_po_raised, mark_orders_as_reversal_initiated, 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,\
 - 
 
33 
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
 28 
    mark_orders_as_timeout, get_order_for_awb, mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
34 
    mark_order_doa_request_received, mark_order_doa_request_authorized,\
 29 
    mark_order_doa_request_received, mark_order_doa_request_authorized,\
35 
    mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
 30 
    mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, get_reshipped_order_ids, \
36 
    validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
 31 
    validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
37 
    save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId, \
 32 
    save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId, \
38 
    get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
 33 
    get_settlements_by_date, get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
39 
    get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up, update_orders_as_PORaised,\
 34 
    get_cancelled_orders, mark_order_as_delivered, mark_return_orders_as_picked_up, update_orders_as_PORaised,\
40 
    get_orders_not_met_expected_delivery_date, get_orders_where_vendor_not_paid,\
 35 
    get_orders_not_met_expected_delivery_date, get_orders_where_vendor_not_paid
41 
    save_cod_payment_settlement
 - 
 
42 
 
 36 
 
43 
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
 37 
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
44 
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
 38 
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
45 
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
 39 
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
46 
    LineItem, Order, TransactionServiceException
 40 
    LineItem, Order, TransactionServiceException
Line 1265... Line 1259...
1265 
        try:
 1259 
        try:
1266 
            return to_java_date(get_ebs_settlement_date(settlementId))
 1260 
            return to_java_date(get_ebs_settlement_date(settlementId))
1267 
        finally:
 1261 
        finally:
1268 
            close_session()
 1262 
            close_session()
1269
1263
1270 
    def savePaymentSettlements(self, settlementDate, paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection):
 1264 
    def savePaymentSettlements(self, settlementDate, paymentGatewayId, referenceId, serviceTax, otherCharges, netCollection):
1271 
        try:
 1265 
        try:
1272 
            save_payment_settlements(to_py_date(settlementDate), paymentGatewayId, paymentId, serviceTax, otherCharges, netCollection)
 1266 
            save_payment_settlements(to_py_date(settlementDate), paymentGatewayId, referenceId, serviceTax, otherCharges, netCollection)
1273 
        finally:
 - 
 
1274 
            close_session()
 - 
 
1275
- 
 
1276 
    def saveCODPaymentSettlement(self, orderId, settlementDate, collection):
 - 
 
1277 
        try:
 - 
 
1278 
            save_cod_payment_settlement(orderId, to_py_date(settlementDate), collection)
 - 
 
1279 
        finally:
 1267 
        finally:
1280 
            close_session()
 1268 
            close_session()
1281
1269
1282 
    def markEBSSettlementUploaded(self, settlementId):
 1270 
    def markEBSSettlementUploaded(self, settlementId):
1283 
        try:
 1271 
        try: