SmartDukaan – /

Rev 33926 – mtd and today target data query correction

ranu — Thu, 14 Nov 2024 12:32:48 +0530

ranu – 5 file(s) modified
mtd and today target data query correction

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/RbmTargets.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmTargetsRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmTargetsRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

Rev 33925 – mtd and today target data query correction

ranu — Wed, 13 Nov 2024 19:08:04 +0530

ranu – 2 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm

Rev 33924 – mtd and today target data query correction

ranu — Wed, 13 Nov 2024 19:04:01 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33923 – mtd and today target data query correction

ranu — Wed, 13 Nov 2024 18:02:08 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33922 – mtd and today target data query correction

ranu — Wed, 13 Nov 2024 18:00:58 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33921 – mtd and today target data query correction

ranu — Wed, 13 Nov 2024 17:55:15 +0530

ranu – 1 file(s) modified
mtd and today target data query correction

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

Rev 33920 – mtd and today target data query correction

ranu — Wed, 13 Nov 2024 17:52:27 +0530

ranu – 2 file(s) modified
mtd and today target data query correction

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

Rev 33919 – DMC panel suggestion value bug fix Tem/Low code

tejus.lohani — Wed, 13 Nov 2024 15:00:50 +0530

tejus.lohani – 1 file(s) modified
DMC panel suggestion value bug fix Tem/Low code

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-dealer-mapping-index.vm

Rev 33918 – Added PB

amit.gupta — Wed, 13 Nov 2024 14:58:44 +0530

amit.gupta – 1 file(s) modified
Added PB

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 33917 – rbm arr phase one updated

ranu — Wed, 13 Nov 2024 12:27:24 +0530

ranu – 13 file(s) modified
rbm arr phase one updated

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MTDAchievedTargetModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmArrViewModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayAchievedMovementModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseMobileStockByMovementModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseRbmTargetModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.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/LeadController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm

Rev 33916 – Fixed Combo

amit.gupta — Wed, 13 Nov 2024 10:23:42 +0530

amit.gupta – 3 file(s) modified
Fixed Combo

Rev 33915 – DMC code loading performance delay time fix , now It's ...

tejus.lohani — Tue, 12 Nov 2024 22:57:36 +0530

tejus.lohani – 1 file(s) modified
DMC code loading performance delay time fix , now It's faster then previous

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

Rev 33914 – categorised catalog handle single result

ranu — Fri, 08 Nov 2024 15:44:59 +0530

ranu – 1 file(s) modified
categorised catalog handle single result

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

Rev 33913 – uncomment line-205 , send mail to payment approver

tejus.lohani — Wed, 06 Nov 2024 11:04:38 +0530

tejus.lohani – 1 file(s) modified
uncomment line-205 , send mail to payment approver

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

Rev 33912 – On verification complete bug fix

tejus.lohani — Tue, 05 Nov 2024 17:56:11 +0530

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java

Rev 33911 – Fixed changes to dispatch related email. changed to toArray.

amit.gupta — Tue, 05 Nov 2024 16:17:15 +0530

amit.gupta – 1 file(s) modified
Fixed changes to dispatch related email. changed to toArray.

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

Rev 33910 – Fixed logistcs changes

amit.gupta — Tue, 05 Nov 2024 13:45:39 +0530

amit.gupta – 6 file(s) modified
Fixed logistcs changes

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/dao/config/WebDBContextConfigure.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/indent.js

Rev 33909 – add fin code field in loi-form , now if partner ...

tejus.lohani — Tue, 05 Nov 2024 11:21:46 +0530

tejus.lohani – 8 file(s) modified
add fin code field in loi-form , now if partner have finCode then sale team can collect fin code

~ /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/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm

Rev 33908 – DMS(WOD CODE) code panal changes ,give feature like update ...

tejus.lohani — Mon, 04 Nov 2024 13:05:32 +0530

tejus.lohani – 12 file(s) modified
DMS(WOD CODE) code panal changes ,give feature like update brand commitments detail and submit dealer code and start with temporary code option code like - TEMPCODE , LOWCODE

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/onBoarding/BrandCommit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerPositionRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PartnerPositionRepositoryImpl.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/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/nocRequiredUploadForm.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-dealer-mapping-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-dealer-mapping.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wod-fin-mapping-report.vm

Rev 33907 – Fixed case when no offers are running

amit.gupta — Mon, 04 Nov 2024 12:19:54 +0530

amit.gupta – 1 file(s) modified
Fixed case when no offers are running

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

Rev 33906 – sanction request updated

ranu — Wed, 30 Oct 2024 17:55:32 +0530

ranu – 1 file(s) modified
sanction request updated

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm

Rev 33905 – sanction updated

ranu — Wed, 30 Oct 2024 17:52:50 +0530

ranu – 1 file(s) modified
sanction updated

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm

Rev 33904 – Reset limit

amit.gupta — Wed, 30 Oct 2024 16:34:23 +0530

amit.gupta – 2 file(s) modified
Reset limit

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

Rev 33903 – Reset hard limits

amit.gupta — Wed, 30 Oct 2024 16:32:56 +0530

amit.gupta – 4 file(s) modified
Reset hard limits

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SDCreditRequirementRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SDCreditRequirementRepositoryImpl.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

Rev 33902 – sanction reequest approval editing to kamini sharma

ranu — Wed, 30 Oct 2024 15:00:22 +0530

ranu – 1 file(s) modified
sanction reequest approval editing to kamini sharma

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sanction-request-row.vm

Rev 33901 – qty changed of gift series

ranu — Tue, 29 Oct 2024 15:04:10 +0530

ranu – 1 file(s) modified
qty changed of gift series

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

Rev 33900 – Added changes

amit.gupta — Tue, 29 Oct 2024 14:55:26 +0530

amit.gupta – 2 file(s) modified
Added changes

~ /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

Rev 33899 – scratched code updated price range condition

ranu — Tue, 29 Oct 2024 14:42:09 +0530

ranu – 1 file(s) modified
scratched code updated price range condition

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

Rev 33898 – Fixed missing peice

amit.gupta — Tue, 29 Oct 2024 13:24:17 +0530

amit.gupta – 1 file(s) modified
Fixed missing peice

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

Rev 33897 – updated scract logic

ranu — Tue, 29 Oct 2024 13:12:37 +0530

ranu – 1 file(s) modified
updated scract logic

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

Rev 33896 – scratch gift physical

ranu — Tue, 29 Oct 2024 11:45:49 +0530

ranu – 1 file(s) modified
scratch gift physical

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

Rev 33895 – scratch offer for diwali

ranu — Mon, 28 Oct 2024 16:13:10 +0530

ranu – 4 file(s) modified
scratch offer for diwali

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

Rev 33894 – hardLimit reset value and button bug fix

tejus.lohani — Fri, 25 Oct 2024 18:13:30 +0530

tejus.lohani – 1 file(s) modified
hardLimit reset value and button bug fix

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

Rev 33893 – update ui point

ranu — Thu, 24 Oct 2024 13:00:11 +0530

ranu – 2 file(s) modified
update ui point

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CategorisedCatalog.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog-list.vm

Rev 33892 – add manish singh in mapping status to manage finance mapping

tejus.lohani — Thu, 24 Oct 2024 11:12:18 +0530

tejus.lohani – 1 file(s) modified
add manish singh in mapping status to manage finance mapping

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

Rev 33891 – Add to fetch and upload aadhar back for onboading , ...

tejus.lohani — Thu, 24 Oct 2024 10:40:06 +0530

tejus.lohani – 10 file(s) modified
Add to fetch and upload aadhar back for onboading , now need to upload aadhar back in loi form

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreatePartnerOnBoardingPanel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.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/controller/PartnerOnBoardingPanelController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/panel-listing.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-legal-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-legal-row-index.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm

Rev 33890 – categorisation spelling correct

ranu — Wed, 23 Oct 2024 20:07:06 +0530

ranu – 1 file(s) modified
categorisation spelling correct

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

Rev 33889 – app config update

ranu — Wed, 23 Oct 2024 19:04:35 +0530

ranu – 1 file(s) modified
app config update

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java

Rev 33888 – sku movement code phase one

ranu — Wed, 23 Oct 2024 18:34:49 +0530

ranu – 14 file(s) modified
sku movement code phase one

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/CategorisedCatalog.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/CatalogMovingEnum.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CategorisedCatalogListModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorisedCatalogRepository.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorisedCatalogRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog-list.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catagorised-catalog.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-movement-history.vm

Rev 33887 – show only active commitment brands as pending other is NA ...

tejus.lohani — Wed, 23 Oct 2024 12:40:33 +0530

tejus.lohani – 5 file(s) modified
show only active commitment brands as pending other is NA in wod section at wod-fin-mapping report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerOnBoardingPanel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WodFinMappingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ServiceConfigContoller.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wod-fin-mapping-report.vm