Subversion Repositories SmartDukaan

Rev

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

Rev 28359 Rev 28361
Line 1254... Line 1254...
1254
		return "response";
1254
		return "response";
1255
	}
1255
	}
1256
 
1256
 
1257
	@RequestMapping(value = "/getOnlineOrder", method = RequestMethod.GET)
1257
	@RequestMapping(value = "/getOnlineOrder", method = RequestMethod.GET)
1258
	public String cancelOrder(HttpServletRequest request, Model model) throws Exception {
1258
	public String cancelOrder(HttpServletRequest request, Model model) throws Exception {
1259
 
-
 
-
 
1259
		LocalDate date = LocalDate.now().minusDays(3);
-
 
1260
		model.addAttribute("date", date);
1260
		return "online-order";
1261
		return "online-order";
1261
	}
1262
	}
1262
 
1263
 
1263
	@GetMapping("/getAllOrdersByStatus")
1264
	@GetMapping("/getAllOrdersByStatus")
1264
	public String getAllOrdersByStatus(HttpServletRequest request, @RequestParam OrderStatus status,
1265
	public String getAllOrdersByStatus(HttpServletRequest request, @RequestParam OrderStatus status,
Line 1276... Line 1277...
1276
		List<PendingOrderItem> pendingOrderItem = null;
1277
		List<PendingOrderItem> pendingOrderItem = null;
1277
 
1278
 
1278
		pendingOrderItem = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(Arrays.asList(status),
1279
		pendingOrderItem = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(Arrays.asList(status),
1279
				date.atStartOfDay(), LocalDateTime.now());
1280
				date.atStartOfDay(), LocalDateTime.now());
1280
 
1281
 
1281
		Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
1282
		Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItem, 0);
1282
 
1283
 
1283
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
1284
		model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
-
 
1285
		model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));
1284
 
1286
 
1285
		model.addAttribute("isAdmin", isAdmin);
1287
		model.addAttribute("isAdmin", isAdmin);
1286
		return "online-order-item";
1288
		return "online-order-item";
1287
	}
1289
	}
1288
}
1290
}