Subversion Repositories SmartDukaan

Rev

Go to most recent revision | Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36931 29 d 3 h vikas /trunk/ Location Tracking Dashboard: Period Analytics - Removed L5 and Final  
36929 29 d 5 h vikas /trunk/ Location Tracking Dashboard: Period Analytics  
36928 29 d 7 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix wallet-edit transaction search showing raw Velocity vars for credit summary

getWalletHistory (/getWalletHistory, the Search-by-transaction-id flow) rendered
wallet-history.vm without populating totalDue/creditlimit/availableLimit, so the
template printed the references literally. Populate them from
sdCreditService.getCreditSummary (same helper the dashboard uses).
 
36927 29 d 7 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/ HDFC push-credits: stop lost/uncaptured credits and cut burst contention

- Capture every payment in hdfc_payment before VA validation; never 500 a
missing/unmatched VA. Acknowledge as success so HDFC stops retrying, leaving
the row uncredited for reconciliation (dedupe against add_wallet_request).
- On a row-lock conflict (lock-wait/deadlock), roll back fully and let HDFC retry
instead of mis-acking as 'duplicate', which silently lost valid-partner credits.
- Resolve VA/retailer (cached, read-only) before the INSERT to shorten the
hdfc_payment index-lock window.
- Scope READ-COMMITTED to the push-credits transaction only (no app-wide change)
to drop gap-lock contention on concurrent hdfc_payment inserts.
- Lower innodb_lock_wait_timeout to 10s per HikariCP connection so blocked
transactions fail fast instead of starving the pool.
 
36922 30 d 3 h amit /trunk/profitmandi-fofo/src/main/ Remove unused Digify retailer integration and fix slim-jQuery clobber on partner-performance/today_po/today_target pages

- Delete Digify controller, views and Buyback asset; drop dead .digify-retailer-login handler and buyback links/buttons
- Load full jQuery (3.5.1) instead of jquery slim on partner-performance/today_po/today_target so injected pages no longer overwrite the dashboard jQuery (restores $.ajax / slideUp)
- Bump jsVersion to 365
 
36917 30 d 5 h vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36916 30 d 6 h vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36913 30 d 9 h vikas /trunk/ Location Tracking Dashboard  
36912 30 d 9 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/ Internal PO: block billing-warehouse change for PO-mapped orders

Throw if the order's transaction is mapped to an internal PO before changing warehouse in changeBillingWarehouse.
 
36908 31 d 1 h ranu /trunk/profitmandi-fofo/src/main/ deploy rating performace dashboard  
36906 31 d 2 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/ deploy rating performace dashboard  
36905 31 d 4 h vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36904 31 d 4 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix FSP wallet approval blocked by cross-store reference collision

Scope the duplicate-reference guard in /addAmountToWallet to the same retailer.
Reference numbers (e.g. cheque no '000310') are not globally unique, so an
already-approved request from a different store falsely tripped 'Entry already
Approved Please reject' and blocked a legitimate Full Stock Payment approval.
 
36903 31 d 6 h vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36902 32 d 2 h amit /trunk/profitmandi-fofo/src/main/ HID requested-allocations: fully-batched HID/Current (no per-partner query) + server-side pagination on both Pending and Approved tabs (50/page); bump js version  
36899 32 d 3 h amit /trunk/profitmandi-fofo/src/main/ HID requested-allocations: batched HID/Current/Bill-Act lookups, server-side pagination on Approved tab (50/page), generate-request fixes (qty>0 + derive trusted fofoId via isAdmin); bump js version  
36897 32 d 4 h vikas /trunk/ Location Tracking Dashboard  
36895 32 d 6 h amit /trunk/profitmandi-fofo/src/main/ HID allocation edit screen: add HID Qty / Bill-Act 5d / Current Qty / Excess-Short (colored) / Requestor / Approver columns; requested qty now additional one-time qty over current stock; null-row guard + qty>0 validation; track approver  
36893 32 d 6 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Contact-Us editors: remove neha.sharma, keep only kangan.monga and gaurav.mathur1  
36890 32 d 7 h aman /trunk/profitmandi-fofo/src/main/ Re-enable DB-backed Contact-Us with self-provisioning + UI/cache fixes

- ContactUsTableBootstrap: app auto-creates & seeds fofo.contact_us on startup on
whatever DB it connects to (idempotent), removing the wrong-DB-host failure that
caused the prod SQLGrammarException. No manual prod SQL needed.
- DashboardController: restore DB-backed /contactUs (+ save/delete) with a defensive
try/catch so a DB hiccup renders an empty list instead of a 500.
- contact-us.vm: move modal to <body> on load (escapes the zoom stacking context that
hid the popup); Edit/Delete as clear text buttons.
- contact.js: relocate modal out of #main-content; add/edit/delete handlers.
- AppConfig: bump asset version 360 -> 361 so clients fetch the updated contact.js.
 

Show All