Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37896 3 h 4 m aman /trunk/ Fin services: stop add-brands-to-service timing out

addPartnerServiceAndBrandService looked up partner_service and partner_service_brand
once per store x brand (each SELECT auto-flushing a growing session), so adding a brand
to a service with many brands (e.g. NOTHING on Bajaj) ran past the request timeout.
Load existing rows in two queries and insert only what's missing. The add endpoints
(fofo + web v2) also skip brands already on the service, so a retry can't duplicate them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012RhScihkTVEM5oJgpFkKWn
 
37895 3 h 24 m ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ cron setup for rbm ranking  
37894 3 h 55 m ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ remove tarun sir email from some storetimline tat email  
37893 4 h 35 m aman /trunk/ AI Assistant leads: split Phone vs Web, route toll-free (IRA_PHONE) leads to Meenakshi

- /add/lead accepts optional source (IRA_PHONE / IRA_WEB), stored in new user.lead.ai_channel.
Anything that isn't IRA_PHONE (incl. missing source) is a web lead; requests without source still work.
- IRA_PHONE leads assigned to Meenakshi (84); other AI leads to a random active BGC L1 excluding her.
Falls back to the pool if she is inactive.
- LeadAiChannelColumnBootstrap adds the column at startup if missing (hbm2ddl is off).
- Lead Dashboard/records show Source as "AI Assistant (Phone)" / "AI Assistant (Web)";
Lead Dashboard filter + CSV; LMS report "AI Leads by Channel" (/lms/dashboard/ai-channel).
- Bump static version to 445 so browsers load the new lead.js.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012RhScihkTVEM5oJgpFkKWn
 
37892 18 h 16 m ranu /trunk/ rbm ranking data fixed  
37891 1 d 4 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ offer-radar notification commit  
37890 1 d 4 h ranu /trunk/profitmandi-fofo/src/main/webapp/resources/js/ offer-radar notification commit  
37889 1 d 22 h 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 2 d 3 h 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 2 d 16 h ranu /trunk/profitmandi-fofo/src/main/webapp/resources/js/ offer-radar notification commit  
37886 2 d 16 h ranu /trunk/profitmandi-fofo/src/main/ offer-radar notification commit  
37885 2 d 16 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ v2 version some fixes  
37884 2 d 20 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 2 d 20 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 2 d 21 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ activated imei will not get scratch coupon  
37881 2 d 21 h ranu /trunk/ activated imei will not get offer gift  
37880 2 d 22 h vikas /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ Scratch Offer Special Gift Limit  
37879 3 d 2 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 3 d 2 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 3 d 3 h amit /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ fix: use CustomRetailer.getCode() for partner code in offer Manage Partners modal  

Show All