SmartDukaan – /

Rev 34047 – create po only if status is update like, HOD , ...

tejus.lohani — Wed, 11 Dec 2024 17:04:08 +0530

tejus.lohani – 2 file(s) modified
create po only if status is update like, HOD , FAST MOVING , etc present , if not then first add update that item then able to create po of that item

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js

Rev 34046 – Added Data table

aman.kumar — Wed, 11 Dec 2024 16:59:52 +0530

aman.kumar – 4 file(s) modified
Added Data table

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/account-statement-list.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement.vm

Rev 34045 – Fixed lead

amit.gupta — Wed, 11 Dec 2024 12:27:09 +0530

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

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

Rev 34044 – Changed int to string in FCM payloads

vikas.jangra — Mon, 09 Dec 2024 18:40:08 +0530

vikas.jangra – 1 file(s) modified
Changed int to string in FCM payloads

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

Rev 34043 – Changed input stream

vikas.jangra — Mon, 09 Dec 2024 18:32:51 +0530

vikas.jangra – 1 file(s) modified
Changed input stream

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

Rev 34042 – Changed input stream

vikas.jangra — Mon, 09 Dec 2024 18:26:22 +0530

vikas.jangra – 1 file(s) modified
Changed input stream

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

Rev 34041 – Added service-account.json

vikas.jangra — Mon, 09 Dec 2024 17:22:16 +0530

vikas.jangra – 1 file(s) modified
Added service-account.json

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

Rev 34040 – Added service-account.json

vikas.jangra — Mon, 09 Dec 2024 17:21:06 +0530

vikas.jangra – 1 file(s) modified
Added service-account.json

+ /trunk/profitmandi-cron/src/main/resources/service-account.json

Rev 34039 – Resolved push notifications

vikas.jangra — Mon, 09 Dec 2024 17:04:26 +0530

vikas.jangra – 2 file(s) modified
Resolved push notifications

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

Rev 34038 – Fixed enum equals

amit.gupta — Fri, 06 Dec 2024 20:09:56 +0530

amit.gupta – 1 file(s) modified
Fixed enum equals

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

Rev 34037 – Fixed logic to get mapped partner type.

amit.gupta — Fri, 06 Dec 2024 20:09:31 +0530

amit.gupta – 3 file(s) modified
Fixed logic to get mapped partner type.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

Rev 34036 – aging and smart cart instead of focused model

ranu — Fri, 06 Dec 2024 17:52:50 +0530

ranu – 1 file(s) modified
aging and smart cart instead of focused model

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

Rev 34035 – aging and smart cart instead of focused model

ranu — Fri, 06 Dec 2024 17:44:20 +0530

ranu – 13 file(s) modified
aging and smart cart instead of focused model

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/BrandAgeingLimit.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/SaholicInventoryCIS.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/AgeingServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/CatalogAgingModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PartnerWarehouseStockAgingSummaryModel.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PartnerWarehouseStockSummaryModel.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/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm

Rev 34034 – fix no value present

ranu — Wed, 04 Dec 2024 19:37:33 +0530

ranu – 1 file(s) modified
fix no value present

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

Rev 34033 – Fixed lead

amit.gupta — Wed, 04 Dec 2024 17:44:38 +0530

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

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

Rev 34032 – Fixed lead

amit.gupta — Wed, 04 Dec 2024 17:42:46 +0530

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

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

Rev 34031 – Fixed lead

amit.gupta — Wed, 04 Dec 2024 17:04:59 +0530

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

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

Rev 34030 – brandwise partner type js error fix

ranu — Wed, 04 Dec 2024 16:10:04 +0530

ranu – 1 file(s) modified
brandwise partner type js error fix

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-brandwise-detail.js

Rev 34029 – application java commit for target persitance

ranu — Wed, 04 Dec 2024 15:34:18 +0530

ranu – 1 file(s) modified
application java commit for target persitance

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

Rev 34028 – fix target exception

ranu — Wed, 04 Dec 2024 15:33:18 +0530

ranu – 1 file(s) modified
fix target exception

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

Rev 34027 – partner health access given to shahid

ranu — Wed, 04 Dec 2024 12:13:38 +0530

ranu – 1 file(s) modified
partner health access given to shahid

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

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

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.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/RetailerController.java

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