Subversion Repositories SmartDukaan

Rev

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

Rev 2492 Rev 2785
Line 1... Line 1...
1 
package in.shop2020.support.services;
 1 
package in.shop2020.support.services;
2 
 
 2 
 
3 
import in.shop2020.model.v1.order.LineItem;
 3 
import in.shop2020.model.v1.order.LineItem;
4 
import in.shop2020.model.v1.order.Order;
 4 
import in.shop2020.model.v1.order.Order;
- 
 
 5 
import in.shop2020.model.v1.order.OrderStatus;
5 
import in.shop2020.model.v1.order.TransactionServiceException;
 6 
import in.shop2020.model.v1.order.TransactionServiceException;
6 
import in.shop2020.payments.Attribute;
 7 
import in.shop2020.payments.Attribute;
7 
import in.shop2020.payments.Constants;
 8 
import in.shop2020.payments.Constants;
8 
import in.shop2020.payments.Payment;
 9 
import in.shop2020.payments.Payment;
9 
import in.shop2020.payments.PaymentException;
 10 
import in.shop2020.payments.PaymentException;
Line 260... Line 261...
260 
                contentRow.createCell(STATE).setCellValue(orders.get(0).getCustomer_state());
 261 
                contentRow.createCell(STATE).setCellValue(orders.get(0).getCustomer_state());
261 
                contentRow.createCell(EMAIL).setCellValue(orders.get(0).getCustomer_email());
 262 
                contentRow.createCell(EMAIL).setCellValue(orders.get(0).getCustomer_email());
262
263
263 
                boolean firstOrder = true;
 264 
                boolean firstOrder = true;
264 
                for (Order o : orders) {
 265 
                for (Order o : orders) {
- 
 
 266 
                    if(o.getStatus() == OrderStatus.SALES_RET_RESHIPPED || o.getStatus() == OrderStatus.DOA_RESHIPPED || o.getStatus() == OrderStatus.DOA_INVALID_RESHIPPED)
- 
 
 267 
                        continue;
- 
 
 268 
 
265 
                    if(firstOrder) {
 269 
                    if(firstOrder) {
266 
                        firstOrder = false;
 270 
                        firstOrder = false;
267 
                    } else {
 271 
                    } else {
268 
                        paymentSerialNo++;
 272 
                        paymentSerialNo++;
269 
                        contentRow = paymentSheet.createRow(paymentSerialNo);
 273 
                        contentRow = paymentSheet.createRow(paymentSerialNo);