Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36909 1 h 56 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ deploy rating performace dashboard  
36908 1 h 58 m ranu /trunk/profitmandi-fofo/src/main/ deploy rating performace dashboard  
36907 2 h 20 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ deploy rating performace dashboard  
36906 2 h 22 m ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/ deploy rating performace dashboard  
36905 4 h 22 m vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36904 4 h 52 m 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 6 h 43 m vikas /trunk/profitmandi-fofo/src/main/ Location Tracking Dashboard  
36902 1 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  
36901 1 d 2 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ HID requested-allocations: fully batch HID computation (batched tier + SUM(current_qty) + 2-day sales per pair, replacing per-partner query) and add Pending list pagination  
36900 1 d 2 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/ code committed for some change on app  
36899 1 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  
36898 1 d 3 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ HID allocation: batch the requested-allocations screen (catalog-filtered HID query + batched billed/activated serial lookups) and add approved-list pagination (50/page) reusing GenericRepository paginated+count helpers  
36897 1 d 4 h vikas /trunk/ Location Tracking Dashboard  
36896 1 d 6 h vikas /trunk/ Mark Agenda Filled: Update logic  
36895 1 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  
36894 1 d 6 h amit /trunk/profitmandi-dao/src/main/ HID allocation: requested qty is now an additional one-time allowance (purchase-limit override, HID target unchanged); add approved_by column; add 5-day billed/activated serial lookups for the edit screen  
36893 1 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  
36892 1 d 7 h aman /trunk/profitmandi-fofo/src/main/ Contact-Us: vertically center edit modal + styled bootbox delete confirmation

- contact-us.vm: flexbox-center #contactUsModal (equal top/bottom + horizontal)
- contact.js: delete now uses bootbox.confirm (styled 'Yes, delete' dialog), falls back to native confirm
- AppConfig: bump asset version 361 -> 362 so clients fetch updated contact.js		  
36891 1 d 7 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Center the Contact-Us edit modal (was shifted right by leftover left:10% CSS)  
36890 1 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.		  

←Prev12Next→

Show All