SmartDukaan – /

Rev 34026 – gst status alert ,active or not

tejus.lohani — Tue, 03 Dec 2024 14:35:06 +0530

tejus.lohani – 2 file(s) modified
gst status alert ,active or not

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/loi-form.vm

Rev 34025 – wod mapping check bug fix

tejus.lohani — Mon, 02 Dec 2024 18:48:09 +0530

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

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

Rev 34024 – Handle Grouping in Solr

vikas.jangra — Mon, 02 Dec 2024 17:52:48 +0530

vikas.jangra – 2 file(s) modified
Handle Grouping in Solr

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

Rev 34023 – Handle Grouping in Solr

vikas.jangra — Mon, 02 Dec 2024 17:51:35 +0530

vikas.jangra – 4 file(s) modified
Handle Grouping in Solr

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/edit.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/index.vm

Rev 34022 – retailer brand opening show code also in ui

ranu — Mon, 02 Dec 2024 14:56:21 +0530

ranu – 1 file(s) modified
retailer brand opening show code also in ui

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-block-brand.vm

Rev 34021 – removed reportico dependency from super catalog

ranu — Mon, 02 Dec 2024 10:34:51 +0530

ranu – 4 file(s) modified
removed reportico dependency from super catalog

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/SaholicInventoryServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/index.vm

Rev 34020 – ui fix

tejus.lohani — Sat, 30 Nov 2024 16:37:14 +0530

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

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

Rev 34019 – change version 257 to 258

tejus.lohani — Sat, 30 Nov 2024 11:58:03 +0530

tejus.lohani – 1 file(s) modified
change version 257 to 258

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

Rev 34018 – purchase sele ratio further detail like model aging , on ...

tejus.lohani — Sat, 30 Nov 2024 11:57:18 +0530

tejus.lohani – 13 file(s) modified
purchase sele ratio further detail like model aging , on the click of catalog chart click

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/CatalogAgedModel.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/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis/purchase-sale-panel.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis/catalog-age-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis/purchase-sale-ratio-panel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm

Rev 34017 – Special Price imei

amit.gupta — Fri, 29 Nov 2024 18:14:17 +0530

amit.gupta – 1 file(s) modified
Special Price imei

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

Rev 34016 – Fixed migration

amit.gupta — Fri, 29 Nov 2024 17:47:37 +0530

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

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

Rev 34015 – Added to fund wallet for

amit.gupta — Fri, 29 Nov 2024 17:38:34 +0530

amit.gupta – 1 file(s) modified
Added to fund wallet for

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

Rev 34014 – Added telemarketer in Otp

amit.gupta — Fri, 29 Nov 2024 16:43:02 +0530

amit.gupta – 1 file(s) modified
Added telemarketer in Otp

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

Rev 34013 – purchase sele ratio chart data fix

tejus.lohani — Fri, 29 Nov 2024 12:24:46 +0530

tejus.lohani – 3 file(s) modified
purchase sele ratio chart data fix

Rev 34012 – code commited for rbm achieved

ranu — Thu, 28 Nov 2024 16:22:12 +0530

ranu – 1 file(s) modified
code commited for rbm achieved

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

Rev 34011 – bug fix in wallet statement report

tejus.lohani — Thu, 28 Nov 2024 15:49:12 +0530

tejus.lohani – 3 file(s) modified
bug fix in wallet statement report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm

Rev 34010 – Fixed Super Catalog Delete bug

vikas.jangra — Thu, 28 Nov 2024 15:26:03 +0530

vikas.jangra – 5 file(s) modified
Fixed Super Catalog Delete bug

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SuperCatalogMappingRepositoryImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SuperCatalogController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/edit.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog/super/index.vm

Rev 34009 – now fetch pur-sale ratio report on the change of period ...

tejus.lohani — Thu, 28 Nov 2024 11:52:51 +0530

tejus.lohani – 5 file(s) modified
now fetch pur-sale ratio report on the change of period also

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.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/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis/purchase-sale-panel.js

Rev 34008 – wod code check api code improvement

tejus.lohani — Thu, 28 Nov 2024 11:40:38 +0530

tejus.lohani – 1 file(s) modified
wod code check api code improvement

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

Rev 34007 – Bypassed Laon constraint

amit.gupta — Wed, 27 Nov 2024 19:58:52 +0530

amit.gupta – 1 file(s) modified
Bypassed Laon constraint

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

Rev 34006 – float value change

ranu — Wed, 27 Nov 2024 17:42:11 +0530

ranu – 5 file(s) modified
float value change

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/RbmAchievements.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/RbmTargets.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmTargetAndAchievementsModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmTargetsModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java

Rev 34005 – float value change

ranu — Wed, 27 Nov 2024 17:17:14 +0530

ranu – 1 file(s) modified
float value change

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

Rev 34004 – code updated for filter data of rbm targets

ranu — Wed, 27 Nov 2024 16:42:20 +0530

ranu – 1 file(s) modified
code updated for filter data of rbm targets

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

Rev 34003 – code updated for filter data of rbm targets

ranu — Wed, 27 Nov 2024 16:39:34 +0530

ranu – 2 file(s) modified
code updated for filter data of rbm targets

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

Rev 34002 – rbm_targets filter for data

ranu — Wed, 27 Nov 2024 13:51:18 +0530

ranu – 8 file(s) modified
rbm_targets filter for data

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmAchievementsModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmTargetsModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmAchievementsRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmAchievementsRepositoryImpl.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/RbmTargetServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 34001 – Fixed Catalogs

vikas.jangra — Wed, 27 Nov 2024 13:47:37 +0530

vikas.jangra – 1 file(s) modified
Fixed Catalogs

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

Rev 34000 – rbm_targets filter commented as of now

ranu — Wed, 27 Nov 2024 12:22:03 +0530

ranu – 1 file(s) modified
rbm_targets filter commented as of now

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

Rev 33999 – bug fix -offer payout report

tejus.lohani — Wed, 27 Nov 2024 12:01:15 +0530

tejus.lohani – 5 file(s) modified
bug fix -offer payout report

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java

Rev 33998 – Fixed Duplicate GRNs

vikas.jangra — Wed, 27 Nov 2024 10:42:14 +0530

vikas.jangra – 1 file(s) modified
Fixed Duplicate GRNs

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

Rev 33997 – rbm_targets filter

ranu — Tue, 26 Nov 2024 16:16:49 +0530

ranu – 9 file(s) modified
rbm_targets filter

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmTargetAndAchievementsModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmAchievementsRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/RbmAchievementsRepositoryImpl.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/controller/monitors/MonitorController.java
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-target-achievement.vm
~ /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_rbm.vm

Rev 33996 – Fix Access Management UI

vikas.jangra — Tue, 26 Nov 2024 15:00:06 +0530

vikas.jangra – 1 file(s) modified
Fix Access Management UI

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

Rev 33995 – Fix Access Management, Purchase, Partner Dashboard UI Update

vikas.jangra — Tue, 26 Nov 2024 13:44:02 +0530

vikas.jangra – 5 file(s) modified
Fix Access Management, Purchase, Partner Dashboard UI Update

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/access-management.js
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-total-income.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm

Rev 33994 – Fixed migration

amit.gupta — Mon, 25 Nov 2024 20:42:25 +0530

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

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

Rev 33993 – now ValidateEvent is ON , now all will Blocker Active

tejus.lohani — Mon, 25 Nov 2024 20:05:15 +0530

tejus.lohani – 1 file(s) modified
now ValidateEvent is ON , now all will Blocker Active

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

Rev 33992 – download row data of sold catalogs

ranu — Mon, 25 Nov 2024 20:02:17 +0530

ranu – 2 file(s) modified
download row data of sold catalogs

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm

Rev 33991 – download row data of sold catalogs

ranu — Mon, 25 Nov 2024 19:57:46 +0530

ranu – 6 file(s) modified
download row data of sold catalogs

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SoldCatalogsReportModel.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/controller/monitors/MonitorController.java
~ /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_rbm.vm

Rev 33990 – Purchase sale ratio graph related files

tejus.lohani — Sat, 23 Nov 2024 11:03:52 +0530

tejus.lohani – 27 file(s) modified
Purchase sale ratio graph related files

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.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/purchaseSaleRatio
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/BrandWiseSupplier.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/CatalogPurchaseSaleModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/PurchaseSaleQuantity.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.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/RetailerController.java
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis
+ /trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis/purchase-sale-panel.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis/purchase-sale-ratio-panel.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bar_chart.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-wise-mobile-lmp-chart.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-wise-mobile-lms-chart.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/investmentdetails.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lmsLineChart.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-health.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price_drop_chart.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase_chart.vm

Rev 33989 – rbm achievemnts data correction

ranu — Fri, 22 Nov 2024 18:00:16 +0530

ranu – 1 file(s) modified
rbm achievemnts data correction

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

Rev 33988 – now old chart.min.js chart use as chart1 instead of chart ...

tejus.lohani — Fri, 22 Nov 2024 17:44:53 +0530

tejus.lohani – 1 file(s) modified
now old chart.min.js chart use as chart1 instead of chart , and now chart.js chart use as chart

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

Rev 33987 – cron set for rbm achievemnets

ranu — Fri, 22 Nov 2024 16:35:12 +0530

ranu – 1 file(s) modified
cron set for rbm achievemnets

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