Subversion Repositories SmartDukaan

Rev

Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37129 11 h 2 m vikas /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Created LMS Dashboard  
37127 1 d 7 h amit /trunk/profitmandi-fofo/src/main/ Password override: record to devtools table + bulk download/upload page (dev/staging, isProd-gated)  
37125 1 d 7 h vikas /trunk/ Created LMS Dashboard  
37124 3 d 7 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ ok  
37120 4 d 8 h vikas /trunk/ Added leads in Beat Creation  
37110 5 d 9 h aman /trunk/ Business-agreement e-sign gate between Full Stock Payment and PO creation

New AGREEMENT_ESIGN onboarding stage, verified by Legal (Gaurav Sharma):
- Hard-blocks first PO creation until the e-sign is verified (BulkOrderService),
mirroring the existing Full Stock Payment block.
- Agreement E-Sign panel (Partner Acquisition menu) listing FSP-done partners who
have not yet created their first PO: upload signed agreement + Gaurav-only verify.
- New agreement_esign table/entity + repository for the signed doc and audit trail.
- Timeline grid column + stepper stage for the new event.

Prod DB (separate, with sign-off): CREATE TABLE user.agreement_esign;
INSERT auth.menu + auth.menu_category rows for the panel.
 
37105 5 d 10 h amit /trunk/profitmandi-fofo/src/main/ Add non-prod password reset page for auth users and partners (HRMS); bump jsVersion to 380  
37101 5 d 11 h amit /trunk/profitmandi-fofo/src/main/ Guard blocked-brand mapping against null brand (server + JS); bump jsVersion to 379

getBlockBrandMappping now rejects null/blank/"null"/"0" brand before delete+persist,
and retailer-block-brands.js alerts instead of submitting when no brand is selected.
Stops literal "null" rows in dtr.retailer_block_brands.
 
37100 5 d 11 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/ Simplify HDFC push-credits: drop Redis, store only credited payments

- Remove the Redis UTR lock entirely. It was redundant with the DB
UNIQUE(utr) + INSERT IGNORE dedup, and actively harmful: a concurrent
HDFC retry hit the Redis lock, got acked 'Duplicate', and stopped
retrying while the original rolled back on a wallet lock conflict --
losing the credit (4 lost credits Jul-11..15, all recovered manually).

- Store ONLY credited payments. Missing/unmatched-VA transfers are internal
onboarding virtual accounts reconciled via the separate account-entries
ledger, so they are no longer captured here. Removes the merely-captured
row states and the credited-vs-captured ambiguity.

- Drop the lock-conflict rethrow / isLockConflict helper. A credit failure
now simply propagates -> class @Transactional(rollbackFor=Throwable)
rolls the row back -> HDFC's own retry re-credits cleanly (no Redis lock
to swallow the retry).

Dedup now: manual-approval check + selectByUtrNo (a stored row means
credited) + INSERT IGNORE for the concurrent-retry race.
 
37096 6 d 7 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ old version app disabled for rbm  
37095 6 d 9 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ old version app disabled for rbm  
37090 7 d 11 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ partnerPerformance: cut per-request query load

- Live-read credit utilization from sd_credit_requirement (match Wallet page, not the 3h-cached blob)
- Remove dead duplicate order query + hot-path debug logging
- Batch monthly targets; use fofoId-scoped billing-avg and month-bucketed earnings queries
(getEarning arithmetic unchanged); drop dead category-upgrade query
 
37088 7 d 11 h amit /trunk/profitmandi-fofo/src/main/ Add Warehouse column to purchase order listing (warehouseId -> name via WAREHOUSE_MAP)  
37073 8 d 6 h vikas /trunk/ Leave Email Notification to HR  
37072 8 d 8 h amit /trunk/profitmandi-fofo/src/main/ PO creation: alert on missing approved vendor price + JS version bump 378 (T10); POST whitespace sanitizer deserializer + VendorController search fix (T9.5)  
37065 11 d 8 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Block scheme/CN-backed reference types from the wallet bulk-upload sheet

Manual scheme/incentive clawbacks posted from /wallet/upload as ADDITIONAL_SCHEME
(or any CN_WALLET_REFERENCES type) leave the offer_payout un-rejected, so the
month-end MARGINS credit note is over-issued and the account-statement
scheme-adjustment line breaks. Pre-validate the whole sheet and reject up-front;
manual scheme recoveries must be posted as OTHERS.
 
37063 11 d 9 h vikas /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Plan a beat now sequence arranged by distance  
37061 11 d 10 h vikas /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Plan a beat now sequence arranged by distance  
37060 11 d 11 h vikas /trunk/ Plan a beat now sequence arranged by distance  
37057 11 d 12 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Add admin Order Report (CSV) with month-bounded date range; scope non-admins to their own store and fix NPE on blank admin fofoId (Integer/int ternary unboxing) in downloadOrderReport  
37056 11 d 12 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Publish FLAGSHIP_UPDATED event on flagship add/remove so the model's Solr listing is reindexed  
37055 11 d 13 h ranu /trunk/ allocation of hid and opening stock suggested qty logic updated as per tarun sir  
37048 12 d 8 h ranu /trunk/profitmandi-fofo/src/main/ serching work globally lead management  
37047 12 d 8 h ranu /trunk/profitmandi-fofo/src/main/ targeted calling count on today po rbm  
37044 12 d 10 h vikas /trunk/profitmandi-fofo/src/main/ Beat Report: Added order details for visit if placed an order  
37039 13 d 7 h vikas /trunk/profitmandi-fofo/src/main/ Beat Report: Added order details for visit if placed an order  
37038 13 d 7 h vikas /trunk/ Beat Report: Gaurav Mathur can see all sales employees data, also added past discussions  
37037 13 d 8 h amit /trunk/profitmandi-fofo/src/main/ Add Order Report under Partner Reports: /orderReport page + per-fofo /downloadOrderReport CSV (admin partner filter, blank=all partners; non-admin forced to own store), reports.js handlers, jsVersion 373->374  
37036 13 d 8 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ AI lead intake: round-robin auto-assignment between Khushbu Saxena (authId 134) and Archana Ramola (authId 126), one lead at a time, instead of the hardcoded Shankar Mushran (53). Toggle advances only on a real create (not dedup hits).  
37035 14 d 9 h aman /trunk/profitmandi-fofo/src/main/ AI lead intake in fofo app (deployable via fofo_deploy): add POST /add/lead to fofo LeadController mirroring the profitmandi-web contract (Auth-Token->401, dedup by mobile, NOT-NULL coalesced, stores state+recordingUrl, status=pending, SUCCESS envelope); exclude /add/lead from auth/role/post interceptors in WebConfig; add ai.lead.intake.token to dev/staging/prod (same values as profitmandi-web). Bot repoints host apis.smartdukaan.com -> partners.smartdukaan.com, same path/token/payload.  
37031 14 d 12 h amit /trunk/profitmandi-fofo/src/main/ Credit block/unblock UI + Kred cleanup (fofo): rename activateKred/deactivateKred -> blockCredit(reason)/unblockCredit(logs)/switchCreditGateway, add block/unblock modals + credit-block-logs fragment, bump jsVersion 372->373  
37020 14 d 15 h vikas /trunk/ Beat Report Enhancements  
37019 15 d 1 h aman /trunk/profitmandi-fofo/src/main/ Contact Us: add position control - 'place after' dropdown + up/down reorder for Main & Escalation tables (editor-gated); self-heal missing columns in ContactUsTableBootstrap (adds id/PK to pre-existing tables to fix GE_1007); bump asset version to 370  
37018 15 d 8 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ revival and focus bill be active on next billing  
37003 18 d 15 h ranu /trunk/profitmandi-fofo/src/main/ positions without partner  
37001 19 d 8 h ranu /trunk/ rbm calling target issue fix according to aquil  
37000 19 d 9 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Price-hike deduction: revert hike edits from price-drop flow; add GET /priceHike/process/{priceDropId} to trigger the on-demand per-retailer hike deduction executor  
36989 20 d 7 h vikas /trunk/profitmandi-fofo/src/main/ Changed mail sender password and Duplicate Req interceptor behavior  
36985 20 d 8 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Price-hike deduction: make /priceHike/generateImeis/{id} a GET (consistent with /priceDropImeis; still idempotent, no debit)  
36984 20 d 8 h aman /trunk/ Lead Management: (1) fix date-range CSV download to mirror the on-screen view - all statuses in range PLUS follow-ups - so it no longer returns empty or 500s on empty windows; guard empty result set. (2) Add global lead search (name/mobile/outlet/city across ALL leads, any status/date) wired to the existing lead-table search box (Enter = search all). Bump JS cache version to 369.