Subversion Repositories SmartDukaan

Rev

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

Rev 14775 Rev 14850
Line 253... Line 253...
253 
            i=-1
253 
            i=-1
254 
            worksheet.write(row, inc(), orderId)
 254 
            worksheet.write(row, inc(), orderId)
255 
            worksheet1.write(anotherrow, i, orderId)
 255 
            worksheet1.write(anotherrow, i, orderId)
256 
            worksheet.write(row, inc(), row1[1])
 256 
            worksheet.write(row, inc(), row1[1])
257 
            worksheet1.write(anotherrow, i, row1[1])
 257 
            worksheet1.write(anotherrow, i, row1[1])
258 
            worksheet.write(row, inc(), row1[-3])
 - 
 
259 
            worksheet1.write(anotherrow, i, row1[-3])
 - 
 
260 
            worksheet.write(row, inc(), row1[-2])
 - 
 
261 
            worksheet1.write(anotherrow, i, row1[-2])
 - 
 
262 
            worksheet.write(row, inc(), row1[-1])
 258 
            worksheet.write(row, inc(), row1[-1])
263 
            worksheet1.write(anotherrow, i, row1[-1])
 259 
            worksheet1.write(anotherrow, i, row1[-1])
- 
 
 260 
            worksheet.write(row, inc(), row1[-2])
- 
 
 261 
            worksheet1.write(anotherrow, i, row1[-2])
- 
 
 262 
            worksheet.write(row, inc(), row1[-3])
- 
 
 263 
            worksheet1.write(anotherrow, i, row1[-3])
264 
            worksheet.write(row, inc(), order['merchantOrderId'])
 264 
            worksheet.write(row, inc(), order['merchantOrderId'])
265 
            worksheet1.write(anotherrow, i, order['merchantOrderId'])
 265 
            worksheet1.write(anotherrow, i, order['merchantOrderId'])
266 
            worksheet.write(row, inc(), order['subTagId'])
 266 
            worksheet.write(row, inc(), order['subTagId'])
267 
            worksheet1.write(anotherrow, i, order['subTagId'])
 267 
            worksheet1.write(anotherrow, i, order['subTagId'])
268 
            worksheet.write(row, inc(), order['placedOn'])
 268 
            worksheet.write(row, inc(), order['placedOn'])
Line 299... Line 299...
299 
 
 299 
 
300 
        else:
 300 
        else:
301 
            i=-1
 301 
            i=-1
302 
            worksheet1.write(anotherrow, inc(), orderId)
 302 
            worksheet1.write(anotherrow, inc(), orderId)
303 
            worksheet1.write(anotherrow, inc(), row1[1])
 303 
            worksheet1.write(anotherrow, inc(), row1[1])
304 
            worksheet1.write(anotherrow, inc(), row1[-3])
 - 
 
305 
            worksheet1.write(anotherrow, inc(), row1[-2])
 - 
 
306 
            worksheet1.write(anotherrow, inc(), row1[-1])
 304 
            worksheet1.write(anotherrow, inc(), row1[-1])
- 
 
 305 
            worksheet1.write(anotherrow, inc(), row1[-2])
- 
 
 306 
            worksheet1.write(anotherrow, inc(), row1[-3])
307 
            worksheet1.write(anotherrow, inc(), order['merchantOrderId'])
 307 
            worksheet1.write(anotherrow, inc(), order['merchantOrderId'])
308 
            worksheet1.write(anotherrow, inc(), order['subTagId'])
 308 
            worksheet1.write(anotherrow, inc(), order['subTagId'])
309 
            worksheet1.write(anotherrow, inc(), order['placedOn'])
 309 
            worksheet1.write(anotherrow, inc(), order['placedOn'])
310 
            worksheet1.write(anotherrow, inc(), int(order['paidAmount']))
 310 
            worksheet1.write(anotherrow, inc(), int(order['paidAmount']))
311 
            timestamp1 = int(time.mktime(datetime.strptime(order['placedOn'], "%b %d, %Y, %I:%M %p").timetuple()))
 311 
            timestamp1 = int(time.mktime(datetime.strptime(order['placedOn'], "%b %d, %Y, %I:%M %p").timetuple()))
Line 357... Line 357...
357 
            for order in db.merchantOrder.find({"orderId":row1[0]}):
 357 
            for order in db.merchantOrder.find({"orderId":row1[0]}):
358 
                row2 += 1
 358 
                row2 += 1
359 
                i=-1
 359 
                i=-1
360 
                worksheet2.write(row2, inc(), order["orderId"])
 360 
                worksheet2.write(row2, inc(), order["orderId"])
361 
                worksheet2.write(row2, inc(), row1[1])
 361 
                worksheet2.write(row2, inc(), row1[1])
362 
                worksheet2.write(row2, inc(), row1[-3])
 - 
 
363 
                worksheet2.write(row2, inc(), row1[-2])
 - 
 
364 
                worksheet2.write(row2, inc(), row1[-1])
 362 
                worksheet2.write(row2, inc(), row1[-1])
- 
 
 363 
                worksheet2.write(row2, inc(), row1[-2])
- 
 
 364 
                worksheet2.write(row2, inc(), row1[-3])
365 
                worksheet2.write(row2, inc(), order['merchantOrderId'])
 365 
                worksheet2.write(row2, inc(), order['merchantOrderId'])
366 
                worksheet2.write(row2, inc(), order['subTagId'])
 366 
                worksheet2.write(row2, inc(), order['subTagId'])
367 
                worksheet2.write(row2, inc(), order['placedOn'])
 367 
                worksheet2.write(row2, inc(), order['placedOn'])
368 
                worksheet2.write(row2, inc(), int(order['paidAmount']))
 368 
                worksheet2.write(row2, inc(), int(order['paidAmount']))
369 
                row2 -=1
 369 
                row2 -=1
Line 431... Line 431...
431 
    row = 0
 431 
    row = 0
432 
    global i
 432 
    global i
433 
    i=-1
433 
    i=-1
434 
    worksheet.write(row, inc(), 'Order Id', boldStyle)
 434 
    worksheet.write(row, inc(), 'Order Id', boldStyle)
435 
    worksheet.write(row, inc(), 'User Id', boldStyle)
 435 
    worksheet.write(row, inc(), 'User Id', boldStyle)
- 
 
 436 
    worksheet.write(row, inc(), 'Username', boldStyle)
436 
    worksheet.write(row, inc(), 'Version Code', boldStyle)
 437 
    worksheet.write(row, inc(), 'Version Code', boldStyle)
437 
    worksheet.write(row, inc(), 'Device', boldStyle)
 438 
    worksheet.write(row, inc(), 'Device', boldStyle)
438 
    worksheet.write(row, inc(), 'Username', boldStyle)
 - 
 
439 
    worksheet.write(row, inc(), 'Merchant Order Id', boldStyle)
 439 
    worksheet.write(row, inc(), 'Merchant Order Id', boldStyle)
440 
    worksheet.write(row, inc(), 'SubtagId', boldStyle)
 440 
    worksheet.write(row, inc(), 'SubtagId', boldStyle)
441 
    worksheet.write(row, inc(), 'Sale Date', boldStyle)
 441 
    worksheet.write(row, inc(), 'Sale Date', boldStyle)
442 
    worksheet.write(row, inc(), 'Sale Amount', boldStyle)
 442 
    worksheet.write(row, inc(), 'Sale Amount', boldStyle)
443 
    worksheet.write(row, inc(), 'Aff Sale Date', boldStyle)
 443 
    worksheet.write(row, inc(), 'Aff Sale Date', boldStyle)
Line 452... Line 452...
452 
    worksheet.write(row, inc(), 'CashBack', boldStyle)
 452 
    worksheet.write(row, inc(), 'CashBack', boldStyle)
453 
 
 453 
 
454 
    i = -1
 454 
    i = -1
455 
    worksheet1.write(row, inc(), 'Order Id', boldStyle)
 455 
    worksheet1.write(row, inc(), 'Order Id', boldStyle)
456 
    worksheet1.write(row, inc(), 'User Id', boldStyle)
 456 
    worksheet1.write(row, inc(), 'User Id', boldStyle)
- 
 
 457 
    worksheet1.write(row, inc(), 'Username', boldStyle)
457 
    worksheet1.write(row, inc(), 'Version Code', boldStyle)
 458 
    worksheet1.write(row, inc(), 'Version Code', boldStyle)
458 
    worksheet1.write(row, inc(), 'Device', boldStyle)
 459 
    worksheet1.write(row, inc(), 'Device', boldStyle)
459 
    worksheet1.write(row, inc(), 'Username', boldStyle)
 - 
 
460 
    worksheet1.write(row, inc(), 'Merchant Order Id', boldStyle)
 460 
    worksheet1.write(row, inc(), 'Merchant Order Id', boldStyle)
461 
    worksheet1.write(row, inc(), 'SubtagId', boldStyle)
 461 
    worksheet1.write(row, inc(), 'SubtagId', boldStyle)
462 
    worksheet1.write(row, inc(), 'Sale Date', boldStyle)
 462 
    worksheet1.write(row, inc(), 'Sale Date', boldStyle)
463 
    worksheet1.write(row, inc(), 'Sale Amount', boldStyle)
 463 
    worksheet1.write(row, inc(), 'Sale Amount', boldStyle)
464 
    worksheet1.write(row, inc(), 'Aff Sale Date', boldStyle)
 464 
    worksheet1.write(row, inc(), 'Aff Sale Date', boldStyle)
Line 473... Line 473...
473 
    worksheet1.write(row, inc(), 'CashBack', boldStyle)
473 
    worksheet1.write(row, inc(), 'CashBack', boldStyle)
474 
 
 474 
 
475 
    i = -1
 475 
    i = -1
476 
    worksheet2.write(row, inc(), 'Order Id', boldStyle)
 476 
    worksheet2.write(row, inc(), 'Order Id', boldStyle)
477 
    worksheet2.write(row, inc(), 'User Id', boldStyle)
 477 
    worksheet2.write(row, inc(), 'User Id', boldStyle)
- 
 
 478 
    worksheet2.write(row, inc(), 'Username', boldStyle)
478 
    worksheet2.write(row, inc(), 'Version Code', boldStyle)
 479 
    worksheet2.write(row, inc(), 'Version Code', boldStyle)
479 
    worksheet2.write(row, inc(), 'Device', boldStyle)
 480 
    worksheet2.write(row, inc(), 'Device', boldStyle)
480 
    worksheet2.write(row, inc(), 'Username', boldStyle)
 - 
 
481 
    worksheet2.write(row, inc(), 'Merchant Order Id', boldStyle)
 481 
    worksheet2.write(row, inc(), 'Merchant Order Id', boldStyle)
482 
    worksheet2.write(row, inc(), 'SubtagId', boldStyle)
 482 
    worksheet2.write(row, inc(), 'SubtagId', boldStyle)
483 
    worksheet2.write(row, inc(), 'Sale Date', boldStyle)
 483 
    worksheet2.write(row, inc(), 'Sale Date', boldStyle)
484 
    worksheet2.write(row, inc(), 'Sale Amount', boldStyle)
 484 
    worksheet2.write(row, inc(), 'Sale Amount', boldStyle)
485 
    worksheet2.write(row, inc(), 'Product Title', boldStyle)
 485 
    worksheet2.write(row, inc(), 'Product Title', boldStyle)