WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

         model.addAttribute("isAdmin", isAdmin);
         return "online-order-item";
+    }
     @RequestMapping(value = "/franchiseeSalesReport", method = RequestMethod.GET)
-    public String getFranchiseeSalesReport(HttpServletRequest request, Model model)
+    public String getFranchiseeSalesReport(HttpServletRequest request, Model model, @RequestParam(defaultValue = "0") int fofoId,
+                                           @RequestParam(required = false) LocalDate startDate, @RequestParam(required = false) LocalDate endDate)
             throws ProfitMandiBusinessException {
-        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
+        if (startDate == null) {
+            startDate = LocalDate.now().minusDays(30);
+        }
-        LocalDateTime currentDate = LocalDate.now().atStartOfDay();
+        endDate = LocalDate.now();
+        model.addAttribute("startDate", startDate);
+        model.addAttribute("endDate", endDate);
+        model.addAttribute("isAdmin", isAdmin);
-        LocalDateTime currentStartMonth = currentDate.minusDays(30).toLocalDate().atStartOfDay();
+        LOGGER.info("q {}, starDate - {}, endDate - {}", fofoId, startDate, endDate);
+        if (isAdmin) {
+            if (fofoId == 0) {
+                //No need to pull any data
-        FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoDetails.getFofoId());
+                model.addAttribute("focoSaleReportList", new ArrayList<>());
+                return "foco-sale-report";
+            }
-        List<FocoSaleReportModel> focoSaleReportList = fofoOrderRepository.selectFocoSaleReport(fofoDetails.getFofoId(),
+        } else {
-                fs.getCode(), currentStartMonth, currentDate);
+            fofoId = loginDetails.getFofoId();
+        }
-        LOGGER.info("focoSaleReportList {}", focoSaleReportList);
-        model.addAttribute("startDate", currentDate.minusDays(30).toLocalDate());
+        FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
-        model.addAttribute("endDate", LocalDate.now());
+        List<FocoSaleReportModel> focoSaleReportList = fofoOrderRepository.selectFocoSaleReport(fofoId, fs.getCode(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
         model.addAttribute("focoSaleReportList", focoSaleReportList);
         return "foco-sale-report";
+    }
     @RequestMapping(value = "/franchiseeSalesFetchReportByDate", method = RequestMethod.GET)
-    public String getfranchiseeSalesFetchReport(HttpServletRequest request,
+    public String getfranchiseeSalesFetchReport(HttpServletRequest request, Model model,
+                                                @RequestParam(defaultValue = "0") int fofoId,
-                                                  @RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
+                                                @RequestParam(required = false) LocalDate startDate,
-                                                  @RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
+                                                @RequestParam(required = false) LocalDate endDate)
             throws Exception {
-        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
+        if (startDate == null) {
-        List<List<?>> rows = new ArrayList<>();
+            startDate = LocalDate.now().minusDays(30);
+            endDate = LocalDate.now();
+        }
+        model.addAttribute("startDate",startDate);
+        model.addAttribute("endDate", endDate);
+        model.addAttribute("isAdmin", isAdmin);
-        LocalDateTime currentDate = LocalDate.now().atStartOfDay();
-        FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoDetails.getFofoId());
-        List<FocoSaleReportModel> focoSaleReportList = fofoOrderRepository.selectFocoSaleReport(fofoDetails.getFofoId(),
-                fs.getCode(), startDate.atStartOfDay(), endDate.atStartOfDay());
-        LOGGER.info("focoSaleReportList {}", focoSaleReportList);
+        // List<List<?>> rows = new ArrayList<>();
+        LOGGER.info("q {}, starDate - {}, endDate - {}", fofoId, startDate, endDate);
+        if (isAdmin) {
+            if (fofoId == 0) {
+                //no need any data
-        model.addAttribute("startDate",startDate);
+                model.addAttribute("focoSaleReportList", new ArrayList<>());
-        model.addAttribute("endDate", LocalDate.now());
+                return "foco-sale-report";
+            }
+        } else {
+            fofoId = loginDetails.getFofoId();
+        }
+        FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
+        List<FocoSaleReportModel> focoSaleReportList = fofoOrderRepository.selectFocoSaleReport(fofoId, fs.getCode(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
         model.addAttribute("focoSaleReportList", focoSaleReportList);
         return "foco-sale-report";
+    }
         return responseEntity;
+    }
     @RequestMapping(value = "/walletSummaryFetchReportByDate", method = RequestMethod.GET)
-    public String getwalletSummaryFetchReport(HttpServletRequest request,
+    public String getwalletSummaryFetchReport(HttpServletRequest request, Model model, @RequestParam(defaultValue = "0") int fofoId,
-                                             @RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
+                                              @RequestParam(required = false) LocalDate startDate,
-                                             @RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
+                                              @RequestParam(required = false) LocalDate endDate)
             throws Exception {
-        LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
+        if (startDate == null) {
+            startDate = LocalDate.now().minusDays(30);
+        }
+        endDate = LocalDate.now();
+        model.addAttribute("startDate", startDate);
+        model.addAttribute("endDate", endDate);
+        model.addAttribute("isAdmin", isAdmin);
+        if (isAdmin) {
+            if (fofoId == 0) {
+                //No need to send any data
+                model.addAttribute("walletSummartList", new ArrayList<>());
-        List<List<?>> rows = new ArrayList<>();
+                return "wallet-summary-report";
+            } else {
+                List<WalletSummaryReportModel> walletSummartList = fofoOrderRepository
+                        .selectWalletSummaryReport(fofoId, startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+                model.addAttribute("walletSummartList", walletSummartList);
-        LocalDateTime currentDate = LocalDate.now().atStartOfDay();
-        List<WalletSummaryReportModel> walletSummaryReports = fofoOrderRepository
+                return "wallet-summary-report";
-                .selectWalletSummaryReport(fofoDetails.getFofoId(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
-        LOGGER.info("walletSummaryReports {}", walletSummaryReports);
+            }
-        model.addAttribute("startDate",startDate);
+        } else {
-        model.addAttribute("endDate", LocalDate.now());
-        model.addAttribute("walletSummaryReports", walletSummaryReports);
+            FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
+            List<WalletSummaryReportModel> walletSummartList = fofoOrderRepository
+                    .selectWalletSummaryReport(loginDetails.getFofoId(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+            //LOGGER.info("walletSummartList {}", walletSummartList);
+            model.addAttribute("walletSummartList", walletSummartList);
-        return "wallet-summary-report";
+            return "wallet-summary-report";
+        }
+    }
     @RequestMapping(value = "/walletSummaryReport", method = RequestMethod.GET)
     public String getWalletSummaryReport(HttpServletRequest request, Model model) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
         LocalDateTime currentDate = LocalDate.now().atStartOfDay();
         LocalDateTime currentStartMonth = currentDate.minusDays(30).toLocalDate().atStartOfDay();
         List<WalletSummaryReportModel> walletSummartList = fofoOrderRepository
                 .selectWalletSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
         LOGGER.info("walletSummartList {}", walletSummartList);
         model.addAttribute("startDate", currentDate.minusDays(30).toLocalDate());
         model.addAttribute("endDate", LocalDate.now());
         model.addAttribute("walletSummartList", walletSummartList);
+        model.addAttribute("isAdmin", isAdmin);
         return "wallet-summary-report";
+    }
     @RequestMapping(value = "/pendingIndentReport", method = RequestMethod.GET)
     public String getPendingIndentReport(HttpServletRequest request, Model model) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
         LocalDateTime currentDate = LocalDate.now().atStartOfDay();
         LocalDateTime currentStartMonth = currentDate.minusMonths(2).toLocalDate().atStartOfDay();
         List<PendingIndentReportModel> pendingIndentReports = fofoOrderRepository
         LOGGER.info("pendingIndentReports {}", pendingIndentReports);
         model.addAttribute("startDate", currentDate.minusMonths(2).toLocalDate());
         model.addAttribute("endDate", LocalDate.now());
         model.addAttribute("pendingIndentReports", pendingIndentReports);
+        model.addAttribute("isAdmin", isAdmin);
         return "pending-indent-report";
+    }
     @RequestMapping(value = "/pendingIndentFetchReportByDate", method = RequestMethod.GET)
-    public String getpendingIndentFetchReport(HttpServletRequest request,
+    public String getpendingIndentFetchReport(
+            HttpServletRequest request,
+            @RequestParam(defaultValue = "0") int fofoId,
-                                             @RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
+            @RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
-                                             @RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
+            @RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate,
+            Model model
-            throws Exception {
+    ) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
+        if (startDate == null) {
+            startDate = LocalDate.now().minusDays(30);
+            endDate = LocalDate.now();
+        }
+        model.addAttribute("startDate", startDate);
+        model.addAttribute("endDate", endDate);
+        model.addAttribute("isAdmin", isAdmin);
+        if (isAdmin) {
+            if (fofoId == 0) {
+                model.addAttribute("pendingIndentReports", new ArrayList<>());
+                return "pending-indent-report";
+            } else {
+                List<PendingIndentReportModel> pendingIndentReports = fofoOrderRepository
+                        .selectPendingIndentReport(fofoId, startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+                model.addAttribute("pendingIndentReports", pendingIndentReports);
+                return "pending-indent-report";
+            }
+        } else {
+            LocalDateTime currentDate = LocalDate.now().atStartOfDay();
+            List<PendingIndentReportModel> pendingIndentReports = fofoOrderRepository
+                    .selectPendingIndentReport(fofoDetails.getFofoId(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+            model.addAttribute("pendingIndentReports", pendingIndentReports);
+            return "pending-indent-report";
-        List<List<?>> rows = new ArrayList<>();
-        LocalDateTime currentDate = LocalDate.now().atStartOfDay();
-        List<PendingIndentReportModel> pendingIndentReports = fofoOrderRepository
-                .selectPendingIndentReport(fofoDetails.getFofoId(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
-        LOGGER.info("pendingIndentReports {}", pendingIndentReports);
-        model.addAttribute("startDate",startDate);
-        model.addAttribute("endDate", LocalDate.now());
-        model.addAttribute("pendingIndentReports", pendingIndentReports);
-        return "pending-indent-report";
+        }
+    }
     @RequestMapping(value = "/pendingIndentReportDownload", method = RequestMethod.GET)
     public ResponseEntity<?> getPendingIndentReportDownload(HttpServletRequest request,
         return "partner-billing-summary-report";
+    }
     @RequestMapping(value = "/priceDropReport", method = RequestMethod.GET)
-    public String getSelectPriceDropReport(HttpServletRequest request, Model model) throws Exception {
+    public String getSelectPriceDropReport(HttpServletRequest request, @RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
+                                           @RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
+        if (startDate == null) {
-        LocalDateTime currentDate = LocalDate.now().atStartOfDay();
+            startDate = LocalDate.now().minusDays(30);
-        LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+            endDate = LocalDate.now();
+        }
+        model.addAttribute("startDate", startDate);
+        model.addAttribute("endDate", endDate);
+        model.addAttribute("isAdmin", isAdmin);
         List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoDetails.getFofoId(),
-                currentStartMonth, currentDate);
-        model.addAttribute("startDate", currentDate.minusMonths(3).toLocalDate());
+                startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
-        model.addAttribute("endDate", LocalDate.now());
         model.addAttribute("priceDropReports", priceDropReports);
         return "price-drop-report";
+    }
     @RequestMapping(value = "/priceDropFetchReportByDate", method = RequestMethod.GET)
     public String getpriceDropFetchReportByDate(HttpServletRequest request,
+                                                @RequestParam(defaultValue = "0") int fofoId,
                                                 @RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
                                                 @RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
             throws Exception {
             LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+        boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
+        if (startDate == null) {
+            startDate = LocalDate.now().minusDays(30);
+            endDate = LocalDate.now();
+        }
+        model.addAttribute("startDate", startDate);
+        model.addAttribute("endDate", endDate);
+        model.addAttribute("isAdmin", isAdmin);
+        if (isAdmin) {
+            if (fofoId == 0) {
+                model.addAttribute("priceDropReports", new ArrayList<>());
+                return "price-drop-report";
+            } else {
+                List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoId,
+                        startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+                model.addAttribute("priceDropReports", priceDropReports);
+                return "price-drop-report";
+            }
-            List<List<?>> rows = new ArrayList<>();
+        } else {
-            LocalDateTime currentDate = LocalDate.now().atStartOfDay();
             List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoDetails.getFofoId(),
                     startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
-                 model.addAttribute("startDate",startDate);
-                model.addAttribute("endDate", LocalDate.now());
-                model.addAttribute("priceDropReports", priceDropReports);
+            model.addAttribute("priceDropReports", priceDropReports);
-        return "price-drop-report";
+            return "price-drop-report";
+        }
+    }
     @RequestMapping(value = "/downloadPriceDropReport", method = RequestMethod.GET)
     public ResponseEntity<?> getSelectDownloadPriceDropReport(HttpServletRequest request,

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java – Rev 33091 → 33092