SmartDukaan – /

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

Rev 33657 – Oppo Vivo Samsung is now restricted to 5 imeis as ...

amit.gupta — Wed, 07 Aug 2024 12:51:37 +0530

amit.gupta – 1 file(s) modified
Oppo Vivo Samsung is now restricted to 5 imeis as per ageing

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

Rev 33656 – Fixed report

amit.gupta — Tue, 06 Aug 2024 17:41:15 +0530

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

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

Rev 33655 – collection remark is updated for rbml2 escalation mail is ...

ranu — Mon, 05 Aug 2024 18:50:20 +0530

ranu – 1 file(s) modified
collection remark is updated for rbml2 escalation mail is going multiple time

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

Rev 33654 – in tickets auth user added emp code last name also

ranu — Mon, 05 Aug 2024 12:38:13 +0530

ranu – 1 file(s) modified
in tickets auth user added emp code last name also

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

Rev 33653 – manager ticket assigned to added auth user last name and ...

ranu — Mon, 05 Aug 2024 12:36:39 +0530

ranu – 1 file(s) modified
manager ticket assigned to added auth user last name and emp code

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/managerTicket.vm

Rev 33652 – Fixed scheme

amit.gupta — Fri, 02 Aug 2024 20:20:36 +0530

amit.gupta – 2 file(s) modified
Fixed scheme

~ /trunk/profitmandi-fofo/src/main/resources/messages_en.properties
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm

Rev 33651 – Fixed mail sender

amit.gupta — Fri, 02 Aug 2024 20:15:24 +0530

amit.gupta – 1 file(s) modified
Fixed mail sender

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SchemePayoutReportModel.java

Rev 33650 – Fixed mail sender

amit.gupta — Fri, 02 Aug 2024 20:05:45 +0530

amit.gupta – 1 file(s) modified
Fixed mail sender

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm

Rev 33649 – fix table alignment bugs

tejus.lohani — Fri, 02 Aug 2024 20:05:00 +0530

tejus.lohani – 2 file(s) modified
fix table alignment bugs

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-service-row.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/finance-services.vm

Rev 33648 – remove self from referBy option

tejus.lohani — Fri, 02 Aug 2024 17:05:11 +0530

tejus.lohani – 1 file(s) modified
remove self from referBy option

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.vm

Rev 33647 – bug fix

tejus.lohani — Fri, 02 Aug 2024 17:01:46 +0530

tejus.lohani – 1 file(s) modified
bug fix

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-form.vm

Rev 33646 – Fixed Reports

amit.gupta — Fri, 02 Aug 2024 15:01:03 +0530

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

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

Rev 33645 – Fixed mail sender

amit.gupta — Fri, 02 Aug 2024 13:01:52 +0530

amit.gupta – 2 file(s) modified
Fixed mail sender

~ /trunk/profitmandi-fofo/src/main/resources/message_en.properties
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm

Rev 33644 – Fixed mail sender

amit.gupta — Thu, 01 Aug 2024 19:20:54 +0530

amit.gupta – 1 file(s) modified
Fixed mail sender

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

Rev 33643 – Fixed changes regarding credit

amit.gupta — Thu, 01 Aug 2024 19:04:08 +0530

amit.gupta – 1 file(s) modified
Fixed changes regarding credit

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

Rev 33642 – Fixed mail sender

amit.gupta — Thu, 01 Aug 2024 14:41:33 +0530

amit.gupta – 1 file(s) modified
Fixed mail sender

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction-detail.vm

Rev 33641 – Fixed mail sender

amit.gupta — Thu, 01 Aug 2024 14:31:19 +0530

amit.gupta – 1 file(s) modified
Fixed mail sender

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

Rev 33640 – Fixed changes regarding credit

amit.gupta — Thu, 01 Aug 2024 02:36:40 +0530

amit.gupta – 1 file(s) modified
Fixed changes regarding credit

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

Rev 33639 – Fixed changes regarding credit

amit.gupta — Wed, 31 Jul 2024 18:55:56 +0530

amit.gupta – 1 file(s) modified
Fixed changes regarding credit

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

Rev 33638 – Fixed changes regarding credit

amit.gupta — Wed, 31 Jul 2024 18:54:58 +0530

amit.gupta – 1 file(s) modified
Fixed changes regarding credit

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

Rev 33637 – correct praveen sharma emailId on partner problem alert

tejus.lohani — Wed, 31 Jul 2024 18:38:31 +0530

tejus.lohani – 1 file(s) modified
correct praveen sharma emailId on partner problem alert

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ServiceConfigServiceImpl.java

Rev 33636 – correct tarun verma email for pending loi tab table

tejus.lohani — Wed, 31 Jul 2024 14:59:01 +0530

tejus.lohani – 1 file(s) modified
correct tarun verma email for pending loi tab table

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

Rev 33635 – Fixed gst auth token caching issue

amit.gupta — Wed, 31 Jul 2024 11:21:47 +0530

amit.gupta – 3 file(s) modified
Fixed gst auth token caching issue

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java

Rev 33634 – Fixed rollback

amit.gupta — Tue, 30 Jul 2024 17:29:39 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

Rev 33633 – Changed to 25/50

amit.gupta — Tue, 30 Jul 2024 12:53:40 +0530

amit.gupta – 1 file(s) modified
Changed to 25/50

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