| Line 209... |
Line 209... |
| 209 |
Map<Long, String> providerNameMap = new HashMap<Long, String>();
|
209 |
Map<Long, String> providerNameMap = new HashMap<Long, String>();
|
| 210 |
for(Provider provider : providerList){
|
210 |
for(Provider provider : providerList){
|
| 211 |
providerNameMap.put(provider.getId(), provider.getName());
|
211 |
providerNameMap.put(provider.getId(), provider.getName());
|
| 212 |
}*/
|
212 |
}*/
|
| 213 |
order = transactionServiceClient.getClient().getOrder(orderId);
|
213 |
order = transactionServiceClient.getClient().getOrder(orderId);
|
| - |
|
214 |
Warehouse warehouse;
|
| - |
|
215 |
if (order.getLogistics_provider_id() == 7){
|
| 214 |
Warehouse warehouse = getWareHouseForOrder(order.getWarehouse_id());
|
216 |
warehouse = getWareHouseForOrder(order.getWarehouse_id());
|
| 215 |
fedexTrackingService = new FedExTrackingService(warehouse.getLogisticsLocation());
|
217 |
fedexTrackingService = new FedExTrackingService(warehouse.getLogisticsLocation());
|
| - |
|
218 |
}
|
| 216 |
//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
|
| 217 |
if(OrderSource.AMAZON == OrderSource.findByValue((int)order.getSource())){
|
220 |
if(OrderSource.AMAZON == OrderSource.findByValue((int)order.getSource())){
|
| 218 |
try {
|
221 |
try {
|
| 219 |
amazonOrder = transactionServiceClient.getClient().getAmazonOrder(orderId);
|
222 |
amazonOrder = transactionServiceClient.getClient().getAmazonOrder(orderId);
|
| 220 |
} catch (Exception e) {
|
223 |
} catch (Exception e) {
|