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

 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.brandFee.BrandFee;
 import com.spice.profitmandi.dao.entity.brandFee.BrandFeeCollection;
 import com.spice.profitmandi.dao.entity.dtr.Otp;
+import com.spice.profitmandi.dao.entity.fofo.PaymentOption;
 import com.spice.profitmandi.dao.entity.onBoarding.*;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
+import com.spice.profitmandi.dao.enumuration.dtr.StoreTimeline;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.FeePaymentStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.LoiStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.StoreType;
 import com.spice.profitmandi.dao.model.LoiFormModel;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.dtr.DistrictMasterRepository;
 import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
 import com.spice.profitmandi.dao.repository.dtr.OtpRepository;
 import com.spice.profitmandi.dao.repository.dtr.PartnerOnBoardingPanelRepository;
+import com.spice.profitmandi.dao.repository.fofo.PaymentOptionRepository;
 import com.spice.profitmandi.dao.repository.inventory.PartnerOnboardingService;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.onboarding.*;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 import com.spice.profitmandi.dao.repository.user.BillingAddressRepository;
     PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
     @Autowired
     LoiAuditTrailRepository loiAuditTrailRepository;
     @Autowired
+    PaymentOptionRepository paymentOptionRepository;
+    @Autowired
     ResponseSender responseSender;
     List<String> agreedBrandFeeChangerEmail = Arrays.asList("sm@smartdukaan.com");
     // Loi Form
         List<AuthUser> abmHeadList = csService.getAuthUserIds(ProfitMandiConstants.TICKET_CATEGORY_ABM, Arrays.asList(EscalationType.L2, EscalationType.L3));
         List<AuthUser> abmList = csService.getAuthUserByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_ABM, EscalationType.L1);
         bdmList.addAll(abmList);
         stateHeadList.addAll(abmHeadList);
         List<BrandCommit> brandCommits = brandCommitRepository.selectAllActiveBrand();
+        List<PaymentOption> paperFinanceOptions = paymentOptionRepository.selectAllPaperFinanceOption();
         model.addAttribute("businessTypes", BusinessType.values());
         model.addAttribute("brandCommits", brandCommits);
         model.addAttribute("storeTypeFeePairs", storeTypeFeePairs);
         model.addAttribute("authUsersList", authUsersList);
         model.addAttribute("stateHeadList", stateHeadList);
         model.addAttribute("bdmList", bdmList);
+        model.addAttribute("paperFinanceOptions", paperFinanceOptions);
         return "loi-form";
+    }
     // use to validate GSTIN
     @RequestMapping(value = "/gstValidate", method = RequestMethod.GET)
         double differanceAmount = brandFee - totatcollectedfee;
         if (totatcollectedfee + brandFeeCollection.getCollectedAmount() <= brandFee) {
             brandFeeCollection.setPaymentStatus(FeePaymentStatus.PENDING);
             brandFeeCollection.setLoiFormId(loiId);
             brandFeeCollectionRepository.persist(brandFeeCollection);
-//            loiFormService.sentMailToPaymentApprover(brandFeeCollection, loiForm);
+            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");
+        }
         brandFeeCollection.setApproverEmail(authEmail);
         brandFeeCollection.setPaymentStatus(feePaymentStatus);
         brandFeeCollection.setDescription(description);
         brandFeeCollection.setApprovalTimeStamp(LocalDateTime.now());
         if (feePaymentStatus.equals(FeePaymentStatus.CONFIRM)) {
+            // Payment Approval timeline entry
+            storeTimelineTatService.createStoreTimeline(brandFeeCollection.getLoiFormId(), StoreTimeline.PAYMENT_APPROVAL);
             loiFormService.checkLoiDetailsCompletion(loiFormRepository.selectById(brandFeeCollection.getLoiFormId()));
+        }
         loiFormService.sendPaymentStatusMailToLoiFormFilledBy(brandFeeCollection);
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
         AuthUser auth = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
         LoiDoc loiDoc = loiDocRepository.selectByLoiIdAndMasterDocId(loiId, docMasterId);
         if (flag) {
             loiDoc.setOk(true);
             loiDoc.setVerifyBy(auth.getId());
+            // Document Approval timeline entry
+            storeTimelineTatService.createStoreTimeline(loiId, StoreTimeline.LOI_DOCUMENT_APPROVAL);
             model.addAttribute("response1", mvcResponseSender.createResponseString(loiDoc.getDocType() + " is Accepted "));
             return "response";
         } else {
             loiDoc.setOk(false);
             loiDoc.setVerifyBy(auth.getId());
+            LoiForm loiForm = loiFormRepository.selectById(loiId);
+            if (loiForm.isLoiApproved()) {
+                loiForm.setLoiApproved(false);
+            }
             loiFormService.sendDocRejectionMail(loiDoc);
             model.addAttribute("response1", mvcResponseSender.createResponseString(loiDoc.getDocType() + " is Rejected"));
             return "response";
+        }
+    }
         boolean isAuthUser = authEmail.stream().anyMatch(x -> x.equals(email));
         if (flag) {
             if (isApprover || isAuthUser) {
                 loiForm.setLoiApprover(email);
                 loiForm.setLoiApproved(flag);
+                if (loiForm.getStatus() == LoiStatus.LOI_REJECT) {
+                    loiForm.setStatus(LoiStatus.PENDING);
+                }
+                // BM Approval timeline entry
+                storeTimelineTatService.createStoreTimeline(loiId, StoreTimeline.BM_APPROVAL);
+                // Check if all LOI conditions are now met (BM approval could be the last step)
+                loiFormService.checkLoiDetailsCompletion(loiForm);
                 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");
+            }
         } else {

Subversion Repositories SmartDukaan

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