| Line 240... |
Line 240... |
| 240 |
else if(taOrder.getSource()!=OrderSource.WEBSITE.getValue()){
|
240 |
else if(taOrder.getSource()!=OrderSource.WEBSITE.getValue()){
|
| 241 |
continue;
|
241 |
continue;
|
| 242 |
}
|
242 |
}
|
| 243 |
else{
|
243 |
else{
|
| 244 |
orderValuesMap = new HashMap<String, String>();
|
244 |
orderValuesMap = new HashMap<String, String>();
|
| 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()){
|
245 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus()
|
| - |
|
246 |
&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
|
| - |
|
247 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
| - |
|
248 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
| 246 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
249 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
| 247 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
250 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
| 248 |
}
|
251 |
}
|
| 249 |
if(orderValuesMap!=null && orderValuesMap.size()>0){
|
252 |
if(orderValuesMap!=null && orderValuesMap.size()>0){
|
| 250 |
acceptTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
|
253 |
acceptTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
|