Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
37851 5 d 2 h amit /trunk/profitmandi-fofo/src/ fix(warehouse): warehouse partner drill-down lists ACTIVE warehouses instead of forcing 7573; courier/rider admin default warehouse 13368; MovementPurchaseOrderSplitTest uses splitByWarehouseAndCost (renamed in r37830, fofo tests compile again)  
37846 5 d 3 h amit /trunk/profitmandi-fofo/src/main/ feat(warehouse): dashboards list ACTIVE warehouses only, warehouse-team screens ACTIVE+SUSPENDED (from BillingWarehouseService, WAREHOUSE_MAP gone); global $warehouseNames for labels of data rows in any state; Sellers & Warehouses screen: all-warehouse overview with status tabs, 3-state status, rename, stock/unshipped orders/stores/mapping usage, send stock alert; partner zone offers active warehouses only; brand stock 'All' = active warehouses (replaces r37838 loop); jsVersion 442  
37838 5 d 10 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ fix(dashboard): warehouse brand stock 'All' includes every warehouse holding stock in tbl_cis, not only franchise-store warehouses plus hardcoded 7573/10516/7678 - HR hubs (internal stores only) now counted (same rule as r37834)  
37593 29 d 3 h amit /trunk/profitmandi-fofo/src/main/ Show partners their aged Apple stock and why it lowers their credit limit

Apple handsets held past 30 days are deducted when the credit limit is
calculated, but nothing told the partner - they saw a limit drop with no
explanation. Adds a dashboard banner alongside the existing 'activated but not
billed' one, shown only when the partner actually has such stock (70 of 980
today), with the unit count, the value, and View Imeis for the detail.

- dashboard-aged-apple-stock.vm, parsed in dashboard1.vm under
#if($investments.aged_apple_qty > 0)
- count and value both read from the maintained partner_investment snapshot, so
the banner never runs its own query and always matches the amount the limit is
actually reduced by
- amount wrapped in <span class="currency"> so common.js formatCurrency() renders
it instead of a raw float
- /agedAppleImeis + aged-apple-imeis.vm list the units, excluding activated ones -
those are already deducted as activated stock and shown in their own banner, so
no handset appears in both
- click handler added to the existing activated-imeis.js rather than inline in the
fragment: an inline script in an AJAX-injected fragment re-registers
$(document).on on every load and stacks duplicate requests
- jsVersion 420 -> 421
 
37427 45 d 2 h ranu /trunk/profitmandi-fofo/src/main/ src dashboard logic correction  
37374 51 d 3 h ranu /trunk/ total show on warehouse wise stock value on item detail  
37348 53 d 4 h ranu /trunk/ super retailer club 5 live  
37327 54 d 4 h ranu /trunk/ super retailer club 5 live  
37287 61 d 4 h ranu /trunk/ warehouse access  
37286 61 d 4 h ranu /trunk/ warehouse access  
37285 61 d 5 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ warehouse access  
37190 71 d 10 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ level l1 to l9 commited  
37188 72 d 3 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ level l1 to l9 commited  
37160 73 d 3 h ranu /trunk/ super retailer club going live  
37096 87 d 3 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ old version app disabled for rbm  
37095 87 d 5 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ old version app disabled for rbm  
37019 95 d 21 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  
36893 110 d 7 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 110 d 8 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.
 
36889 110 d 9 h aman /trunk/profitmandi-fofo/src/main/ Revert Contact-Us page to static version (back out DB-backed editing from r36888)

Page was throwing SQLGrammarException on prod because the app's DB server lacks fofo.contact_us. Reverting contact-us.vm, contact.js and DashboardController to the working static version (r36887 content). Contact data unchanged. DB-backed editing to be re-enabled later once the correct prod DB is confirmed.
 

Show All