WebSVN – SmartDukaan – Diff – /trunk/PyDTR/src/dtr/reports/affiliatereco.py



                if aff.get("missingOrder"):
                    aff["missingOrder"] = False
                    db.snapdealOrderAffiliateInfo1.save(aff)
            matchedList.append(order["merchantOrderId"])
            order['reconciled'] = True
 
            row += 1
            i=-1 
            worksheet.write(row, inc(), orderId)
            worksheet.write(row, inc(), row1[1])
            worksheet.write(row, inc(), row1[-1])

                worksheet.write(row, inc(), subOrder['amountPaid'])
                worksheet.write(row, inc(), subOrder['quantity'])
                worksheet.write(row, inc(), subOrder['status'])
                worksheet.write(row, inc(), subOrder['cashBackStatus'])
                worksheet.write(row, inc(), subOrder['cashBackAmount']) 
            db.merchantOrder.save(order)
 
        else:
            row5 += 1
            i=-1
            worksheet2.write(row5, inc(), order["orderId"])

Rev 17234	Rev 17244
Line 278...	Line 278...
278	`if aff.get("missingOrder"):`	278	`if aff.get("missingOrder"):`
279	`aff["missingOrder"] = False`	279	`aff["missingOrder"] = False`
280	`db.snapdealOrderAffiliateInfo1.save(aff)`	280	`db.snapdealOrderAffiliateInfo1.save(aff)`
281	`matchedList.append(order["merchantOrderId"])`	281	`matchedList.append(order["merchantOrderId"])`
282	`order['reconciled'] = True`	282	`order['reconciled'] = True`
283	`db.merchantOrder.save(order)`	-
284	`row += 1`	283	`row += 1`
285	`i=-1`	284	`i=-1`
286	`worksheet.write(row, inc(), orderId)`	285	`worksheet.write(row, inc(), orderId)`
287	`worksheet.write(row, inc(), row1[1])`	286	`worksheet.write(row, inc(), row1[1])`
288	`worksheet.write(row, inc(), row1[-1])`	287	`worksheet.write(row, inc(), row1[-1])`
Line 317...	Line 316...
317	`worksheet.write(row, inc(), subOrder['amountPaid'])`	316	`worksheet.write(row, inc(), subOrder['amountPaid'])`
318	`worksheet.write(row, inc(), subOrder['quantity'])`	317	`worksheet.write(row, inc(), subOrder['quantity'])`
319	`worksheet.write(row, inc(), subOrder['status'])`	318	`worksheet.write(row, inc(), subOrder['status'])`
320	`worksheet.write(row, inc(), subOrder['cashBackStatus'])`	319	`worksheet.write(row, inc(), subOrder['cashBackStatus'])`
321	`worksheet.write(row, inc(), subOrder['cashBackAmount'])`	320	`worksheet.write(row, inc(), subOrder['cashBackAmount'])`
-		321	`db.merchantOrder.save(order)`
322		322
323	`else:`	323	`else:`
324	`row5 += 1`	324	`row5 += 1`
325	`i=-1`	325	`i=-1`
326	`worksheet2.write(row5, inc(), order["orderId"])`	326	`worksheet2.write(row5, inc(), order["orderId"])`

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/reports/affiliatereco.py – Rev 17234 → 17244