| Line 573... |
Line 573... |
| 573 |
else if(taOrder.getSource()!=OrderSource.WEBSITE.getValue()){
|
573 |
else if(taOrder.getSource()!=OrderSource.WEBSITE.getValue()){
|
| 574 |
continue;
|
574 |
continue;
|
| 575 |
}else{
|
575 |
}else{
|
| 576 |
orderValuesMap = new HashMap<String, String>();
|
576 |
orderValuesMap = new HashMap<String, String>();
|
| 577 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus()
|
577 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus()
|
| 578 |
&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
|
- |
|
| 579 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
578 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
| 580 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
579 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
| 581 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
580 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
| 582 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
581 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
| 583 |
if(warehousesMap.containsKey(taOrder.getFulfilmentWarehouseId())){
|
582 |
if(warehousesMap.containsKey(taOrder.getFulfilmentWarehouseId())){
|
| Line 866... |
Line 865... |
| 866 |
continue;
|
865 |
continue;
|
| 867 |
}
|
866 |
}
|
| 868 |
else{
|
867 |
else{
|
| 869 |
orderValuesMap = new HashMap<String, String>();
|
868 |
orderValuesMap = new HashMap<String, String>();
|
| 870 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus()
|
869 |
if(provider.isGroupShipmentAllowed() && !taOrder.isSetAccepted_timestamp() && t_order.getStatus()==taOrder.getStatus()
|
| 871 |
&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
|
- |
|
| 872 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
870 |
&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
|
| 873 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
871 |
&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
|
| 874 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
872 |
orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
|
| 875 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
873 |
orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
|
| 876 |
if(!inventoryClient.isAlive()){
|
874 |
if(!inventoryClient.isAlive()){
|