| Line 234... |
Line 234... |
| 234 |
in.shop2020.logistics.Provider provider = new LogisticsClient().getClient().getProvider(t_order.getLogistics_provider_id());
|
234 |
in.shop2020.logistics.Provider provider = new LogisticsClient().getClient().getProvider(t_order.getLogistics_provider_id());
|
| 235 |
for(in.shop2020.model.v1.order.Order taOrder : taOrders){
|
235 |
for(in.shop2020.model.v1.order.Order taOrder : taOrders){
|
| 236 |
LineItem lineItem1 = taOrder.getLineitems().get(0);
|
236 |
LineItem lineItem1 = taOrder.getLineitems().get(0);
|
| 237 |
if(t_order.getId()==taOrder.getId()){
|
237 |
if(t_order.getId()==taOrder.getId()){
|
| 238 |
continue;
|
238 |
continue;
|
| - |
|
239 |
}
|
| - |
|
240 |
else if(taOrder.getSource()!=OrderSource.WEBSITE.getValue()){
|
| - |
|
241 |
continue;
|
| - |
|
242 |
}
|
| 239 |
}else{
|
243 |
else{
|
| 240 |
orderValuesMap = new HashMap<String, String>();
|
244 |
orderValuesMap = new HashMap<String, String>();
|
| 241 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus() && taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id() && taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id() && taOrder.getOrderType() == t_order.getOrderType()){
|
245 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus() && taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id() && taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id() && taOrder.getOrderType() == t_order.getOrderType()){
|
| 242 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
246 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
| 243 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
247 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
| 244 |
}
|
248 |
}
|