SmartDukaan – /

Rev 33697 – Fixed issue related to circular dependency

amit.gupta — Fri, 23 Aug 2024 12:28:06 +0530

amit.gupta – 2 file(s) modified
Fixed issue related to circular dependency

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

Rev 33696 – Added changes related to Narration and fixing loan creation while ...

amit.gupta — Fri, 23 Aug 2024 10:33:02 +0530

amit.gupta – 9 file(s) modified
Added changes related to Narration and fixing loan creation while billing

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WalletReferenceType.java

Rev 33695 – Fixed NPE issue with eligible Slab

amit.gupta — Thu, 22 Aug 2024 12:45:00 +0530

amit.gupta – 1 file(s) modified
Fixed NPE issue with eligible Slab

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 33694 – razorpay payment service for refrence

ranu — Wed, 21 Aug 2024 11:58:40 +0530

ranu – 1 file(s) modified
razorpay payment service for refrence

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/RazorpayPaymentService.java

Rev 33693 – webhook upload for call back paymnet

ranu — Wed, 21 Aug 2024 11:38:07 +0530

ranu – 2 file(s) modified
webhook upload for call back paymnet

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/WebConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 33692 – Fixed sanction related bug

amit.gupta — Wed, 21 Aug 2024 11:13:13 +0530

amit.gupta – 1 file(s) modified
Fixed sanction related bug

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33691 – Fixed wrong interest settlement

amit.gupta — Wed, 21 Aug 2024 10:45:01 +0530

amit.gupta – 1 file(s) modified
Fixed wrong interest settlement

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33690 – Patching

amit.gupta — Wed, 21 Aug 2024 07:42:09 +0530

amit.gupta – 1 file(s) modified
Patching

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33689 – code commited webhook signature

ranu — Tue, 20 Aug 2024 18:45:56 +0530

ranu – 1 file(s) modified
code commited webhook signature

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 33688 – code update for webhook controller

ranu — Tue, 20 Aug 2024 18:04:08 +0530

ranu – 2 file(s) modified
code update for webhook controller

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/RazorpayPaymentService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 33687 – Fixed wallet

amit.gupta — Tue, 20 Aug 2024 17:50:09 +0530

amit.gupta – 1 file(s) modified
Fixed wallet

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java

Rev 33686 – code commit for webhook call

ranu — Tue, 20 Aug 2024 17:31:59 +0530

ranu – 1 file(s) modified
code commit for webhook call

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 33685 – Fixed investment

amit.gupta — Tue, 20 Aug 2024 16:56:38 +0530

amit.gupta – 1 file(s) modified
Fixed investment

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java

Rev 33684 – webhook modification

ranu — Tue, 20 Aug 2024 16:25:38 +0530

ranu – 2 file(s) modified
webhook modification

Rev 33683 – payment link model update

ranu — Tue, 20 Aug 2024 15:43:36 +0530

ranu – 1 file(s) modified
payment link model update

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PaymentLinkDetailModel.java

Rev 33682 – code commit for razor pay payment status callback method get ...

ranu — Tue, 20 Aug 2024 15:36:57 +0530

ranu – 2 file(s) modified
code commit for razor pay payment status callback method get to post

Rev 33681 – Fixed cancellation

amit.gupta — Tue, 20 Aug 2024 13:18:27 +0530

amit.gupta – 1 file(s) modified
Fixed cancellation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/oneassist/model/CancelPlanResponseModel.java

Rev 33680 – only scratched coupon count consider

ranu — Tue, 20 Aug 2024 13:07:45 +0530

ranu – 1 file(s) modified
only scratched coupon count consider

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ScratchOffer.java

Rev 33679 – code commit for set offer end date of scratch

ranu — Tue, 20 Aug 2024 12:23:37 +0530

ranu – 2 file(s) modified
code commit for set offer end date of scratch

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 33678 – code commit for scract expired time

ranu — Tue, 20 Aug 2024 12:22:44 +0530

ranu – 1 file(s) modified
code commit for scract expired time

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 33677 – ew only for less than 35000

ranu — Mon, 19 Aug 2024 21:18:33 +0530

ranu – 1 file(s) modified
ew only for less than 35000

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 33676 – code commited for webhook

ranu — Mon, 19 Aug 2024 15:46:32 +0530

ranu – 3 file(s) modified
code commited for webhook

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/UpsellRazorpayPaymentStatus.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpsellRazorpayPaymentStatusRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/UpSellRazorpayPaymentStatusRepositoryImpl.java

Rev 33675 – upsale order repo remove

ranu — Mon, 19 Aug 2024 15:43:41 +0530

ranu – 1 file(s) modified
upsale order repo remove

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 33674 – ew only send less then 35000 for scratch offer

ranu — Mon, 19 Aug 2024 15:36:29 +0530

ranu – 1 file(s) modified
ew only send less then 35000 for scratch offer

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 33673 – Fixed settlement

amit.gupta — Sat, 17 Aug 2024 14:49:34 +0530

amit.gupta – 1 file(s) modified
Fixed settlement

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33672 – update upsell payment webhook

ranu — Fri, 16 Aug 2024 19:46:57 +0530

ranu – 1 file(s) modified
update upsell payment webhook

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java

Rev 33671 – Added Pricedrop based deduction

amit.gupta — Fri, 16 Aug 2024 13:35:31 +0530

amit.gupta – 1 file(s) modified
Added Pricedrop based deduction

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java

Rev 33670 – Fixed

amit.gupta — Fri, 16 Aug 2024 13:08:44 +0530

amit.gupta – 1 file(s) modified
Fixed

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.java

Rev 33669 – add ashutosh to view pendingForm

tejus.lohani — Wed, 14 Aug 2024 18:48:24 +0530

tejus.lohani – 1 file(s) modified
add ashutosh to view pendingForm

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java

Rev 33668 – Fixed loan

amit.gupta — Wed, 14 Aug 2024 12:22:28 +0530

amit.gupta – 1 file(s) modified
Fixed loan

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java

Rev 33667 – scratchedt unlocked at creation time

ranu — Wed, 14 Aug 2024 12:07:02 +0530

ranu – 1 file(s) modified
scratchedt unlocked at creation time

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 33666 – scratch expired time will be valid till that day

ranu — Wed, 14 Aug 2024 11:30:13 +0530

ranu – 2 file(s) modified
scratch expired time will be valid till that day

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java

Rev 33665 – code commited for scratch offer 15 august 2024

ranu — Tue, 13 Aug 2024 20:02:12 +0530

ranu – 8 file(s) modified
code commited for scratch offer 15 august 2024

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/dtr/ScratchOffer.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/ScratchedGift.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/RandomCollection.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ScratchedGiftService.java

Rev 33664 – Fixed changes regarding Loan Credit days

amit.gupta — Mon, 12 Aug 2024 16:34:09 +0530

amit.gupta – 1 file(s) modified
Fixed changes regarding Loan Credit days

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 33663 – Added Loan related improvements

amit.gupta — Mon, 12 Aug 2024 15:12:46 +0530

amit.gupta – 8 file(s) modified
Added Loan related improvements

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 33662 – Fixed changes related to Offer duplicate payout

amit.gupta — Mon, 12 Aug 2024 15:00:43 +0530

amit.gupta – 1 file(s) modified
Fixed changes related to Offer duplicate payout

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 33661 – suggested po and upsell js with include script commit

ranu — Mon, 12 Aug 2024 11:38:45 +0530

ranu – 2 file(s) modified
suggested po and upsell js with include script commit

+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/suggested-monthly-po.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm

Rev 33660 – Added Pricedrop based deduction

amit.gupta — Sat, 10 Aug 2024 17:57:04 +0530

amit.gupta – 1 file(s) modified
Added Pricedrop based deduction

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js

Rev 33659 – make Follow Up Brand mail to followup from Brand , ...

tejus.lohani — Thu, 08 Aug 2024 19:29:48 +0530

tejus.lohani – 3 file(s) modified
make Follow Up Brand mail to followup from Brand , add praveen sharma emailId in this mail also

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/BrandWiseFollowUpRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/BrandWiseFollowUpRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java

Rev 33658 – implement loi update feature and payment update feature , improve ...

tejus.lohani — Thu, 08 Aug 2024 10:23:17 +0530

tejus.lohani – 32 file(s) modified
implement loi update feature and payment update feature , improve code , fix some bugs ,

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/brandFee/BrandFeeCollection.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/BillingAddress.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/BrandCommit.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiBrandCommitment.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiDoc.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiForm.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFormData.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/LoiFormReportModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/hdfc/BrandCommitmentModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LoiFormModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeCollectionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/brandFee/BrandFeeCollectionRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/BrandCommitRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/BrandCommitRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiBrandCommitmentRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/onboarding/LoiDocsRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/BillingAddressRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/BillingAddressRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/LoiFormRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/onboarding-form.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loiForm/update-loiForm.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/payment-collection-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm