Subversion Repositories SmartDukaan

Rev

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

Rev 20745 Rev 20811
Line 115... Line 115...
115
    get_eligible_return_orders_for_pickup, validate_return_transaction, \
115
    get_eligible_return_orders_for_pickup, validate_return_transaction, \
116
    get_return_pickup_request, mark_return_not_required_orders_as_processed, \
116
    get_return_pickup_request, mark_return_not_required_orders_as_processed, \
117
    get_all_return_orders_for_return_pickup_request, unaccept_order, \
117
    get_all_return_orders_for_return_pickup_request, unaccept_order, \
118
    get_outstanding_payments, mark_payment_settled, get_seller_info, \
118
    get_outstanding_payments, mark_payment_settled, get_seller_info, \
119
    get_warehouse_address, get_buyer_by_warehouse, add_shipment_delay, \
119
    get_warehouse_address, get_buyer_by_warehouse, add_shipment_delay, \
120
    refund_return_order, get_cost_detail_for_logistics_txn_id
120
    refund_return_order, get_cost_detail_for_logistics_txn_id, add_shipment_logistic_detail
121
from shop2020.model.v1.order.impl.DataService import DtrBatchCreditTracker
121
from shop2020.model.v1.order.impl.DataService import DtrBatchCreditTracker
122
from shop2020.model.v1.order.impl.ObsoleteDataAccessors import create_ebay_order, \
122
from shop2020.model.v1.order.impl.ObsoleteDataAccessors import create_ebay_order, \
123
    get_ebay_order_by_orderId, get_ebay_order_by_sales_rec_number, get_ebay_order, \
123
    get_ebay_order_by_orderId, get_ebay_order_by_sales_rec_number, get_ebay_order, \
124
    update_ebay_order, ebay_order_exists, update_order_for_ebay, split_ebay_order, \
124
    update_ebay_order, ebay_order_exists, update_order_for_ebay, split_ebay_order, \
125
    add_or_update_amazon_fba_sales_snapshot, get_amazon_fba_sales_snapshot_for_days, \
125
    add_or_update_amazon_fba_sales_snapshot, get_amazon_fba_sales_snapshot_for_days, \
Line 2595... Line 2595...
2595
                ret_Orders.append(to_t_order(order))
2595
                ret_Orders.append(to_t_order(order))
2596
            return ret_Orders
2596
            return ret_Orders
2597
        finally:
2597
        finally:
2598
            self.closeSession()
2598
            self.closeSession()
2599
            
2599
            
2600
    def addBillingDetailsForGrouppedOrders(self, order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType, packageDimensions):
2600
    def addBillingDetailsForGrouppedOrders(self, order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType):
2601
        try:
2601
        try:
2602
            return add_billing_details_for_groupped_orders(order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType, packageDimensions)
2602
            return add_billing_details_for_groupped_orders(order_ids, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType)
2603
        finally:
2603
        finally:
2604
            self.closeSession()
2604
            self.closeSession()
2605
    
2605
    
2606
    def getInvoiceFormatLogisticsTxnId(self, transactionId, shipementSeq):
2606
    def getInvoiceFormatLogisticsTxnId(self, transactionId, shipementSeq):
2607
        try:
2607
        try:
Line 3185... Line 3185...
3185
    def getCostDetailForLogisticsTxnId(self, logisticsTxnId):
3185
    def getCostDetailForLogisticsTxnId(self, logisticsTxnId):
3186
        try:
3186
        try:
3187
            return to_t_ShipmentLogisticsCostDetail(get_cost_detail_for_logistics_txn_id(logisticsTxnId))
3187
            return to_t_ShipmentLogisticsCostDetail(get_cost_detail_for_logistics_txn_id(logisticsTxnId))
3188
        finally:
3188
        finally:
3189
            close_session()
3189
            close_session()
-
 
3190
    
-
 
3191
    def addShipmentLogisticDetail(self, shipmentLogisticsCostDetail):
-
 
3192
        try:
-
 
3193
            add_shipment_logistic_detail(shipmentLogisticsCostDetail)
-
 
3194
        finally:
-
 
3195
            close_session()
3190
            
3196
            
3191
        
3197
        
3192
def main():
3198
def main():
3193
    OrderServiceHandler().creditBatch(2, '{"483649":100.0, "8021773":23, "123213":10}')
3199
    OrderServiceHandler().creditBatch(2, '{"483649":100.0, "8021773":23, "123213":10}')
3194
            
3200