Subversion Repositories SmartDukaan

Rev

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

Rev 28427 Rev 28429
Line 1286... Line 1286...
1286 
				statusList.add(OrderStatus.SETTLED);
 1286 
				statusList.add(OrderStatus.SETTLED);
1287 
				statusList.add(OrderStatus.UNSETTLED);
 1287 
				statusList.add(OrderStatus.UNSETTLED);
1288 
			} else {
 1288 
			} else {
1289 
				statusList.add(status);
 1289 
				statusList.add(status);
1290 
			}
 1290 
			}
1291 
			pendingOrderItem = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(statusList, startTime,
 1291 
			pendingOrderItem = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(statusList,
1292 
					endTime);
 1292 
					startTime.toLocalDate().atStartOfDay(), endTime);
1293 
		}
 1293 
		}
1294 
		Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, 0);
 1294 
		Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, 0);
1295 
 
 1295 
 
1296 
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
 1296 
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
1297 
		model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));
 1297 
		model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));