SmartDukaan – /

Rev 34060 – provider status change feature, create Warehouse rider and provider mapping ...

tejus.lohani — Wed, 18 Dec 2024 16:03:48 +0530

tejus.lohani – 22 file(s) modified
provider status change feature, create Warehouse rider and provider mapping feature in logistics menu

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/WarehouseRider.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/ProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/ProviderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseProviderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseProviderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseRiderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/logistics/WarehouseRiderRepositoryImpl.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/LogisticsController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider
+ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/logistics.js
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider/provider-panel.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider/warehouse-providers.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_rider
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_rider/warehouse-rider-panel.vm
+ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_rider/warehouse-rider.vm

Rev 34059 – upsale given brand name

ranu — Tue, 17 Dec 2024 13:31:20 +0530

ranu – 1 file(s) modified
upsale given brand name

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/up-sale-call.vm

Rev 34058 – 15 days old sold aging model comiited

ranu — Mon, 16 Dec 2024 17:44:18 +0530

ranu – 1 file(s) modified
15 days old sold aging model comiited

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

Rev 34057 – table filer remove

tejus.lohani — Mon, 16 Dec 2024 16:28:20 +0530

tejus.lohani – 1 file(s) modified
table filer remove

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

Rev 34056 – 15 days old sold aging model comiited

ranu — Mon, 16 Dec 2024 16:15:12 +0530

ranu – 2 file(s) modified
15 days old sold aging model comiited

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

Rev 34055 – 15 days old sold aging model comiited

ranu — Mon, 16 Dec 2024 16:10:02 +0530

ranu – 9 file(s) modified
15 days old sold aging model comiited

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/Our15DaysOldAgingStock.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/Sold15daysOldAgingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayAchievedMovementModel.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/LeadController.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 34054 – add one dummy data for view , if no any ...

tejus.lohani — Fri, 13 Dec 2024 18:05:22 +0530

tejus.lohani – 1 file(s) modified
add one dummy data for view , if no any margine on 1 unit or less sale then target amount

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

Rev 34053 – SMS Notification error

aman.kumar — Fri, 13 Dec 2024 10:42:33 +0530

aman.kumar – 1 file(s) modified
SMS Notification error

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

Rev 34052 – change js version 259 to 260

tejus.lohani — Thu, 12 Dec 2024 18:38:47 +0530

tejus.lohani – 1 file(s) modified
change js version 259 to 260

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

Rev 34051 – partner verification bug fix

tejus.lohani — Thu, 12 Dec 2024 18:36:38 +0530

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

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-dealer-mapping.js

Rev 34050 – In po give filter to not check category of live ...

tejus.lohani — Thu, 12 Dec 2024 15:34:48 +0530

tejus.lohani – 1 file(s) modified
In po give filter to not check category of live demo and dummy

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

Rev 34049 – Fix Similar Models not showing

vikas.jangra — Thu, 12 Dec 2024 12:34:49 +0530

vikas.jangra – 1 file(s) modified
Fix Similar Models not showing

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

Rev 34048 – bug fix ,create po only if status is update like, ...

tejus.lohani — Wed, 11 Dec 2024 19:14:36 +0530

tejus.lohani – 3 file(s) modified
bug fix ,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-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-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java

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