| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 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 |
|
| 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. |
|
| 37887 |
1 d 5 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
offer-radar notification commit |
|
| 37886 |
1 d 6 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
offer-radar notification commit |
|
| 37885 |
1 d 6 h |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ |
v2 version some fixes |
|
| 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). |
|
| 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. |
|
| 37882 |
1 d 10 h |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ |
activated imei will not get scratch coupon |
|
| 37881 |
1 d 10 h |
ranu |
/trunk/ |
activated imei will not get offer gift |
|
| 37880 |
1 d 11 h |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ |
Scratch Offer Special Gift Limit |
|
| 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. |
|
| 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. |
|
| 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 |
|
| 37876 |
3 d 7 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/scratch/ |
v2 version some fixes |
|
| 37875 |
3 d 7 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ |
navratri offer validity till 2 days |
|
| 37874 |
5 d 10 h |
ranu |
/trunk/ |
recent winners of scratch offer |
|
| 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 |
|
| 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 |
|
| 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 |
|
| 37870 |
5 d 14 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/ |
feat(supplier): add warehouse name to WarehouseIdPrefixModel |
|
| 37869 |
6 d 12 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
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. |
|
| 37868 |
6 d 14 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/ |
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). |
|
| 37867 |
6 d 16 h |
ranu |
/trunk/ |
new brand fee added |
|
| 37866 |
6 d 17 h |
ranu |
/trunk/ |
request login for b2b app for sales department enable |
|
| 37865 |
7 d 8 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed mail sender everywhere |
|
| 37864 |
7 d 10 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
rbm performance view will consider all partners not taregted only |
|
| 37863 |
7 d 10 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/monitors/ |
remove tarun sir email from some storetimline tat email |
|
| 37862 |
7 d 10 h |
ranu |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ |
rbm ranking modal for september |
|
| 37861 |
7 d 10 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/monitors/ |
ranking of september |
|
| 37860 |
7 d 10 h |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/monitors/ |
remove tarun sir email from some storetimline tat email |
|
| 37859 |
7 d 11 h |
amit |
/trunk/profitmandi-web/src/main/ |
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. |
|
| 37858 |
7 d 12 h |
ranu |
/trunk/ |
remove tarun sir email from some storetimline tat email |
|
| 37857 |
7 d 13 h |
ranu |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ |
remove tarun sir email from some storetimline tat email |
|
| 37856 |
7 d 17 h |
amit |
/trunk/profitmandi-web/src/main/resources/ |
docs(external-api): brandIdentifier is per itemId and returned on all SKU-level endpoints |
|
| 37855 |
7 d 17 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/external/ |
fix(external-api): exclude Live Demo and Dummy display units from all partner feeds and lookups |
|
| 37854 |
8 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
fix(dashboard): label Total/All Regions rows from screen warehouseMap, fall back to warehouseNames (r37846 regression showed raw $warehouseNames.get) |
|
| 37853 |
8 d 10 h |
amit |
/trunk/profitmandi-dao/src/main/resources/sql/ |
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) |
|
| 37852 |
8 d 10 h |
amit |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ |
fix(warehouse): V2 dashboards list ACTIVE warehouses instead of forcing 7573; courier/rider default warehouse 13368 |
|
| 37851 |
8 d 10 h |
amit |
/trunk/profitmandi-fofo/src/ |
fix(warehouse): warehouse partner drill-down lists ACTIVE warehouses instead of forcing 7573; courier/rider admin default warehouse 13368; MovementPurchaseOrderSplitTest uses splitByWarehouseAndCost (renamed in r37830, fofo tests compile again) |
|
| 37850 |
8 d 10 h |
amit |
/trunk/profitmandi-dao/src/main/ |
refactor(warehouse): retire hardcoded Delhi ids - allocation fallback vendor warehouse 7573 -> 13368 (central HR-NSSPL/GGN); Vivo Noida/Ghaziabad partner-sale rule 7573 -> 13370; drop unused InventoryWarehouse WH_DL/WH_HR_DL/WAREHOUSE_IDS; migration 20261005_hr_ggn_central_brand_mapping.sql (13368 central for every ACTIVE warehouse, all brands except Oppo/Vivo, 532 rows, applied on hadb1) |
|