Subversion Repositories SmartDukaan

Rev

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

Rev 15801 Rev 15802
Line 76... Line 76...
76 
            subOrders = order['subOrders']
 76 
            subOrders = order['subOrders']
77 
            for subOrder in subOrders:
 77 
            for subOrder in subOrders:
78 
                unitPrice = 0
 78 
                unitPrice = 0
79 
                if subOrder.has_key('unitPrice'):
 79 
                if subOrder.has_key('unitPrice'):
80 
                    unitPrice = subOrder['unitPrice']
 80 
                    unitPrice = subOrder['unitPrice']
- 
 
 81 
                productCode = "Undefined"
- 
 
 82 
                if subOrder.has_key('productCode'):
- 
 
 83 
                    productCode = subOrder['productCode']
81 
                merchantSubOrder = MerchantSubOrder(orderId, merchantOrderId, subOrder['merchantSubOrderId'], storeId, userId, subOrder['productCode'], subOrder['productTitle'], subOrder['amountPaid'], subOrder['quantity'], unitPrice, subOrder['status'], createdOnInt)
 84 
                merchantSubOrder = MerchantSubOrder(orderId, merchantOrderId, subOrder['merchantSubOrderId'], storeId, userId, productCode, subOrder['productTitle'], subOrder['amountPaid'], subOrder['quantity'], unitPrice, subOrder['status'], createdOnInt)
82 
                product = None
 85 
                product = None
83 
                if storeId in (1,2,4,5):
 86 
                if storeId in (1,2,4,5):
84 
                    product = list(masterDataCollection.find({'identifier':subOrder['productCode'].strip(), 'source_id':storeId}))
 87 
                    product = list(masterDataCollection.find({'identifier':subOrder['productCode'].strip(), 'source_id':storeId}))
85 
                elif storeId == 3:
 88 
                elif storeId == 3:
86 
                    product = list(masterDataCollection.find({'secondaryIdentifier':subOrder['productCode'].strip(), 'source_id':storeId}))
 89 
                    product = list(masterDataCollection.find({'secondaryIdentifier':subOrder['productCode'].strip(), 'source_id':storeId}))