Subversion Repositories SmartDukaan

Rev

Rev 13323 | Rev 18938 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 13323 Rev 18100
Line 2... Line 2...
2 
 
 2 
 
3 
import in.shop2020.hotspot.dashbaord.shared.actions.Order;
 3 
import in.shop2020.hotspot.dashbaord.shared.actions.Order;
4 
import in.shop2020.hotspot.dashbaord.shared.actions.OrderType;
 4 
import in.shop2020.hotspot.dashbaord.shared.actions.OrderType;
5 
import in.shop2020.hotspot.dashbaord.shared.actions.ReturnOrder;
 5 
import in.shop2020.hotspot.dashbaord.shared.actions.ReturnOrder;
6 
import in.shop2020.model.v1.inventory.InventoryType;
 6 
import in.shop2020.model.v1.inventory.InventoryType;
- 
 
 7 
import in.shop2020.model.v1.inventory.WarehouseType;
7 
import in.shop2020.model.v1.catalog.Item;
 8 
import in.shop2020.model.v1.catalog.Item;
8 
import in.shop2020.model.v1.catalog.ItemType;
 9 
import in.shop2020.model.v1.catalog.ItemType;
9 
import in.shop2020.model.v1.inventory.Warehouse;
 10 
import in.shop2020.model.v1.inventory.Warehouse;
10 
import in.shop2020.model.v1.order.LineItem;
 11 
import in.shop2020.model.v1.order.LineItem;
11 
import in.shop2020.model.v1.order.OrderSource;
 12 
import in.shop2020.model.v1.order.OrderSource;
Line 227... Line 228...
227 
            if(!t_order.isSetAccepted_timestamp()){
 228 
            if(!t_order.isSetAccepted_timestamp()){
228 
            	acceptTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
 229 
            	acceptTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
229 
            	Map<String, String> orderValuesMap = new HashMap<String, String>();
 230 
            	Map<String, String> orderValuesMap = new HashMap<String, String>();
230 
            	orderValuesMap.put("ProductName", getItemDisplayName(lineItem));
 231 
            	orderValuesMap.put("ProductName", getItemDisplayName(lineItem));
231 
				orderValuesMap.put("Quantity", lineItem.getQuantity()+"");
 232 
				orderValuesMap.put("Quantity", lineItem.getQuantity()+"");
- 
 
 233 
				if(!inventoryClient.isAlive()){
- 
 
 234 
					inventoryClient = new InventoryClient().getClient();
- 
 
 235 
				}
- 
 
 236 
				Warehouse fulfillmentWarehouse = inventoryClient.getWarehouse(t_order.getFulfilmentWarehouseId());
- 
 
 237 
				orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
232 
				acceptTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
 238 
				acceptTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
233 
            	List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getOrdersForTransaction(t_order.getTransactionId(), t_order.getCustomer_id());
 239 
            	List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getOrdersForTransaction(t_order.getTransactionId(), t_order.getCustomer_id());
234 
            	in.shop2020.logistics.Provider provider = new LogisticsClient().getClient().getProvider(t_order.getLogistics_provider_id());
 240 
            	in.shop2020.logistics.Provider provider = new LogisticsClient().getClient().getProvider(t_order.getLogistics_provider_id());
235 
            	for(in.shop2020.model.v1.order.Order taOrder : taOrders){
 241 
            	for(in.shop2020.model.v1.order.Order taOrder : taOrders){
236 
            		LineItem lineItem1 = taOrder.getLineitems().get(0);
 242 
            		LineItem lineItem1 = taOrder.getLineitems().get(0);
Line 246... Line 252...
246 
            					&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
252 
            					&& taOrder.getLogistics_provider_id()==t_order.getLogistics_provider_id()
247 
            					&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
253 
            					&& taOrder.isLogisticsCod()==t_order.isLogisticsCod() && taOrder.getWarehouse_id() == t_order.getWarehouse_id()
248 
            					&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
 254 
            					&& taOrder.getOrderType() == t_order.getOrderType() && taOrder.getPickupStoreId() == t_order.getPickupStoreId()){
249 
            				orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
 255 
            				orderValuesMap.put("ProductName", getItemDisplayName(lineItem1));
250 
            				orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
 256 
            				orderValuesMap.put("Quantity", lineItem1.getQuantity()+"");
- 
 
 257 
            				if(!inventoryClient.isAlive()){
- 
 
 258 
            					inventoryClient = new InventoryClient().getClient();
- 
 
 259 
            				}
- 
 
 260 
            				fulfillmentWarehouse = inventoryClient.getWarehouse(taOrder.getFulfilmentWarehouseId());
- 
 
 261 
            				orderValuesMap.put("WarehouseType", fulfillmentWarehouse.getWarehouseType().toString());
251 
            			}
 262 
            			}
252 
            			if(orderValuesMap!=null && orderValuesMap.size()>0){
 263 
            			if(orderValuesMap!=null && orderValuesMap.size()>0){
253 
            				acceptTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
 264 
            				acceptTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
254 
            			}
 265 
            			}
255 
            		}
 266 
            		}
Line 257... Line 268...
257 
            }
 268 
            }
258
269
259 
            if(t_order.isSetLogisticsTransactionId()){
 270 
            if(t_order.isSetLogisticsTransactionId()){
260 
            	billTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
 271 
            	billTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
261 
            	Map<String, String> orderValuesMap = new HashMap<String, String>();
 272 
            	Map<String, String> orderValuesMap = new HashMap<String, String>();
- 
 
 273 
	            if(t_order.getStatus()==OrderStatus.ACCEPTED){
262 
            	orderValuesMap.put("ProductName", getItemDisplayName(lineItem));
 274 
	            	orderValuesMap.put("ProductName", getItemDisplayName(lineItem));
263 
            	orderValuesMap.put("Quantity", lineItem.getQuantity()+"");
 275 
	            	orderValuesMap.put("Quantity", lineItem.getQuantity()+"");
264 
            	if(ItemType.SERIALIZED==item.getType()){
 276 
	            	if(ItemType.SERIALIZED==item.getType()){
265 
            		orderValuesMap.put("IsSerialized", "true");
 277 
	            		orderValuesMap.put("IsSerialized", "true");
266 
            	}else{
 278 
	            	}else{
267 
            		orderValuesMap.put("IsSerialized", "false");
 279 
	            		orderValuesMap.put("IsSerialized", "false");
268 
            	}
 280 
	            	}
269 
            	if(t_order.isSetFreebieItemId() && t_order.getFreebieItemId()!=0){
 281 
	            	if(t_order.isSetFreebieItemId() && t_order.getFreebieItemId()!=0){
270 
            		orderValuesMap.put("IsFreebie", "true");
 282 
	            		orderValuesMap.put("IsFreebie", "true");
271 
            	} else {
 283 
	            	} else {
272 
            		orderValuesMap.put("IsFreebie", "false");
 284 
	            		orderValuesMap.put("IsFreebie", "false");
- 
 
 285 
	            	}
- 
 
 286 
	            	billTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
273 
            	}
 287 
            	}
274 
            	billTogetherOrdersMap.put(t_order.getId(), orderValuesMap);
 - 
 
275 
            	Map<Long, Item> orderItemMap = new HashMap<Long, Item>();
 288 
            	Map<Long, Item> orderItemMap = new HashMap<Long, Item>();
276 
            	List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getGroupOrdersByLogisticsTxnId(t_order.getLogisticsTransactionId());
 289 
            	List<in.shop2020.model.v1.order.Order> taOrders = new TransactionClient().getClient().getGroupOrdersByLogisticsTxnId(t_order.getLogisticsTransactionId());
277 
            	for(in.shop2020.model.v1.order.Order ord1: taOrders){
 290 
            	for(in.shop2020.model.v1.order.Order ord1: taOrders){
- 
 
 291 
            		if(ord1.getStatus()==OrderStatus.ACCEPTED){
278 
            		if(ord1.getId()== t_order.getId()){
 292 
	            		if(ord1.getId()== t_order.getId()){
279 
            			orderItemMap.put(ord1.getId(), item);
 293 
	            			orderItemMap.put(ord1.getId(), item);
280 
            		} else {
 294 
	            		} else {
281 
	            		if(!client.isAlive()){
 295 
		            		if(!client.isAlive()){
282 
	            			client = new CatalogClient().getClient();
 296 
		            			client = new CatalogClient().getClient();
- 
 
 297 
		            		}
- 
 
 298 
		            		Item it = client.getItem(ord1.getLineitems().get(0).getItem_id());
- 
 
 299 
		            		orderItemMap.put(ord1.getId(), it);
283 
	            		}
 300 
	            		}
284 
	            		Item it = client.getItem(ord1.getLineitems().get(0).getItem_id());
 - 
 
285 
	            		orderItemMap.put(ord1.getId(), it);
 - 
 
286 
            		}
 301 
            		}
287 
            	}
 302 
            	}
288
303
289 
            	for(in.shop2020.model.v1.order.Order taOrder: taOrders){
 304 
            	for(in.shop2020.model.v1.order.Order taOrder: taOrders){
- 
 
 305 
            		if(taOrder.getStatus()==OrderStatus.ACCEPTED){
290 
            		if(taOrder.getId()==t_order.getId()){
 306 
	            		if(taOrder.getId()==t_order.getId()){
291 
            			continue;
 307 
	            			continue;
292 
            		} else {
 308 
	            		} else {
293 
            			orderValuesMap = new HashMap<String, String>();
 309 
	            			orderValuesMap = new HashMap<String, String>();
294 
            			Item orderItem = orderItemMap.get(taOrder.getId());
 310 
	            			Item orderItem = orderItemMap.get(taOrder.getId());
295 
            			orderValuesMap.put("ProductName", getProductName(orderItem));
 311 
	            			orderValuesMap.put("ProductName", getProductName(orderItem));
296 
                    	orderValuesMap.put("Quantity", taOrder.getLineitems().get(0).getQuantity()+"");
 312 
	                    	orderValuesMap.put("Quantity", taOrder.getLineitems().get(0).getQuantity()+"");
297 
                    	if(ItemType.SERIALIZED==orderItem.getType()){
 313 
	                    	if(ItemType.SERIALIZED==orderItem.getType()){
298 
                    		orderValuesMap.put("IsSerialized", "true");
 314 
	                    		orderValuesMap.put("IsSerialized", "true");
299 
                    	}else{
 315 
	                    	}else{
300 
                    		orderValuesMap.put("IsSerialized", "false");
 316 
	                    		orderValuesMap.put("IsSerialized", "false");
301 
                    	}
 317 
	                    	}
302 
                    	if(taOrder.isSetFreebieItemId() && taOrder.getFreebieItemId()!=0){
 318 
	                    	if(taOrder.isSetFreebieItemId() && taOrder.getFreebieItemId()!=0){
303 
                    		orderValuesMap.put("IsFreebie", "true");
 319 
	                    		orderValuesMap.put("IsFreebie", "true");
304 
                    	} else {
 320 
	                    	} else {
305 
                    		orderValuesMap.put("IsFreebie", "false");
 321 
	                    		orderValuesMap.put("IsFreebie", "false");
306 
                    	}
 322 
	                    	}
307 
                    	billTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
 323 
	                    	billTogetherOrdersMap.put(taOrder.getId(), orderValuesMap);
- 
 
 324 
	            		}
308 
            		}
 325 
            		}
309 
            	}
 326 
            	}
310 
            }
 327 
            }
311 
            else{
 328 
            else{
312 
            	billTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
 329 
            	billTogetherOrdersMap = new HashMap<Long, Map<String, String>>();