| Line 215... |
Line 215... |
| 215 |
if (order.getLogistics_provider_id() == 7){
|
215 |
if (order.getLogistics_provider_id() == 7){
|
| 216 |
warehouse = getWareHouseForOrder(order.getWarehouse_id());
|
216 |
warehouse = getWareHouseForOrder(order.getWarehouse_id());
|
| 217 |
fedexTrackingService = new FedExTrackingService(warehouse.getLogisticsLocation());
|
217 |
fedexTrackingService = new FedExTrackingService(warehouse.getLogisticsLocation());
|
| 218 |
}
|
218 |
}
|
| 219 |
//Start:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
219 |
//Start:- Added by Manish Sharma for Displaying Logistics Provider Id and Amazon Order Id on 25-Jul-2013
|
| 220 |
if(OrderSource.AMAZON == OrderSource.findByValue((int)order.getSource())){
|
220 |
if(OrderSource.AMAZON == OrderSource.findByValue((int)order.getSource()) || OrderSource.JUNGLEE == OrderSource.findByValue((int)order.getSource())){
|
| 221 |
try {
|
221 |
try {
|
| 222 |
amazonOrder = transactionServiceClient.getClient().getAmazonOrder(orderId);
|
222 |
amazonOrder = transactionServiceClient.getClient().getAmazonOrder(orderId);
|
| 223 |
} catch (Exception e) {
|
223 |
} catch (Exception e) {
|
| 224 |
log.error("Exception : No Amazon order found with orderId " + orderId);
|
224 |
log.error("Exception : No Amazon order found with orderId " + orderId);
|
| 225 |
}
|
225 |
}
|