SmartDukaan – /

Rev 37891 – offer-radar notification commit

ranu — Wed, 14 Oct 2026 11:37:15 +0530

ranu – 1 file(s) modified
offer-radar notification commit

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

Rev 37890 – offer-radar notification commit

ranu — Wed, 14 Oct 2026 11:36:36 +0530

ranu – 1 file(s) modified
offer-radar notification commit

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 37889 – Fin Services: take brand logos from catalog.brand.logo_url instead of Mongo ...

aman — Tue, 13 Oct 2026 18:00:02 +0530

aman – 1 file(s) modified
Fin Services: take brand logos from catalog.brand.logo_url instead of Mongo

Logo lookup is case-insensitive so service_brand names like NOTHING match.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012RhScihkTVEM5oJgpFkKWn

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

Rev 37888 – fix(catalog): reject duplicate colour on item upload regardless of f_ ...

amit — Tue, 13 Oct 2026 12:47:13 +0530

amit – 2 file(s) modified
fix(catalog): reject duplicate colour on item upload regardless of f_ prefix, case or spacing

Item.colorKey() normalises a colour for comparison (drops f_/F_, lowercases, tidies spaces).
ItemLoaderService 'Color already exist' check now uses it, so f_black / F_Black / Black are
rejected when the model already has f_Black. 'Model repeats the same color' check unchanged.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/ItemLoaderService.java

Rev 37887 – offer-radar notification commit

ranu — Tue, 13 Oct 2026 00:05:16 +0530

ranu – 1 file(s) modified
offer-radar notification commit

~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 37886 – offer-radar notification commit

ranu — Mon, 12 Oct 2026 23:48:08 +0530

ranu – 2 file(s) modified
offer-radar notification commit

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 37885 – v2 version some fixes

ranu — Mon, 12 Oct 2026 23:47:35 +0530

ranu – 1 file(s) modified
v2 version some fixes

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

Rev 37884 – fix(web): todayOffers for staff users; stop logging full Auth-Token ...

amit — Mon, 12 Oct 2026 19:43:01 +0530

amit – 2 file(s) modified
fix(web): todayOffers for staff users; stop logging full Auth-Token

- /todayOffers (GlitchTip #59, 417 events): resolved the store via
dtr.user_accounts, which internal staff using the partner app don't have, so
getUserCart returned null and the call NPE'd. Use the retailerId from the
token (same value as the partner's saholic account); return an empty list
when the token carries no store.
- AuthenticationInterceptor: log only the last 6 characters of the
Auth-Token instead of the full JWT (was reaching GlitchTip breadcrumbs).

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TodayOfferController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java

Rev 37883 – fix(security): stop logging full JWT in JWTUtil.getUserInfo The full ...

amit — Mon, 12 Oct 2026 19:43:00 +0530

amit – 1 file(s) modified
fix(security): stop logging full JWT in JWTUtil.getUserInfo

The full Auth-Token was logged at INFO on every request and shipped to
GlitchTip as a breadcrumb, where it could be copied and reused. Log only the
last 6 characters for correlation.

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

Rev 37882 – activated imei will not get scratch coupon

ranu — Mon, 12 Oct 2026 19:09:38 +0530

ranu – 2 file(s) modified
activated imei will not get scratch coupon

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2ScratchController.java

Rev 37881 – activated imei will not get offer gift

ranu — Mon, 12 Oct 2026 19:07:28 +0530

ranu – 3 file(s) modified
activated imei will not get offer gift

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js

Rev 37880 – Scratch Offer Special Gift Limit

vikas — Mon, 12 Oct 2026 18:25:22 +0530

vikas – 1 file(s) modified
Scratch Offer Special Gift Limit

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

Rev 37879 – refactor(web): stop setting removed inventory.warehouse fields on seller warehouse create ...

amit — Mon, 12 Oct 2026 13:34:22 +0530

amit – 1 file(s) modified
refactor(web): stop setting removed inventory.warehouse fields on seller warehouse create

Follows dao r37878, which removed the never-read fields from Warehouse.

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

Rev 37878 – fix(dao): warehouse lookup survives legacy NULLs; drop unused warehouse fields; ...

amit — Mon, 12 Oct 2026 13:34:17 +0530

amit – 5 file(s) modified
fix(dao): warehouse lookup survives legacy NULLs; drop unused warehouse fields; moveToGood/moveToBad qty

- /vendors?warehouseId=10516 (UP-NSSPL/Delhi) failed for every supplier: inventory.warehouse
rows 10600/10601 had NULL billingType/logisticsLocation mapped to primitive int.
selectSupplierIdsWithGoodWarehouse now selects only vendorId via HQL.
- InventoryWarehouse/Warehouse: remove never-read fields billingType, logisticsLocation,
tinNumber, vendorString, lastCheckedOn, transferDelayInHours, isAvailabilityMonitored
(DB columns kept); status -> Integer (16 legacy NULL rows); null-safe hashCode/equals
(InventoryWarehouse.hashCode NPE'd on NULL source).
- Warehouse creators no longer set the removed fields.
- moveToGood/moveToBad: act on the newest inventory row per serial; moveToGood restores
currentQuantity to initialQuantity and adds back only the restored qty; moveToBad
reduces availability only when units are on hand and zeroes currentQuantity.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/InventoryWarehouse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/Warehouse.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/InventoryWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupServiceImpl.java

Rev 37877 – fix: use CustomRetailer.getCode() for partner code in offer Manage Partners ...

amit — Mon, 12 Oct 2026 13:06:47 +0530

amit – 1 file(s) modified
fix: use CustomRetailer.getCode() for partner code in offer Manage Partners modal

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

Rev 37876 – v2 version some fixes

ranu — Sat, 10 Oct 2026 22:12:21 +0530

ranu – 1 file(s) modified
v2 version some fixes

+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/RecentWinnerResponse.java

Rev 37875 – navratri offer validity till 2 days

ranu — Sat, 10 Oct 2026 22:09:46 +0530

ranu – 1 file(s) modified
navratri offer validity till 2 days

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.java

Rev 37874 – recent winners of scratch offer

ranu — Thu, 08 Oct 2026 19:26:32 +0530

ranu – 4 file(s) modified
recent winners of scratch offer

~ /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-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2ScratchController.java

Rev 37873 – fix(menu): move see-all-menus access from L5 to L8/L9; L5 menus ...

amit — Thu, 08 Oct 2026 17:35:09 +0530

amit – 1 file(s) modified
fix(menu): move see-all-menus access from L5 to L8/L9; L5 menus now from auth.menu_category

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

Rev 37872 – fix(supplier): keep supplier's already-mapped warehouses in edit Warehouse Location dropdown ...

amit — Thu, 08 Oct 2026 15:16:19 +0530

amit – 1 file(s) modified
fix(supplier): keep supplier's already-mapped warehouses in edit Warehouse Location dropdown regardless of status

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

Rev 37871 – feat(supplier): show warehouse name instead of prefix in Warehouse Location ...

amit — Thu, 08 Oct 2026 15:11:29 +0530

amit – 3 file(s) modified
feat(supplier): show warehouse name instead of prefix in Warehouse Location dropdown, list ACTIVE warehouses only

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-supplier.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/new-supplier.vm

Rev 37870 – feat(supplier): add warehouse name to WarehouseIdPrefixModel

amit — Thu, 08 Oct 2026 15:11:27 +0530

amit – 1 file(s) modified
feat(supplier): add warehouse name to WarehouseIdPrefixModel

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/WarehouseIdPrefixModel.java

Rev 37869 – fix(fofo): GlitchTip quick wins - empty billing queue, regex search, ...

amit — Wed, 07 Oct 2026 17:57:25 +0530

amit – 8 file(s) modified
fix(fofo): GlitchTip quick wins - empty billing queue, regex search, upload dates

- /om/transactions: no crash when warehouse has no unbilled orders (#50);
/om/orderByTransaction returns "No pending orders" instead of querying with
no items (#88); JS skips detail load when there is no transaction.
- /om/transactions, /om/billedInvoice: warehouseId=0 fallback used a warehouse
id as a list index (authWarehouseIds.get(authWarehouseIds.get(0))).
- Item / vendor / retailer typeahead: substring match via contains() instead of
a regex built from user input, which threw PatternSyntaxException on "("
(#1932, #1375, #1700, #600, #1926, #1721, #1754).
- Billed-order shipping upload: time optional, dd-MM-yyyy[ HH:mm[:ss]],
missing parts default to 00 (#1976).
- IMEI activation upload: time optional, M/d/yyyy[ H:mm[:ss]], missing time =
00:00:00; every row validated, bad dates and duplicate IMEIs reported with
row numbers instead of a 500 (#1990).
- Bump JS version to 443.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.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/PriceDropController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js

Rev 37868 – fix(warehouse): return empty availability for empty item list getAvailabilityToWarehouse ...

amit — Wed, 07 Oct 2026 15:03:19 +0530

amit – 1 file(s) modified
fix(warehouse): return empty availability for empty item list

getAvailabilityToWarehouse / ToVendorWarehouse / ToVendorWarehouseToBill
passed an empty itemIds list into the named query, producing "IN ()" and a
SQL syntax error (GlitchTip #20 /cart validation, #88 /om/orderByTransaction).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/BrandRegionMappingRepositoryImpl.java

Rev 37867 – new brand fee added

ranu — Wed, 07 Oct 2026 13:47:57 +0530

ranu – 3 file(s) modified
new brand fee added

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/brandFee/BrandFee.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/onBorading/onBoardingFormEnums/StoreType.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auto-Loi.vm

Rev 37866 – request login for b2b app for sales department enable

ranu — Wed, 07 Oct 2026 12:20:15 +0530

ranu – 4 file(s) modified
request login for b2b app for sales department enable

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/V2UserController.java

Rev 37865 – Fixed mail sender everywhere

amit — Tue, 06 Oct 2026 21:06:27 +0530

amit – 1 file(s) modified
Fixed mail sender everywhere

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

Rev 37864 – rbm performance view will consider all partners not taregted only

ranu — Tue, 06 Oct 2026 19:51:01 +0530

ranu – 3 file(s) modified
rbm performance view will consider all partners not taregted only

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

Rev 37863 – remove tarun sir email from some storetimline tat email

ranu — Tue, 06 Oct 2026 19:47:04 +0530

ranu – 1 file(s) modified
remove tarun sir email from some storetimline tat email

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

Rev 37862 – rbm ranking modal for september

ranu — Tue, 06 Oct 2026 19:30:52 +0530

ranu – 1 file(s) modified
rbm ranking modal for september

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

Rev 37861 – ranking of september

ranu — Tue, 06 Oct 2026 19:21:35 +0530

ranu – 1 file(s) modified
ranking of september

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

Rev 37860 – remove tarun sir email from some storetimline tat email

ranu — Tue, 06 Oct 2026 19:11:04 +0530

ranu – 1 file(s) modified
remove tarun sir email from some storetimline tat email

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

Rev 37859 – fix(payment): send partners back to app.smartdukaan.com after wallet top-up via ...

amit — Tue, 06 Oct 2026 18:26:04 +0530

amit – 3 file(s) modified
fix(payment): send partners back to app.smartdukaan.com after wallet top-up via CCAvenue

r34902 moved angular.app.url to https://smartdukaan.com/, which does not serve the
partner app, so the post-payment redirect to pages/home/payment-status/{id} returned 404.
The payment itself was recorded; only the landing page was broken.

Also drops the extra slash in the redirect format (base URL already ends in /) and adds
the trailing slash to the dev value to match.

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/dev.properties
~ /trunk/profitmandi-web/src/main/resources/META-INF/prod.properties

Rev 37858 – remove tarun sir email from some storetimline tat email

ranu — Tue, 06 Oct 2026 17:28:12 +0530

ranu – 7 file(s) modified
remove tarun sir email from some storetimline tat email

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MTDAchievedTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmWeeklyBillingModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseRbmTargetModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/monitors/RbmPerformanceRankingServiceImpl.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 37857 – remove tarun sir email from some storetimline tat email

ranu — Tue, 06 Oct 2026 16:26:24 +0530

ranu – 1 file(s) modified
remove tarun sir email from some storetimline tat email

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

Rev 37856 – docs(external-api): brandIdentifier is per itemId and returned on all SKU-level ...

amit — Tue, 06 Oct 2026 12:52:08 +0530

amit – 1 file(s) modified
docs(external-api): brandIdentifier is per itemId and returned on all SKU-level endpoints

~ /trunk/profitmandi-web/src/main/resources/external-api-docs.html

Rev 37855 – fix(external-api): exclude Live Demo and Dummy display units from all ...

amit — Tue, 06 Oct 2026 12:52:07 +0530

amit – 1 file(s) modified
fix(external-api): exclude Live Demo and Dummy display units from all partner feeds and lookups

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/external/ExternalFeedRepositoryImpl.java

Rev 37854 – fix(dashboard): label Total/All Regions rows from screen warehouseMap, fall back ...

amit — Tue, 06 Oct 2026 01:08:43 +0530

amit – 2 file(s) modified
fix(dashboard): label Total/All Regions rows from screen warehouseMap, fall back to warehouseNames (r37846 regression showed raw $warehouseNames.get)

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

Rev 37853 – docs(warehouse): record-only migration files for 2026-10-05 HR move - suspended-warehouse ...

amit — Mon, 05 Oct 2026 19:51:04 +0530

amit – 3 file(s) modified
docs(warehouse): record-only migration files for 2026-10-05 HR move - suspended-warehouse brand mapping (1:1 HR substitution, 1,062 deleted / 51 added), 3 franchise stores 7678->13372, note for the store remap and pending-order move done outside the code (all already applied on hadb1, do not re-run)

+ /trunk/profitmandi-dao/src/main/resources/sql/20261005_franchise_stores_7678_to_13372.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/20261005_hr_move_stores_orders_NOTE.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/20261005_suspended_warehouse_brand_mapping.sql

Rev 37852 – fix(warehouse): V2 dashboards list ACTIVE warehouses instead of forcing 7573; ...

amit — Mon, 05 Oct 2026 19:44:44 +0530

amit – 3 file(s) modified
fix(warehouse): V2 dashboards list ACTIVE warehouses instead of forcing 7573; courier/rider default warehouse 13368

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoDashboardController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoProviderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWarehouseRiderController.java