| Line 238... |
Line 238... |
| 238 |
}
|
238 |
}
|
| 239 |
Warehouse fulfillmentWarehouse = inventoryClient.getWarehouse(t_order.getFulfilmentWarehouseId());
|
239 |
Warehouse fulfillmentWarehouse = inventoryClient.getWarehouse(t_order.getFulfilmentWarehouseId());
|
| 240 |
orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
|
240 |
orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
|
| 241 |
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy");
|
241 |
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy");
|
| 242 |
orderValuesMap.put("Promised_Shipping", sdf.format(new Date(t_order.getPromised_shipping_time())));
|
242 |
orderValuesMap.put("Promised_Shipping", sdf.format(new Date(t_order.getPromised_shipping_time())));
|
| 243 |
NumberFormat formatter = new DecimalFormat("#0.00");
|
243 |
NumberFormat formatter = new DecimalFormat("#0.000");
|
| 244 |
orderValuesMap.put("Weight", formatter.format(t_order.getTotal_weight()));
|
244 |
orderValuesMap.put("Weight", formatter.format(t_order.getLineitems().get(0).getUnit_weight()));
|
| - |
|
245 |
formatter = new DecimalFormat("#0.00");
|
| 245 |
orderValuesMap.put("UnitPrice", formatter.format(t_order.getLineitems().get(0).getUnit_price()));
|
246 |
orderValuesMap.put("UnitPrice", formatter.format(t_order.getLineitems().get(0).getUnit_price()));
|
| - |
|
247 |
orderValuesMap.put("PackQuantity", item.getPackQuantity()+"");
|
| 246 |
acceptTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
|
248 |
acceptTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
|
| 247 |
List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getOrdersForTransaction(t_order.getTransactionId(), t_order.getCustomer_id());
|
249 |
List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getOrdersForTransaction(t_order.getTransactionId(), t_order.getCustomer_id());
|
| 248 |
in.shop2020.logistics.Provider provider = new LogisticsClient().getClient().getProvider(t_order.getLogistics_provider_id());
|
250 |
in.shop2020.logistics.Provider provider = new LogisticsClient().getClient().getProvider(t_order.getLogistics_provider_id());
|
| 249 |
for(in.shop2020.model.v1.order.Order taOrder : taOrders){
|
251 |
for(in.shop2020.model.v1.order.Order taOrder : taOrders){
|
| 250 |
LineItem lineItem1 = taOrder.getLineitems().get(0);
|
252 |
LineItem lineItem1 = taOrder.getLineitems().get(0);
|
| Line 266... |
Line 268... |
| 266 |
inventoryClient = new InventoryClient().getClient();
|
268 |
inventoryClient = new InventoryClient().getClient();
|
| 267 |
}
|
269 |
}
|
| 268 |
fulfillmentWarehouse = inventoryClient.getWarehouse(taOrder.getFulfilmentWarehouseId());
|
270 |
fulfillmentWarehouse = inventoryClient.getWarehouse(taOrder.getFulfilmentWarehouseId());
|
| 269 |
orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
|
271 |
orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
|
| 270 |
orderValuesMap.put("Promised_Shipping", sdf.format(new Date(taOrder.getPromised_shipping_time())));
|
272 |
orderValuesMap.put("Promised_Shipping", sdf.format(new Date(taOrder.getPromised_shipping_time())));
|
| 271 |
orderValuesMap.put("Weight", formatter.format(taOrder.getTotal_weight()));
|
- |
|
| 272 |
orderValuesMap.put("UnitPrice", formatter.format(taOrder.getLineitems().get(0).getUnit_price()));
|
273 |
orderValuesMap.put("UnitPrice", formatter.format(taOrder.getLineitems().get(0).getUnit_price()));
|
| - |
|
274 |
formatter = new DecimalFormat("#0.000");
|
| - |
|
275 |
orderValuesMap.put("Weight", formatter.format(taOrder.getLineitems().get(0).getUnit_weight()));
|
| - |
|
276 |
Item orderItem = client.getItem(taOrder.getLineitems().get(0).getItem_id());
|
| - |
|
277 |
orderValuesMap.put("PackQuantity", orderItem.getPackQuantity()+"");
|
| 273 |
}
|
278 |
}
|
| 274 |
if(orderValuesMap!=null && orderValuesMap.size()>0){
|
279 |
if(orderValuesMap!=null && orderValuesMap.size()>0){
|
| 275 |
acceptTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
|
280 |
acceptTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
|
| 276 |
}
|
281 |
}
|
| 277 |
}
|
282 |
}
|