Subversion Repositories SmartDukaan

Rev

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

Rev 14502 Rev 14503
Line 144... Line 144...
144
                worksheet.write(row, inc(), aff[0]['payOut'])
144
                worksheet.write(row, inc(), aff[0]['payOut'])
145
                worksheet1.write(anotherrow, i, aff[0]['payOut'])
145
                worksheet1.write(anotherrow, i, aff[0]['payOut'])
146
            k = i
146
            k = i
147
            for subOrder in order['subOrders']:
147
            for subOrder in order['subOrders']:
148
                i = k
148
                i = k
-
 
149
                row += 1
-
 
150
                anotherrow += 1
149
                worksheet.write(row, inc(), subOrder['productTitle'])
151
                worksheet.write(row, inc(), subOrder['productTitle'])
150
                worksheet1.write(anotherrow, i, subOrder['productTitle'])
152
                worksheet1.write(anotherrow, i, subOrder['productTitle'])
151
                worksheet.write(row, inc(), subOrder['amountPaid'])
153
                worksheet.write(row, inc(), subOrder['amountPaid'])
152
                worksheet1.write(anotherrow, i, subOrder['amountPaid'])
154
                worksheet1.write(anotherrow, i, subOrder['amountPaid'])
153
                worksheet.write(row, inc(), subOrder['quantity'])
155
                worksheet.write(row, inc(), subOrder['quantity'])
Line 157... Line 159...
157
                worksheet.write(row, inc(), subOrder['cashBackStatus'])
159
                worksheet.write(row, inc(), subOrder['cashBackStatus'])
158
                worksheet1.write(anotherrow, i, subOrder['cashBackStatus'])
160
                worksheet1.write(anotherrow, i, subOrder['cashBackStatus'])
159
                worksheet.write(row, inc(), subOrder['cashBackAmount'])
161
                worksheet.write(row, inc(), subOrder['cashBackAmount'])
160
                worksheet1.write(anotherrow, i, subOrder['cashBackAmount'])
162
                worksheet1.write(anotherrow, i, subOrder['cashBackAmount'])
161
        else:
163
        else:
162
            global i
-
 
163
            i=-1 
164
            i=-1 
164
            worksheet1.write(anotherrow, inc(), orderId)
165
            worksheet1.write(anotherrow, inc(), orderId)
165
            worksheet1.write(anotherrow, inc(), row1[1])
166
            worksheet1.write(anotherrow, inc(), row1[1])
166
            worksheet1.write(anotherrow, inc(), row1[-1])
167
            worksheet1.write(anotherrow, inc(), row1[-1])
167
            worksheet1.write(anotherrow, inc(), order['merchantOrderId'])
168
            worksheet1.write(anotherrow, inc(), order['merchantOrderId'])
Line 177... Line 178...
177
            worksheet1.write(anotherrow, inc(), 'Status', boldStyle)
178
            worksheet1.write(anotherrow, inc(), 'Status', boldStyle)
178
            worksheet1.write(anotherrow, inc(), 'Cashback Status', boldStyle)
179
            worksheet1.write(anotherrow, inc(), 'Cashback Status', boldStyle)
179
            worksheet1.write(anotherrow, inc(), 'CashBack', boldStyle)
180
            worksheet1.write(anotherrow, inc(), 'CashBack', boldStyle)
180
            k = i
181
            k = i
181
            for subOrder in order['subOrders']:
182
            for subOrder in order['subOrders']:
-
 
183
                anotherrow += 1
182
                i = k
184
                i = k
183
                worksheet.write(anotherrow, inc(), subOrder['productTitle'])
185
                worksheet.write(anotherrow, inc(), subOrder['productTitle'])
184
                worksheet.write(anotherrow, inc(), subOrder['amountPaid'])
186
                worksheet.write(anotherrow, inc(), subOrder['amountPaid'])
185
                worksheet.write(anotherrow, inc(), subOrder['quantity'])
187
                worksheet.write(anotherrow, inc(), subOrder['quantity'])
186
                worksheet.write(anotherrow, inc(), subOrder['status'])
188
                worksheet.write(anotherrow, inc(), subOrder['status'])