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



            for order in db.merchantOrder.find({"orderId":row1[0]}):
                row2 += 1
                i=-1
                worksheet2.write(row2, inc(), order["orderId"])
                worksheet2.write(row2, inc(), row1[1])
                worksheet2.write(row2, inc(), row1[-2])
                worksheet2.write(row2, inc(), row1[-1])
                worksheet2.write(row2, inc(), order['merchantOrderId'])
                worksheet2.write(row2, inc(), order['subTagId'])
                worksheet2.write(row2, inc(), order['placedOn'])
                worksheet2.write(row2, inc(), int(order['paidAmount']))

    worksheet1.write(row, inc(), 'CashBack', boldStyle) 
 
    i = -1
    worksheet2.write(row, inc(), 'Order Id', boldStyle)
    worksheet2.write(row, inc(), 'User Id', boldStyle)
    worksheet2.write(row, inc(), 'Version Code', boldStyle)
    worksheet2.write(row, inc(), 'Username', boldStyle)
    worksheet2.write(row, inc(), 'Merchant Order Id', boldStyle)
    worksheet2.write(row, inc(), 'SubtagId', boldStyle)
    worksheet2.write(row, inc(), 'Sale Date', boldStyle)
    worksheet2.write(row, inc(), 'Sale Amount', boldStyle)

Subversion Repositories SmartDukaan

(root)//trunk/PyDTR/src/dtr/reports/affiliatereco.py – Rev 14604 → 14605

Rev 14604		Rev 14605
Line 228...		Line 228...
228	`for order in db.merchantOrder.find({"orderId":row1[0]}):`	228	`for order in db.merchantOrder.find({"orderId":row1[0]}):`
229	`row2 += 1`	229	`row2 += 1`
230	`i=-1`	230	`i=-1`
231	`worksheet2.write(row2, inc(), order["orderId"])`	231	`worksheet2.write(row2, inc(), order["orderId"])`
232	`worksheet2.write(row2, inc(), row1[1])`	232	`worksheet2.write(row2, inc(), row1[1])`
-		233	`worksheet2.write(row2, inc(), row1[-2])`
233	`worksheet2.write(row2, inc(), row1[-1])`	234	`worksheet2.write(row2, inc(), row1[-1])`
234	`worksheet2.write(row2, inc(), order['merchantOrderId'])`	235	`worksheet2.write(row2, inc(), order['merchantOrderId'])`
235	`worksheet2.write(row2, inc(), order['subTagId'])`	236	`worksheet2.write(row2, inc(), order['subTagId'])`
236	`worksheet2.write(row2, inc(), order['placedOn'])`	237	`worksheet2.write(row2, inc(), order['placedOn'])`
237	`worksheet2.write(row2, inc(), int(order['paidAmount']))`	238	`worksheet2.write(row2, inc(), int(order['paidAmount']))`
Line 339...		Line 340...
339	`worksheet1.write(row, inc(), 'CashBack', boldStyle)`	340	`worksheet1.write(row, inc(), 'CashBack', boldStyle)`
340		341
341	`i = -1`	342	`i = -1`
342	`worksheet2.write(row, inc(), 'Order Id', boldStyle)`	343	`worksheet2.write(row, inc(), 'Order Id', boldStyle)`
343	`worksheet2.write(row, inc(), 'User Id', boldStyle)`	344	`worksheet2.write(row, inc(), 'User Id', boldStyle)`
-		345	`worksheet2.write(row, inc(), 'Version Code', boldStyle)`
344	`worksheet2.write(row, inc(), 'Username', boldStyle)`	346	`worksheet2.write(row, inc(), 'Username', boldStyle)`
345	`worksheet2.write(row, inc(), 'Merchant Order Id', boldStyle)`	347	`worksheet2.write(row, inc(), 'Merchant Order Id', boldStyle)`
346	`worksheet2.write(row, inc(), 'SubtagId', boldStyle)`	348	`worksheet2.write(row, inc(), 'SubtagId', boldStyle)`
347	`worksheet2.write(row, inc(), 'Sale Date', boldStyle)`	349	`worksheet2.write(row, inc(), 'Sale Date', boldStyle)`
348	`worksheet2.write(row, inc(), 'Sale Amount', boldStyle)`	350	`worksheet2.write(row, inc(), 'Sale Amount', boldStyle)`