Subversion Repositories SmartDukaan

Rev

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

Rev 4662 Rev 4709
Line 33... Line 33...
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, add_invoice_number, \
35
    mark_order_return_request_received, mark_order_return_request_authorized, add_invoice_number, \
36
    validate_return_product, get_orders_for_provider_for_status, save_ebs_settlement_summary, get_ebs_settlement_date, \
36
    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,\
37
    save_payment_settlements, mark_ebs_settlement_uploaded, get_billed_orders_for_vendor, get_settlement_for_paymentId,\
38
    get_slipped_sipping_date_orders, mark_order_as_lost_in_transit
38
    get_slipped_sipping_date_orders, mark_order_as_lost_in_transit,\
-
 
39
    get_cancelled_orders
39
 
40
 
40
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
41
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
41
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
42
    to_t_alert, to_t_order, to_t_lineitem, to_t_payment_settlement
42
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
43
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
43
    LineItem, Order, TransactionServiceException
44
    LineItem, Order, TransactionServiceException
Line 1186... Line 1187...
1186
        try:
1187
        try:
1187
            return [to_t_order(order) for order in get_slipped_sipping_date_orders()]
1188
            return [to_t_order(order) for order in get_slipped_sipping_date_orders()]
1188
        finally:
1189
        finally:
1189
            close_session()
1190
            close_session()
1190
            
1191
            
-
 
1192
    def getCancelledOrders(self, cancelDateFrom, cancelDateTo):
-
 
1193
        try:
-
 
1194
            return [to_t_order(order) for order in get_cancelled_orders(to_py_date(cancelDateFrom), to_py_date(cancelDateTo))]
-
 
1195
        finally:
-
 
1196
            close_session()
-
 
1197
            
1191
    def getEBSSettlementSummaries(self):
1198
    def getEBSSettlementSummaries(self):
1192
        try:
1199
        try:
1193
            return get_ebs_settlement_summaries()
1200
            return get_ebs_settlement_summaries()
1194
        finally:
1201
        finally:
1195
            close_session()
1202
            close_session()