| Line 105... |
Line 105... |
| 105 |
private String freebieOrderId;
|
105 |
private String freebieOrderId;
|
| 106 |
private double cashAmount;
|
106 |
private double cashAmount;
|
| 107 |
private double cardAmount;
|
107 |
private double cardAmount;
|
| 108 |
private StoreOrderDetail storeOrderDetail;
|
108 |
private StoreOrderDetail storeOrderDetail;
|
| 109 |
//Start:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
109 |
//Start:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
| 110 |
private AmazonOrder amazonOrder;
|
110 |
private AmazonOrder amazonOrder = null;
|
| 111 |
private Provider provider;
|
111 |
private Provider provider;
|
| 112 |
//End:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
112 |
//End:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
| 113 |
|
113 |
|
| 114 |
public UserOrderInfoController() {
|
114 |
public UserOrderInfoController() {
|
| 115 |
super();
|
115 |
super();
|
| Line 129... |
Line 129... |
| 129 |
TransactionClient transactionServiceClient = new TransactionClient();
|
129 |
TransactionClient transactionServiceClient = new TransactionClient();
|
| 130 |
LogisticsClient logisticsServiceClient = new LogisticsClient();
|
130 |
LogisticsClient logisticsServiceClient = new LogisticsClient();
|
| 131 |
|
131 |
|
| 132 |
order = transactionServiceClient.getClient().getOrder(orderId);
|
132 |
order = transactionServiceClient.getClient().getOrder(orderId);
|
| 133 |
//Start:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
133 |
//Start:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
| - |
|
134 |
try {
|
| 134 |
amazonOrder = transactionServiceClient.getClient().getAmazonOrder(orderId);
|
135 |
amazonOrder = transactionServiceClient.getClient().getAmazonOrder(orderId);
|
| - |
|
136 |
} catch (Exception e) {
|
| - |
|
137 |
log.error("No Amazon order found with orderId " + orderId, e);
|
| - |
|
138 |
}
|
| 135 |
provider = logisticsServiceClient.getClient().getProvider(order.getLogistics_provider_id());
|
139 |
provider = logisticsServiceClient.getClient().getProvider(order.getLogistics_provider_id());
|
| 136 |
//End:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
140 |
//End:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
| 137 |
if(order.getSource() == 2) {
|
141 |
if(order.getSource() == 2) {
|
| 138 |
storeOrderDetail = transactionServiceClient.getClient().getStoreOrderDetail(order.getId(),order.getStoreId());
|
142 |
storeOrderDetail = transactionServiceClient.getClient().getStoreOrderDetail(order.getId(),order.getStoreId());
|
| 139 |
if(order.getStatus().getValue() == 15 || order.getStatus().getValue() == 34) {
|
143 |
if(order.getStatus().getValue() == 15 || order.getStatus().getValue() == 34) {
|