Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37120 3 h 8 m vikas /trunk/ Added leads in Beat Creation  
37110 1 d 3 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 1 d 4 h amit /trunk/profitmandi-fofo/src/main/ Add non-prod password reset page for auth users and partners (HRMS); bump jsVersion to 380  
37101 1 d 5 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 1 d 5 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 2 d 2 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ old version app disabled for rbm  
37095 2 d 3 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ old version app disabled for rbm  
37090 3 d 5 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 3 d 5 h amit /trunk/profitmandi-fofo/src/main/ Add Warehouse column to purchase order listing (warehouseId -> name via WAREHOUSE_MAP)  
37073 4 d 1 h vikas /trunk/ Leave Email Notification to HR  
37072 4 d 2 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 7 d 2 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.
 
37064 7 d 3 h ranu /trunk/profitmandi-fofo/src/main/ edit lead on bgc can schedule  
37063 7 d 3 h vikas /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Plan a beat now sequence arranged by distance  
37061 7 d 5 h vikas /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Plan a beat now sequence arranged by distance  
37060 7 d 5 h vikas /trunk/ Plan a beat now sequence arranged by distance  
37057 7 d 7 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 7 d 7 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 7 d 7 h ranu /trunk/ allocation of hid and opening stock suggested qty logic updated as per tarun sir  
37050 8 d 1 h ranu /trunk/profitmandi-fofo/src/main/ serching work globally lead management  

Show All