Subversion Repositories SmartDukaan

Rev

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

Rev 32750 Rev 32756
Line 987... Line 987...
987 
        Map<String, Object> map = null;
 987 
        Map<String, Object> map = null;
988 
 
 988 
 
989 
        map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
 989 
        map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
990 
        model.addAttribute("inventoryMap", map.get("inventoryMap"));
 990 
        model.addAttribute("inventoryMap", map.get("inventoryMap"));
991 
 
 991 
 
992 
        model.addAttribute("pendingOrderItem", map.get("pendingOrderItem"));
 992 
        model.addAttribute("pendingOrderItems", map.get("pendingOrderItem"));
993 
 
 993 
 
994 
        LOGGER.info("partnerInventoryMap" + map.get("partnerInventoryMap"));
 994 
        LOGGER.info("partnerInventoryMap" + map.get("partnerInventoryMap"));
995 
        model.addAttribute("isAdmin", isAdmin);
 995 
        model.addAttribute("isAdmin", isAdmin);
996 
        return "pending_fofo_order";
 996 
        return "pending_fofo_order";
997 
 
 997 
 
Line 1000... Line 1000...
1000 
    @GetMapping("/billedOrders")
 1000 
    @GetMapping("/billedOrders")
1001 
    public String getBilledOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 1001 
    public String getBilledOrders(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
1002 
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 1002 
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
1003 
        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
 1003 
        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
1004 
 
 1004 
 
1005 
        List<PendingOrderItem> pendingOrderItem = null;
 1005 
        List<PendingOrderItem> pendingOrderItem;
1006 
 
 1006 
 
1007 
        if (isAdmin) {
 1007 
        if (isAdmin) {
1008 
 
 1008 
 
1009 
            pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(OrderStatus.BILLED);
 1009 
            pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(OrderStatus.BILLED);
1010 
 
 1010