Subversion Repositories SmartDukaan

Rev

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

Rev 17046 Rev 17047
Line 154... Line 154...
154
            subOrders= []
154
            subOrders= []
155
            for subOrderObj in orderObj['subOrders']:
155
            for subOrderObj in orderObj['subOrders']:
156
                subOrder = SubOrder(subOrderObj['cartItem']['cartItemTitle'], BASE_PRODUCT_URL%(long(subOrderObj['cartItem']['productId'])), orderObj['orderDate'], long(subOrderObj['pricing']['payablePrice']))
156
                subOrder = SubOrder(subOrderObj['cartItem']['cartItemTitle'], BASE_PRODUCT_URL%(long(subOrderObj['cartItem']['productId'])), orderObj['orderDate'], long(subOrderObj['pricing']['payablePrice']))
157
                subOrder.estimatedDeliveryDate = subOrderObj['shipment']['expectedDeliveryDate']
157
                subOrder.estimatedDeliveryDate = subOrderObj['shipment']['expectedDeliveryDate']
158
                subOrder.merchantSubOrderId = str(subOrderObj['subOrderId'])
158
                subOrder.merchantSubOrderId = str(subOrderObj['subOrderId'])
-
 
159
                if rawHtmlSoup.body.find("div", {'class':'sub-order-status'}) is not None:
159
                subOrder.detailedStatus = rawHtmlSoup.body.find("div", {'class':'sub-order-status'}).text
160
                    subOrder.detailedStatus = rawHtmlSoup.body.find("div", {'class':'sub-order-status'}).text
-
 
161
                else:
-
 
162
                    subOrder.detailedStatus = 'Order Placed'
160
                subOrder.imgUrl = BASE_IMG_URL+subOrderObj['cartItem']['lineItemImageUrl']
163
                subOrder.imgUrl = BASE_IMG_URL+subOrderObj['cartItem']['lineItemImageUrl']
161
                subOrder.offerDiscount = long(subOrderObj['cartItem']['price'])*long(subOrderObj['cartItem']['itemQuantity'])-long(subOrderObj['pricing']['payablePrice'])
164
                subOrder.offerDiscount = long(subOrderObj['cartItem']['price'])*long(subOrderObj['cartItem']['itemQuantity'])-long(subOrderObj['pricing']['payablePrice'])
162
                subOrder.unitPrice = long(subOrderObj['cartItem']['price'])
165
                subOrder.unitPrice = long(subOrderObj['cartItem']['price'])
163
                subOrder.productCode = str(long(subOrderObj['cartItem']['productId']))
166
                subOrder.productCode = str(long(subOrderObj['cartItem']['productId']))
164
                subOrder.amountPaid = long(subOrderObj['pricing']['payablePrice'])
167
                subOrder.amountPaid = long(subOrderObj['pricing']['payablePrice'])