WebSVN – SmartDukaan – Diff – //trunk/PyDTR/src/dtr/sources/spice.py



            brand = lineitem.get('brand')
            modelNumber = lineitem.get('model_number')
            modelName = lineitem.get('model_name')
            color = lineitem.get('color')
            productTitle = brand + (" " + modelName if modelName else "") + (" "  + modelNumber if modelNumber is not None else "") + ("(" + color +")" if color else "")
            amountPaid = order['total_amount'] 
            subOrder = SubOrder(productTitle, None, datetime.strftime(datetime.fromtimestamp(order['created_timestamp']/1000),"%d %B %Y"), amountPaid)
            subOrder.amount = amountPaid - order['gvAmount']
            subOrder.merchantSubOrderId = str(order['id'])
            subOrder.orderDetailUrl = "http://m.saholic.com/order/" + subOrder.merchantSubOrderId 
            subOrder.quantity = int(lineitem['quantity'])
            subOrder.estimatedDeliveryDate = datetime.strftime(datetime.fromtimestamp(order['promised_delivery_time']/1000),"%d %B %Y")
            subOrder.imgUrl = item.get("imgUrl") 
            subOrder.productUrl = "http://m.saholic.com/" + item['url']
            subOrder.productCode = item['url'].split('-')[-1]
            subOrder.detailedStatus = order['statusDescription']
            (cashbackAmount, percentage) = self.getCashbackAmount(subOrder.productCode, amountPaid/subOrder.quantity)
            dealRank = getDealRank(subOrder.productCode, self.store_id, self.userId)

Subversion Repositories SmartDukaan

(root)//trunk/PyDTR/src/dtr/sources/spice.py – Rev 17677 → 18055

Rev 17677		Rev 18055
Line 166...		Line 166...
166	`brand = lineitem.get('brand')`	166	`brand = lineitem.get('brand')`
167	`modelNumber = lineitem.get('model_number')`	167	`modelNumber = lineitem.get('model_number')`
168	`modelName = lineitem.get('model_name')`	168	`modelName = lineitem.get('model_name')`
169	`color = lineitem.get('color')`	169	`color = lineitem.get('color')`
170	`productTitle = brand + (" " + modelName if modelName else "") + (" " + modelNumber if modelNumber is not None else "") + ("(" + color +")" if color else "")`	170	`productTitle = brand + (" " + modelName if modelName else "") + (" " + modelNumber if modelNumber is not None else "") + ("(" + color +")" if color else "")`
171	`amountPaid = order['total_amount']- order['gvAmount']`	171	`amountPaid = order['total_amount']`
172	`subOrder = SubOrder(productTitle, None, datetime.strftime(datetime.fromtimestamp(order['created_timestamp']/1000),"%d %B %Y"), amountPaid)`	172	`subOrder = SubOrder(productTitle, None, datetime.strftime(datetime.fromtimestamp(order['created_timestamp']/1000),"%d %B %Y"), amountPaid)`
-		173	`subOrder.amount = amountPaid - order['gvAmount']`
173	`subOrder.merchantSubOrderId = str(order['id'])`	174	`subOrder.merchantSubOrderId = str(order['id'])`
174	`subOrder.orderDetailUrl = "http://m.saholic.com/order/" + subOrder.merchantSubOrderId`	175	`subOrder.orderDetailUrl = "http://m.saholic.com/order/" + subOrder.merchantSubOrderId`
175	`subOrder.quantity = int(lineitem['quantity'])`	176	`subOrder.quantity = int(lineitem['quantity'])`
176	`subOrder.estimatedDeliveryDate = datetime.strftime(datetime.fromtimestamp(order['promised_delivery_time']/1000),"%d %B %Y")`	177	`subOrder.estimatedDeliveryDate = datetime.strftime(datetime.fromtimestamp(order['promised_delivery_time']/1000),"%d %B %Y")`
177	`subOrder.imgUrl = item['imgUrl']`	178	`subOrder.imgUrl = item.get("imgUrl")`
178	`subOrder.productUrl = "http://m.saholic.com/" + item['url']`	179	`subOrder.productUrl = "http://m.saholic.com/" + item['url']`
179	`subOrder.productCode = item['url'].split('-')[-1]`	180	`subOrder.productCode = item['url'].split('-')[-1]`
180	`subOrder.detailedStatus = order['statusDescription']`	181	`subOrder.detailedStatus = order['statusDescription']`
181	`(cashbackAmount, percentage) = self.getCashbackAmount(subOrder.productCode, amountPaid/subOrder.quantity)`	182	`(cashbackAmount, percentage) = self.getCashbackAmount(subOrder.productCode, amountPaid/subOrder.quantity)`
182	`dealRank = getDealRank(subOrder.productCode, self.store_id, self.userId)`	183	`dealRank = getDealRank(subOrder.productCode, self.store_id, self.userId)`