Subversion Repositories SmartDukaan

Rev

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

Rev 7623 Rev 8925
Line 8... Line 8...
8
import in.shop2020.model.v1.order.LineItem;
8
import in.shop2020.model.v1.order.LineItem;
9
import in.shop2020.model.v1.order.Order;
9
import in.shop2020.model.v1.order.Order;
10
import in.shop2020.model.v1.order.OrderSource;
10
import in.shop2020.model.v1.order.OrderSource;
11
import in.shop2020.model.v1.order.OrderStatus;
11
import in.shop2020.model.v1.order.OrderStatus;
12
import in.shop2020.model.v1.order.OrderType;
12
import in.shop2020.model.v1.order.OrderType;
-
 
13
import in.shop2020.model.v1.order.ProductCondition;
13
import in.shop2020.model.v1.order.Transaction;
14
import in.shop2020.model.v1.order.Transaction;
14
import in.shop2020.model.v1.order.TransactionService.Client;
15
import in.shop2020.model.v1.order.TransactionService.Client;
15
import in.shop2020.model.v1.order.TransactionServiceException;
16
import in.shop2020.model.v1.order.TransactionServiceException;
16
import in.shop2020.model.v1.order.TransactionStatus;
17
import in.shop2020.model.v1.order.TransactionStatus;
17
//import in.shop2020.model.v1.order.Attribute;
18
//import in.shop2020.model.v1.order.Attribute;
Line 72... Line 73...
72
    private String itemId;
73
    private String itemId;
73
    private String output;
74
    private String output;
74
    private String pickUp;
75
    private String pickUp;
75
    private String orderType;
76
    private String orderType;
76
    private String tinNumber;
77
    private String tinNumber;
-
 
78
    private int productCondition;
77
    private Transaction transaction;
79
    private Transaction transaction;
78
    private Payment payment;
80
    private Payment payment;
79
 
81
 
80
    private Map<Transaction, Double> transactions;
82
    private Map<Transaction, Double> transactions;
81
    private List<LineItem> lineItems;
83
    private List<LineItem> lineItems;
Line 288... Line 290...
288
            t_order.setLineitems(Collections.singletonList(lineItem));            
290
            t_order.setLineitems(Collections.singletonList(lineItem));            
289
            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
291
            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
290
            t_order.setStatusDescription("Payment Pending");
292
            t_order.setStatusDescription("Payment Pending");
291
            t_order.setCreated_timestamp(new Date().getTime());
293
            t_order.setCreated_timestamp(new Date().getTime());
292
            t_order.setSource(1);//Source : Website
294
            t_order.setSource(1);//Source : Website
-
 
295
            t_order.setProductCondition(ProductCondition.findByValue(productCondition));
-
 
296
            //t_order.setProductCondition(ProductCondition.findByValue(productCondition.intValue()));
293
 
297
 
294
            orders.add(t_order);
298
            orders.add(t_order);
295
        }
299
        }
296
 
300
 
297
        return orders;
301
        return orders;
Line 473... Line 477...
473
    }
477
    }
474
 
478
 
475
    public void setTinNumber(String tinNumber) {
479
    public void setTinNumber(String tinNumber) {
476
        this.tinNumber = tinNumber;
480
        this.tinNumber = tinNumber;
477
    }
481
    }
-
 
482
 
-
 
483
	public int getProductCondition() {
-
 
484
		return productCondition;
-
 
485
	}
-
 
486
 
-
 
487
	public void setProductCondition(int productCondition) {
-
 
488
		this.productCondition = productCondition;
-
 
489
	}
-
 
490
    
478
}
491
}