Subversion Repositories SmartDukaan

Rev

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

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