Subversion Repositories SmartDukaan

Rev

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

Rev 8925 Rev 9416
Line 9... Line 9...
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.ProductCondition;
-
 
14
import in.shop2020.model.v1.order.TaxType;
14
import in.shop2020.model.v1.order.Transaction;
15
import in.shop2020.model.v1.order.Transaction;
15
import in.shop2020.model.v1.order.TransactionService.Client;
16
import in.shop2020.model.v1.order.TransactionService.Client;
16
import in.shop2020.model.v1.order.TransactionServiceException;
17
import in.shop2020.model.v1.order.TransactionServiceException;
17
import in.shop2020.model.v1.order.TransactionStatus;
18
import in.shop2020.model.v1.order.TransactionStatus;
18
//import in.shop2020.model.v1.order.Attribute;
19
//import in.shop2020.model.v1.order.Attribute;
Line 74... Line 75...
74
    private String output;
75
    private String output;
75
    private String pickUp;
76
    private String pickUp;
76
    private String orderType;
77
    private String orderType;
77
    private String tinNumber;
78
    private String tinNumber;
78
    private int productCondition;
79
    private int productCondition;
-
 
80
    private int taxType;
79
    private Transaction transaction;
81
    private Transaction transaction;
80
    private Payment payment;
82
    private Payment payment;
81
 
83
 
82
    private Map<Transaction, Double> transactions;
84
    private Map<Transaction, Double> transactions;
83
    private List<LineItem> lineItems;
85
    private List<LineItem> lineItems;
Line 291... Line 293...
291
            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
293
            t_order.setStatus(OrderStatus.PAYMENT_PENDING);
292
            t_order.setStatusDescription("Payment Pending");
294
            t_order.setStatusDescription("Payment Pending");
293
            t_order.setCreated_timestamp(new Date().getTime());
295
            t_order.setCreated_timestamp(new Date().getTime());
294
            t_order.setSource(1);//Source : Website
296
            t_order.setSource(1);//Source : Website
295
            t_order.setProductCondition(ProductCondition.findByValue(productCondition));
297
            t_order.setProductCondition(ProductCondition.findByValue(productCondition));
-
 
298
            t_order.setTaxType(TaxType.findByValue(taxType));
296
            //t_order.setProductCondition(ProductCondition.findByValue(productCondition.intValue()));
299
            //t_order.setProductCondition(ProductCondition.findByValue(productCondition.intValue()));
297
 
300
 
298
            orders.add(t_order);
301
            orders.add(t_order);
299
        }
302
        }
300
 
303
 
Line 485... Line 488...
485
	}
488
	}
486
 
489
 
487
	public void setProductCondition(int productCondition) {
490
	public void setProductCondition(int productCondition) {
488
		this.productCondition = productCondition;
491
		this.productCondition = productCondition;
489
	}
492
	}
-
 
493
 
-
 
494
	public int getTaxType() {
-
 
495
		return taxType;
-
 
496
	}
-
 
497
 
-
 
498
	public void setTaxType(int taxType) {
-
 
499
		this.taxType = taxType;
-
 
500
	}
490
    
501
    
491
}
502
}