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

     @Autowired
     PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
     List<String> agreedBrandFeeChangerEmail = Arrays.asList("sm@smartdukaan.com");
-    // OnBoarding Form
+    // Loi Form
-    @RequestMapping(value = "/onboardingForm", method = RequestMethod.GET)
+    @RequestMapping(value = "/loiForm", method = RequestMethod.GET)
     public String loiForm(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
-        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         List<AuthUser> authUsersList = loiFormService.getReferalAuthList();
         List<BrandFee> brandFee = brandFeeRepository.selectFeeOnDate(LocalDateTime.now());
         Set<Pair<StoreType, BrandFee>> storeTypeFeePairs = new HashSet<>();
         for (BrandFee fee : brandFee) {
             for (StoreType storeType : StoreType.values()) {
         List<BusinessType> businessTypes = Arrays.asList(BusinessType.Proprietorship, BusinessType.Partnership, BusinessType.Company);
         model.addAttribute("businessTypes", businessTypes);
         model.addAttribute("brandCommits", brandCommits);
         model.addAttribute("storeTypeFeePairs", storeTypeFeePairs);
         model.addAttribute("authUsersList", authUsersList);
-        return "partner-onboarding-form";
+        return "loi-form";
+    }
     // use to validate GSTIN
     @RequestMapping(value = "/gstValidate", method = RequestMethod.GET)
     public ResponseEntity<?> gstValidate(HttpServletRequest request, @RequestParam String gstNo) throws Exception {
     @RequestMapping(value = "/pendingLoiForm", method = RequestMethod.GET)
     public String pendingLoiForm(HttpServletRequest request, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String email = loginDetails.getEmailId();
         boolean isDocApprover = false;
-        //todo:replace
         String approverEmail = "gaurav.sharma@smartdukaan.com";
         if (email.equals(approverEmail)) {
             isDocApprover = true;
+        }
         boolean isAgreedBrandFeeChanger = agreedBrandFeeChangerEmail.stream().anyMatch(x -> x.equals(email));
         return "pendingForm";
+    }
     // generate LOI for specific Form data
     @RequestMapping(value = "/generateLoi", method = RequestMethod.GET)
-    public String generateLoi(@RequestParam int loiId, Model model) throws ProfitMandiBusinessException {
+    public String generateLoi(HttpServletRequest request, @RequestParam int loiId, Model model) throws ProfitMandiBusinessException {
         LoiForm loiForm = loiFormRepository.selectById(loiId);
         String filledBy = authRepository.selectByEmailOrMobile(loiForm.getFilledBy()).getFullName();
         loiForm.setLoiGeneratedOn(LocalDateTime.now());
-        loiForm.setStatus(LoiStatus.LOI_GENERATED);
         BrandFee brandFee = brandFeeRepository.selectById(1);
-        BrandFee givenFee = brandFeeRepository.selectById(loiForm.getBrandFeeId());
         BillingAddress address = billingAddressRepository.selectByLoiFormId(loiId);
-        List<BrandFeeCollection> brandFeeCollections = brandFeeCollectionRepository.selectAllByLoiFormId(loiId);
         List<LoiBrandCommitment> loiBrandCommitments = brandCommitmentRepository.selectByLoiId(loiId).stream().filter(x -> x.getAmount() > 0).collect(Collectors.toList());
         double totalCommitment = loiBrandCommitments.stream().mapToDouble(x -> x.getAmount()).sum();
+        List<BrandFeeCollection> brandFeeCollections = brandFeeCollectionRepository.selectAllConfirmPaymetByLoiId(loiId);
-        double brandFeeAmount = brandFeeCollections.stream().filter(x -> x.getPaymentStatus().equals(FeePaymentStatus.CONFIRM)).mapToDouble(x -> x.getCollectedAmount()).sum();
+        double brandFeeAmount = brandFeeCollections.stream().mapToDouble(x -> x.getCollectedAmount()).sum();
         BrandFeeCollection brandFeeCollection = brandFeeCollections.get(0);
         model.addAttribute("totalCommitment", totalCommitment);
         model.addAttribute("loiBrandCommitments", loiBrandCommitments);
         model.addAttribute("brandFeeAmount", brandFeeAmount);
         model.addAttribute("brandFee", brandFee);
-        model.addAttribute("givenFee", givenFee);
         model.addAttribute("brandFeeCollection", brandFeeCollection);
         model.addAttribute("address", address);
         model.addAttribute("loiForm", loiForm);
         model.addAttribute("filledBy", filledBy);
         return "auto-Loi";
+    }
-    @RequestMapping(value = "/saveLoiDoc", method = RequestMethod.POST)
-    public String saveLoiDoc(@RequestParam int loiId, @RequestParam int loiDocId, Model model) throws Exception {
-        LOGGER.info("loi_docId-" + loiDocId);
-        LoiForm loiForm = loiFormRepository.selectById(loiId);
-        int loiDoc = loiForm.getLoiDoc();
-        if (loiDoc == 0) {
-            loiForm.setLoiDoc(loiDocId);
-            loiFormService.sendSignedLoiPdfToPartner(loiForm);
-            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-        } else {
-            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-        }
-        if (loiForm.getOnBoardingId() > 0) {
-            partnerOnBoardingPanelRepository.selectById(loiForm.getOnBoardingId()).setLOI(loiDocId);
-        }
-        return "response";
-    }
     // send Filled form for update purpose
     @RequestMapping(value = "/updateLoiForm", method = RequestMethod.GET)
     public String UpdateLoiForm(HttpServletRequest request,
                                 @RequestParam int loiId,
         loiFormService.updateLoiForm(loiFormData, loiId);
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
-    // TODO , add paymnet if brand fee due
     @RequestMapping(value = "/brandfeeCollection", method = RequestMethod.POST)
     public String addBrandFee(HttpServletRequest request, @RequestBody BrandFeeCollection brandFeeCollection, @RequestParam int loiId, Model model) throws Exception {
         LoiForm loiForm = loiFormRepository.selectById(loiId);
-        List<BrandFeeCollection> brandFeeCollections = brandFeeCollectionRepository.selectAllByLoiFormId(loiId);
-        double totatcollectedfee = brandFeeCollections.stream().filter(x -> x.getPaymentStatus().equals(FeePaymentStatus.CONFIRM) || x.getPaymentStatus().equals(FeePaymentStatus.PENDING)).mapToDouble(x -> x.getCollectedAmount()).sum();
+        double totatcollectedfee = brandFeeCollectionRepository.selectAllByLoiFormId(loiId).stream().mapToDouble(x -> x.getCollectedAmount()).sum();
         double brandFee = loiForm.getAgreedBrandFees();
         double differanceAmount = brandFee - totatcollectedfee;
         if (totatcollectedfee + brandFeeCollection.getCollectedAmount() <= brandFee) {
             brandFeeCollection.setPaymentStatus(FeePaymentStatus.PENDING);
             brandFeeCollection.setLoiFormId(loiId);
             brandFeeCollectionRepository.persist(brandFeeCollection);
-            loiFormService.sentMailToPaymentApprover(brandFeeCollection);
+            loiFormService.sentMailToPaymentApprover(brandFeeCollection, loiForm);
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             return "response";
         } else {
             throw new ProfitMandiBusinessException("You need to add only due brand fee that is Only, " + differanceAmount + " INR", null, "Pay differance amount or less then differance amount");
+        }
     public String feePaymentApproval(HttpServletRequest request, @RequestParam int bfcId, @RequestParam FeePaymentStatus feePaymentStatus, @RequestParam String description,
                                      Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String authEmail = loginDetails.getEmailId();
         BrandFeeCollection brandFeeCollection = brandFeeCollectionRepository.selectById(bfcId);
-        LoiForm loiForm = loiFormRepository.selectById(brandFeeCollection.getLoiFormId());
-        List<BrandFeeCollection> brandFeeCollections = brandFeeCollectionRepository.selectAllConfirmPaymetByLoiId(brandFeeCollection.getLoiFormId());
         brandFeeCollection.setApproverEmail(authEmail);
         brandFeeCollection.setPaymentStatus(feePaymentStatus);
         brandFeeCollection.setDescription(description);
-        double agreedBrandFee = loiForm.getAgreedBrandFees();
-        double totalBrandFeeCollection = brandFeeCollections.stream().mapToDouble(x -> x.getCollectedAmount()).sum() + brandFeeCollection.getCollectedAmount();
-        if (brandFeeCollection.getPaymentStatus().equals(FeePaymentStatus.REJECT)) {
-            loiFormService.sendPaymentStatusMailToLoiFormFilledBy(brandFeeCollection);
+        loiFormService.sendPaymentStatusMailToLoiFormFilledBy(brandFeeCollection);
-            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
-        } else {
-            loiFormService.sendPaymentStatusMailToLoiFormFilledBy(brandFeeCollection);
-            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-        }
-        if (agreedBrandFee == totalBrandFeeCollection && loiForm.getLoiSignOtp() != null) {
-            loiForm.setStatus(LoiStatus.PRE_ONBOARDING_DONE);
-            loiFormService.createPartnerOnboardingPanel(loiForm.getId());
-        }
         return "response";
+    }
     @RequestMapping(value = "/uploadDocumentForm", method = RequestMethod.GET)
     public String uploadDocumentForm(HttpServletRequest request, @RequestParam int loiId, Model model) throws ProfitMandiBusinessException {
         List<LoiDocMaster> activeDocMasterList = loiDocMasterList.getAllActiveDoc();
-        LoiForm loiForm = loiFormRepository.selectById(loiId);
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String authEmail = authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getEmailId();
         String approverEmail = "gaurav.sharma@smartdukaan.com";
         boolean isApprover = false;
         if (authEmail.equals(approverEmail)) {
             isApprover = true;
+        }
-        Map<Integer, LoiDoc> masterDocIdLoiDocMap = loiDocRepository.selectLoiFormId(loiId).stream().collect(Collectors.toMap(x -> x.getMasterDocId(), x -> x));
+        Map<Integer, LoiDoc> masterDocIdLoiDocMap = loiDocRepository.selectByLoiFormId(loiId).stream().collect(Collectors.toMap(x -> x.getMasterDocId(), x -> x));
         model.addAttribute("isApprover", isApprover);
         model.addAttribute("loiId", loiId);
         model.addAttribute("activeDocMasterList", activeDocMasterList);
         model.addAttribute("masterDocIdLoiDocMap", masterDocIdLoiDocMap);
         return "loiForm/document-upload";
+    }
     @RequestMapping(value = "/validateLoiOtp", method = RequestMethod.PUT)
     public String validateLoiAcceptanceOtp(@RequestParam int loiId, @RequestParam String provideOtp, Model model) throws Exception {
         LoiForm loiForm = loiFormRepository.selectById(loiId);
-        double agreedBrandFees = loiForm.getAgreedBrandFees();
-        double totalCollectfee = brandFeeCollectionRepository.selectAllByLoiFormId(loiId).stream().filter(x -> x.getPaymentStatus().equals(FeePaymentStatus.CONFIRM)).mapToDouble(x -> x.getCollectedAmount()).sum();
         String mobile = String.valueOf(loiForm.getMobile());
         Otp otp = otpRepository.selectAllByMobileWithTime(mobile).get(0);
         OTPResponse otpResponse = otpProcessor.validateOtp(otp.getId(), mobile, provideOtp);
-        if (!otpResponse.isResult()) {
-            throw new ProfitMandiBusinessException("Wrong OTP", provideOtp, "Your given Otp ->" + provideOtp + " is wrong , please check OTP and try again");
-        }
         if (otpResponse.isResult()) {
             loiForm.setLoiSignOtp(provideOtp);
             loiForm.setLoiSignedOn(LocalDateTime.now());
-            if (agreedBrandFees == totalCollectfee && loiForm.getLoiSignOtp() != null) {
-                loiForm.setStatus(LoiStatus.PRE_ONBOARDING_DONE);
-                loiFormService.createPartnerOnboardingPanel(loiId);
-            } else {
-                loiForm.setStatus(LoiStatus.LOI_SIGNED);
-            }
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+        } else {
+            throw new ProfitMandiBusinessException("Wrong OTP", "", "Your given Otp ->" + provideOtp + " is wrong , please check OTP and try again");
+        }
         return "response";
+    }
+    @RequestMapping(value = "/saveLoiDoc", method = RequestMethod.POST)
+    public String saveLoiDoc(@RequestParam int loiId, @RequestParam int loiDocId, Model model) throws Exception {
+        LOGGER.info("loi_docId-" + loiDocId);
+        LoiForm loiForm = loiFormRepository.selectById(loiId);
+        if (loiDocId > 0) {
+            loiForm.setLoiDoc(loiDocId);
+            loiFormService.sendSignedLoiPdfToPartner(loiForm);
+            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+        } else {
+            loiForm.setLoiSignOtp("");
+            loiForm.setLoiGeneratedOn(null);
+            loiForm.setLoiSignedOn(null);
+            model.addAttribute("response1", mvcResponseSender.createResponseString(false));
+        }
+        return "response";
+    }
     @RequestMapping(value = "/downloadLoiFromReport", method = RequestMethod.GET)
     public ResponseEntity<?> downloadAllLoiForm(@RequestParam LocalDate from, @RequestParam LocalDate to) throws Exception {
         ResponseEntity<?> responseEntity = loiFormService.createLoiFormReport(from, to);
         return responseEntity;
+    }
     @RequestMapping(value = "/updatePayment", method = RequestMethod.POST)
     public String updateForm(@RequestBody BrandFeeCollection brandFeeCollection, Model model) throws Exception {
         BrandFeeCollection brandFeeCollection1 = brandFeeCollectionRepository.selectById(brandFeeCollection.getId());
+        double totalConfirmPayment = brandFeeCollectionRepository.selectAllConfirmPaymetByLoiId(brandFeeCollection1.getLoiFormId()).stream().mapToDouble(x -> x.getCollectedAmount()).sum() + brandFeeCollection.getCollectedAmount();
+        double totalCollection = totalConfirmPayment + brandFeeCollection.getCollectedAmount();
+        LoiForm loiForm = loiFormRepository.selectById(brandFeeCollection1.getLoiFormId());
+        if (totalCollection <= loiForm.getAgreedBrandFees()) {
-        brandFeeCollection1.setFeeCollectingTimeStamp(brandFeeCollection.getFeeCollectingTimeStamp());
+            brandFeeCollection1.setFeeCollectingTimeStamp(brandFeeCollection.getFeeCollectingTimeStamp());
-        brandFeeCollection1.setCollectedAmount(brandFeeCollection.getCollectedAmount());
+            brandFeeCollection1.setCollectedAmount(brandFeeCollection.getCollectedAmount());
-        brandFeeCollection1.setPaymentReferenceNo(brandFeeCollection.getPaymentReferenceNo());
+            brandFeeCollection1.setPaymentReferenceNo(brandFeeCollection.getPaymentReferenceNo());
-        brandFeeCollection1.setPaymentMode(brandFeeCollection.getPaymentMode());
+            brandFeeCollection1.setPaymentMode(brandFeeCollection.getPaymentMode());
+            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+        } else {
+            double differanceAmount = loiForm.getAgreedBrandFees() - totalConfirmPayment;
-        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+            throw new ProfitMandiBusinessException("You need to add only due brand fee that is Only, " + differanceAmount + " INR", null, "Pay differance amount or less then differance amount");
+        }
         return "response";
+    }
     @RequestMapping(value = "/updateAgreedBrandFee", method = RequestMethod.PUT)
     public String updateAgreedBrandFee(HttpServletRequest request, @RequestParam int loiId, @RequestParam double brandFee, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         boolean isAgreedBrandFeeChanger = agreedBrandFeeChangerEmail.stream().anyMatch(x -> x.equals(loginDetails.getEmailId()));
         if (isAgreedBrandFeeChanger) {
             LoiForm loiForm = loiFormRepository.selectById(loiId);
             loiForm.setAgreedBrandFees(brandFee);
-            double totalCollectedPayment = brandFeeCollectionRepository.selectAllConfirmPaymetByLoiId(loiId).stream().mapToDouble(x -> x.getCollectedAmount()).sum();
-            double agreedBrandFee = loiForm.getAgreedBrandFees();
-            if (agreedBrandFee == totalCollectedPayment && loiForm.getLoiSignOtp() != null) {
-                loiForm.setStatus(LoiStatus.PRE_ONBOARDING_DONE);
-                loiFormService.createPartnerOnboardingPanel(loiId);
-            }
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             return "response";
         } else {
             throw new ProfitMandiBusinessException("failed in Authority check ", null, "Sorry " + authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getName() + " you have no authority to change agreed brand fee");
+        }
+    }
-    @RequestMapping(value = "/cancelLoi", method = RequestMethod.PUT)
+//    @RequestMapping(value = "/cancelLoi", method = RequestMethod.PUT)
-    public String loiCancellation(@RequestParam int loiId, Model model) throws Exception {
+//    public String loiCancellation(@RequestParam int loiId, Model model) throws Exception {
+//        LoiForm loiForm = loiFormRepository.selectById(loiId);
+//        loiForm.setStatus(LoiStatus.LOI_REJECT);
+//        loiForm.setLoiApproved(false);
+//        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+//        return "response";
+//    }
+    @RequestMapping(value = "/approve-reject-Loi", method = RequestMethod.PUT)
+    public String approveDetails(HttpServletRequest request, @RequestParam int loiId, @RequestParam boolean flag, Model model) throws Exception {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        String email = loginDetails.getEmailId();
         LoiForm loiForm = loiFormRepository.selectById(loiId);
+        AuthUser filledBy = authRepository.selectByEmailOrMobile(loiForm.getFilledBy());
+        AuthUser manager = authRepository.selectById(filledBy.getManagerId());
+        AuthUser upperManager = null;
+        List<String> approverMail = new ArrayList<>();
+        approverMail.add(manager.getEmailId());
+        upperManager = authRepository.selectById(manager.getManagerId());
+        approverMail.add(upperManager.getEmailId());
+        LOGGER.info("approverMail-" + approverMail);
+        // Approver - Manager or Upper manager of loi filledBy(BM)
+        boolean isApprover = approverMail.contains(email);
+        LOGGER.info("isApprover-" + isApprover);
+        List<String> authEmail = Arrays.asList("sm@smartdukaan.com", "tarun.verma@smartdukaan.com", "ashutosh.verma@smartdukaan.com");
+        boolean isAuthUser = authEmail.stream().anyMatch(x -> x.equals(email));
+        if (flag) {
+            if (isApprover || isAuthUser) {
+                loiForm.setLoiApprover(email);
+                loiForm.setLoiApproved(flag);
+                loiFormService.checkLoiDetailsCompletion(loiForm);
+                model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+            } else {
-        loiForm.setStatus(LoiStatus.LOI_CANCELLED);
+                throw new ProfitMandiBusinessException("Failed in Authority check ", "Read", "Sorry " + authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getName() + " you have no authority to Approve this Loi Form ,Only reporting manager and upper can Approve");
+            }
+        } else {
+            if (isApprover || isAuthUser) {
+                loiForm.setLoiApprover(email);
+                loiForm.setLoiApproved(flag);
+                loiForm.setStatus(LoiStatus.LOI_REJECT);
-        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+                model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+            } else {
+                throw new ProfitMandiBusinessException("Failed in Authority check ", "Read", "Sorry " + authRepository.selectByEmailOrMobile(loginDetails.getEmailId()).getName() + " you have no authority to Approve this Loi Form ,Only reporting manager and upper can Approve");
+            }
+        }
         return "response";
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java – Rev 33782 → 33845