Subversion Repositories SmartDukaan

Rev

Rev 14650 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 14650 Rev 14771
Line 43... Line 43...
43 
        for subOrder in subOrders:
 43 
        for subOrder in subOrders:
44 
            row1 += 1
 44 
            row1 += 1
45 
            i =-1
 45 
            i =-1
46 
            worksheet1.write(row1, inc(), orderId)
 46 
            worksheet1.write(row1, inc(), orderId)
47 
            worksheet1.write(row1, inc(), ro[1])
 47 
            worksheet1.write(row1, inc(), ro[1])
48 
            worksheet1.write(row1, inc(), ro[-2])
 - 
 
49 
            worksheet1.write(row1, inc(), ro[-1])
 48 
            worksheet1.write(row1, inc(), ro[-1])
- 
 
 49 
            worksheet1.write(row1, inc(), ro[-3])
- 
 
 50 
            worksheet1.write(row1, inc(), ro[-2])
50 
            worksheet1.write(row1, inc(), order['merchantOrderId'])
 51 
            worksheet1.write(row1, inc(), order['merchantOrderId'])
51 
            worksheet1.write(row1, inc(), subOrder['productTitle'])
 52 
            worksheet1.write(row1, inc(), subOrder['productTitle'])
52 
            worksheet1.write(row1, inc(), subOrder['amountPaid'])
 53 
            worksheet1.write(row1, inc(), subOrder['amountPaid'])
53 
            worksheet1.write(row1, inc(), subOrder['quantity'])
 54 
            worksheet1.write(row1, inc(), subOrder['quantity'])
54 
            worksheet1.write(row1, inc(), subOrder['status'])
 55 
            worksheet1.write(row1, inc(), subOrder['status'])
Line 60... Line 61...
60 
            if aff is not None:
 61 
            if aff is not None:
61 
                row += 1
 62 
                row += 1
62 
                i =-1
 63 
                i =-1
63 
                worksheet.write(row, inc(), orderId)
 64 
                worksheet.write(row, inc(), orderId)
64 
                worksheet.write(row, inc(), ro[1])
 65 
                worksheet.write(row, inc(), ro[1])
65 
                worksheet.write(row, inc(), ro[-2])
 - 
 
66 
                worksheet.write(row, inc(), ro[-1])
 66 
                worksheet.write(row, inc(), ro[-1])
- 
 
 67 
                worksheet.write(row, inc(), ro[-3])
- 
 
 68 
                worksheet.write(row, inc(), ro[-2])
67 
                worksheet.write(row, inc(), order['merchantOrderId'])
 69 
                worksheet.write(row, inc(), order['merchantOrderId'])
68 
                worksheet.write(row, inc(), subOrder['productTitle'])
 70 
                worksheet.write(row, inc(), subOrder['productTitle'])
69 
                worksheet.write(row, inc(), subOrder['amountPaid'])
 71 
                worksheet.write(row, inc(), subOrder['amountPaid'])
70 
                worksheet.write(row, inc(), subOrder['quantity'])
 72 
                worksheet.write(row, inc(), subOrder['quantity'])
71 
                worksheet.write(row, inc(), subOrder['status'])
 73 
                worksheet.write(row, inc(), subOrder['status'])
Line 82... Line 84...
82 
            else:
 84 
            else:
83 
                row2 +=1
 85 
                row2 +=1
84 
                i =-1
 86 
                i =-1
85 
                worksheet2.write(row2, inc(), orderId)
 87 
                worksheet2.write(row2, inc(), orderId)
86 
                worksheet2.write(row2, inc(), ro[1])
 88 
                worksheet2.write(row2, inc(), ro[1])
87 
                worksheet2.write(row2, inc(), ro[-2])
 - 
 
88 
                worksheet2.write(row2, inc(), ro[-1])
 89 
                worksheet2.write(row2, inc(), ro[-1])
- 
 
 90 
                worksheet2.write(row2, inc(), ro[-3])
- 
 
 91 
                worksheet2.write(row2, inc(), ro[-2])
89 
                worksheet2.write(row2, inc(), order['merchantOrderId'])
 92 
                worksheet2.write(row2, inc(), order['merchantOrderId'])
90 
                worksheet2.write(row2, inc(), subOrder['productTitle'])
 93 
                worksheet2.write(row2, inc(), subOrder['productTitle'])
91 
                worksheet2.write(row2, inc(), subOrder['amountPaid'])
 94 
                worksheet2.write(row2, inc(), subOrder['amountPaid'])
92 
                worksheet2.write(row2, inc(), subOrder['quantity'])
 95 
                worksheet2.write(row2, inc(), subOrder['quantity'])
93 
                worksheet2.write(row2, inc(), subOrder['status'])
 96 
                worksheet2.write(row2, inc(), subOrder['status'])
Line 127... Line 130...
127 
    worksheet.write(0, i, 'Order Id', boldStyle)
 130 
    worksheet.write(0, i, 'Order Id', boldStyle)
128 
    worksheet2.write(0, i, 'Order Id', boldStyle)
 131 
    worksheet2.write(0, i, 'Order Id', boldStyle)
129 
    worksheet.write(0, inc(), 'User Id', boldStyle)
 132 
    worksheet.write(0, inc(), 'User Id', boldStyle)
130 
    worksheet1.write(0, i, 'User Id', boldStyle)
 133 
    worksheet1.write(0, i, 'User Id', boldStyle)
131 
    worksheet2.write(0, i, 'User Id', boldStyle)
 134 
    worksheet2.write(0, i, 'User Id', boldStyle)
132 
    worksheet.write(0, inc(), 'Version Code', boldStyle)
 - 
 
133 
    worksheet1.write(0, i, 'Version Code', boldStyle)
 - 
 
134 
    worksheet2.write(0, i, 'Version Code', boldStyle)
 - 
 
135 
    worksheet.write(0, inc(), 'Username', boldStyle)
 135 
    worksheet.write(0, inc(), 'Username', boldStyle)
136 
    worksheet1.write(0, i, 'Username', boldStyle)
 136 
    worksheet1.write(0, i, 'Username', boldStyle)
137 
    worksheet2.write(0, i, 'Username', boldStyle)
 137 
    worksheet2.write(0, i, 'Username', boldStyle)
- 
 
 138 
    worksheet.write(0, inc(), 'Device', boldStyle)
- 
 
 139 
    worksheet1.write(0, i, 'Device', boldStyle)
- 
 
 140 
    worksheet2.write(0, i, 'Device', boldStyle)
- 
 
 141 
    worksheet.write(0, inc(), 'Version Code', boldStyle)
- 
 
 142 
    worksheet1.write(0, i, 'Version Code', boldStyle)
- 
 
 143 
    worksheet2.write(0, i, 'Version Code', boldStyle)
138 
    worksheet.write(0, inc(), 'Merchant Order Id', boldStyle)
 144 
    worksheet.write(0, inc(), 'Merchant Order Id', boldStyle)
139 
    worksheet1.write(0, i, 'Merchant Order Id', boldStyle)
 145 
    worksheet1.write(0, i, 'Merchant Order Id', boldStyle)
140 
    worksheet2.write(0, i, 'Merchant Order Id', boldStyle)
 146 
    worksheet2.write(0, i, 'Merchant Order Id', boldStyle)
141 
    worksheet.write(0, inc(), 'Product Title', boldStyle)
 147 
    worksheet.write(0, inc(), 'Product Title', boldStyle)
142 
    worksheet1.write(0, i, 'Product Title', boldStyle)
 148 
    worksheet1.write(0, i, 'Product Title', boldStyle)