| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37889 |
12 h 2 m |
aman |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/serviceConfig/ |
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
|
| 37888 |
17 h 15 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
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
|
| 37887 |
1 d 5 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
offer-radar notification commit |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
|
| 37886 |
1 d 6 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
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
|
| 37885 |
1 d 6 h |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ |
v2 version some fixes |
|
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java
|
| 37884 |
1 d 10 h |
amit |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ |
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
|
| 37883 |
1 d 10 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/ |
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
|
| 37882 |
1 d 10 h |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ |
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
|
| 37881 |
1 d 10 h |
ranu |
/trunk/ |
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
|
| 37880 |
1 d 11 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ |
Scratch Offer Special Gift Limit |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java
|
| 37879 |
1 d 16 h |
amit |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ |
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
|
| 37878 |
1 d 16 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
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
|
| 37877 |
1 d 16 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
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
|
| 37876 |
3 d 7 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/ |
v2 version some fixes |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/RecentWinnerResponse.java
|
| 37875 |
3 d 7 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ |
navratri offer validity till 2 days |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ScratchOfferRepositoryImpl.java
|
| 37874 |
5 d 10 h |
ranu |
/trunk/ |
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
|
| 37873 |
5 d 12 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
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
|
| 37872 |
5 d 14 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
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
|
| 37871 |
5 d 14 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
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
|
| 37870 |
5 d 14 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/ |
feat(supplier): add warehouse name to WarehouseIdPrefixModel |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/WarehouseIdPrefixModel.java
|