Subversion Repositories SmartDukaan

Rev

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

Rev 32758 Rev 32761
Line 977... Line 977...
977 
            mouRepository.persist(mou);
 977 
            mouRepository.persist(mou);
978 
        } else if (!mou.getUpdateTimestamp().getMonth().equals(LocalDateTime.now().getMonth())) {
 978 
        } else if (!mou.getUpdateTimestamp().getMonth().equals(LocalDateTime.now().getMonth())) {
979 
            mou.setUpdateTimestamp(LocalDateTime.now());
 979 
            mou.setUpdateTimestamp(LocalDateTime.now());
980 
        }
 980 
        }
981 
 
 981 
 
982 
        List<PendingOrderItem> pendingOrderItem = null;
 - 
 
983 
 
 - 
 
984 
        pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
 982 
        List<PendingOrderItem> pendingOrderItems = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.PROCESSING,
985 
                loginDetails.getFofoId());
 983 
                loginDetails.getFofoId());
986 
 
 984 
 
987 
        Map<String, Object> map = null;
 - 
 
988 
 
 - 
 
989 
        map = pendingOrderService.getItemOrders(pendingOrderItem, loginDetails.getFofoId());
 985 
        Map<String, Object> map = pendingOrderService.getItemOrders(pendingOrderItems, loginDetails.getFofoId());
990 
        model.addAttribute("inventoryMap", map.get("inventoryMap"));
 986 
        model.addAttribute("inventoryMap", map.get("inventoryMap"));
- 
 
 987 
        model.addAttribute("pendingOrderItems", (List<PendingOrderItem>)map.get("pendingOrderItems"));
991 
 
 988 
 
992 
        model.addAttribute("pendingOrderItems", (List<PendingOrderItem>)map.get("pendingOrderItem"));
 - 
 
993 
 
 - 
 
994 
        LOGGER.info("partnerInventoryMap  -- {}", (List<PendingOrderItem>)map.get("pendingOrderItem"));
 - 
 
995 
        model.addAttribute("isAdmin", isAdmin);
 989 
        model.addAttribute("isAdmin", isAdmin);
996 
        return "pending_fofo_order";
 990 
        return "pending_fofo_order";
997 
 
 991 
 
998 
    }
 992 
    }
999 
 
 993