Subversion Repositories SmartDukaan

Rev

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

Rev 7172 Rev 7190
Line 65... Line 65...
65
    validate_recharge, get_recharge_denominations, update_availability_status, \
65
    validate_recharge, get_recharge_denominations, update_availability_status, \
66
    get_misc_charges, get_available_emi_schemes, refund_recharge_order, \
66
    get_misc_charges, get_available_emi_schemes, refund_recharge_order, \
67
    create_recharge_transaction, get_physical_orders, get_document, retrieve_invoice, \
67
    create_recharge_transaction, get_physical_orders, get_document, retrieve_invoice, \
68
    change_shipping_address, get_recharge_transactions, get_recharge_transaction, \
68
    change_shipping_address, get_recharge_transactions, get_recharge_transaction, \
69
    get_frcs, get_hotspot_store, get_circle, retrieve_hotspot_recharge_invoice, \
69
    get_frcs, get_hotspot_store, get_circle, retrieve_hotspot_recharge_invoice, \
70
    get_recharge_trans, get_recharge_transactions_by_number, update_hotspot_store_password
70
    get_recharge_trans, split_freebie_order, get_recharge_transactions_by_number, \
-
 
71
    update_hotspot_store_password
71
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
72
from shop2020.model.v1.order.impl.model.DTHRechargeOrder import DTHRechargeOrder
72
from shop2020.model.v1.order.impl.model.DigitalTransaction import \
73
from shop2020.model.v1.order.impl.model.DigitalTransaction import \
73
    DigitalTransaction
74
    DigitalTransaction
74
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
75
from shop2020.model.v1.order.impl.model.MobileRechargeOrder import \
75
    MobileRechargeOrder
76
    MobileRechargeOrder
Line 405... Line 406...
405
                t_lineitems.append(to_t_lineitem(lineitem))
406
                t_lineitems.append(to_t_lineitem(lineitem))
406
            return t_lineitems
407
            return t_lineitems
407
        finally:
408
        finally:
408
            close_session()
409
            close_session()
409
 
410
 
410
    def addBillingDetails(self, orderId, invoice_number, serialNumber, itemNumber, billedBy, jacketNumber, billingType, vendorId, authorize):
411
    def addBillingDetails(self, orderId, invoice_number, serialNumber, itemNumber, freebieWarehouseId, billedBy, jacketNumber, billingType, vendorId, authorize):
411
        """
412
        """
412
        Adds jacket number and serial no. to the order. Doesn't update the serial no. if a -1 is supplied.
413
        Adds jacket number and serial no. to the order. Doesn't update the serial no. if a -1 is supplied.
413
        Also marks the order as billed and sets the billing timestamp.
414
        Also marks the order as billed and sets the billing timestamp.
414
        Return false if it doesn't find the order with the given ID.
415
        Return false if it doesn't find the order with the given ID.
415
        
416
        
416
        Parameters:
417
        Parameters:
417
         - orderId
418
         - orderId
418
         - jacketNumber
419
         - jacketNumber
419
         - serialNumber
420
         - serialNumber
420
         - itemNumber
421
         - itemNumber
-
 
422
         - freebieWarehouseId
421
         - billedBy
423
         - billedBy
422
        """
424
        """
423
        try:
425
        try:
424
            return add_billing_details(orderId, invoice_number, serialNumber, itemNumber, billedBy, jacketNumber, billingType, vendorId, authorize)
426
            return add_billing_details(orderId, invoice_number, serialNumber, itemNumber, freebieWarehouseId, billedBy, jacketNumber, billingType, vendorId, authorize)
425
        finally:
427
        finally:
426
            close_session()
428
            close_session()
427
 
429
 
428
    def addInvoiceNumber(self, orderId, invoiceNumber, color, serialNumber, itemNumber):
430
    def addInvoiceNumber(self, orderId, invoiceNumber, color, serialNumber, itemNumber):
429
        """
431
        """
Line 1958... Line 1960...
1958
    def retrieveHotspotRechargeInvoice(self, rechargeId):
1960
    def retrieveHotspotRechargeInvoice(self, rechargeId):
1959
        try:
1961
        try:
1960
            return retrieve_hotspot_recharge_invoice(rechargeId)
1962
            return retrieve_hotspot_recharge_invoice(rechargeId)
1961
        finally:
1963
        finally:
1962
            self.closeSession()
1964
            self.closeSession()
-
 
1965
        
-
 
1966
    def splitFreebieOrder(self, orderId, splitReason, shippingDate):
-
 
1967
        try:
-
 
1968
            return split_freebie_order(orderId, splitReason, shippingDate)
-
 
1969
        finally:
-
 
1970
            self.closeSession()
1963
            
1971
            
1964
    def getRechargeTransactionsByNumber(self, number, storeId):
1972
    def getRechargeTransactionsByNumber(self, number, storeId):
1965
        try:
1973
        try:
1966
            return [to_t_rechargeTransaction(txn) for txn in get_recharge_transactions_by_number(number, storeId)]
1974
            return [to_t_rechargeTransaction(txn) for txn in get_recharge_transactions_by_number(number, storeId)]
1967
        finally:
1975
        finally: