Subversion Repositories SmartDukaan

Rev

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

Rev 20729 Rev 20738
Line 8752... Line 8752...
8752
    orders = Order.query.filter(Order.logisticsTransactionId==logisticsTxnId).all()
8752
    orders = Order.query.filter(Order.logisticsTransactionId==logisticsTxnId).all()
8753
    if not orders:
8753
    if not orders:
8754
        orders = []   
8754
        orders = []   
8755
    return orders
8755
    return orders
8756
 
8756
 
8757
def add_billing_details_for_groupped_orders(orderIds, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType):
8757
def add_billing_details_for_groupped_orders(orderIds, invoice_number, itemNumbersMap, serialNumbersMap, freebieWarehouseIdMap, billed_by, jacketNumber, billingType, authorize, invoiceType, packageDimensions):
8758
#    print 'orderIds',orderIds
8758
#    print 'orderIds',orderIds
8759
#    print 'invoice_number', invoice_number
8759
#    print 'invoice_number', invoice_number
8760
#    print 'itemNumbersMap', itemNumbersMap
8760
#    print 'itemNumbersMap', itemNumbersMap
8761
#    print 'serialNumbersMap', serialNumbersMap
8761
#    print 'serialNumbersMap', serialNumbersMap
8762
#    print 'freebieWarehouseIdMap', freebieWarehouseIdMap
8762
#    print 'freebieWarehouseIdMap', freebieWarehouseIdMap
Line 9340... Line 9340...
9340
 
9340
 
9341
    for order in ordersList:
9341
    for order in ordersList:
9342
        order.invoice_number = invoiceNumber
9342
        order.invoice_number = invoiceNumber
9343
        order.seller_id = seller_id
9343
        order.seller_id = seller_id
9344
        order.warehouse_address_id = whaddressmapping.address_id
9344
        order.warehouse_address_id = whaddressmapping.address_id
-
 
9345
    
-
 
9346
    logisticCostDetail= ShipmentLogisticsCostDetail.get_by(logisticsTransactionId=order[0].logisticsTransactionId)
-
 
9347
    logisticCostDetail.packageDimensions = packageDimensions
-
 
9348
        
9345
    session.commit()
9349
    session.commit()
9346
                            
9350
                            
9347
    return True
9351
    return True
9348
 
9352
 
9349
def get_invoice_format_logistics_txn_id(transactionId, shipementSeq):
9353
def get_invoice_format_logistics_txn_id(transactionId, shipementSeq):