| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37593 |
5 d 22 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 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/aged-apple-imeis.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-aged-apple-stock.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/business/activated-imeis.js
|
| 37427 |
21 d 22 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
src dashboard logic correction |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
|
| 37374 |
27 d 23 h |
ranu |
/trunk/ |
total show on warehouse wise stock value on item detail |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
|
| 37348 |
29 d 23 h |
ranu |
/trunk/ |
super retailer club 5 live |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 37327 |
31 d 0 h |
ranu |
/trunk/ |
super retailer club 5 live |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/1 GM Gold Coin.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/CURRENTLY AIMING FOR.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Group 4.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Maharaja.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Mobile And tv.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Raftaar.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Shuruaat.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/TOTAL ACHIEVEMENT.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Tarakki.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Target.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Udaan.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/Vijeta.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/accessories.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/calendar_.png
/trunk/profitmandi-fofo/src/main/webapp/resources/images/src-images/download.png
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
|
| 37287 |
37 d 23 h |
ranu |
/trunk/ |
warehouse access |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
|
| 37286 |
38 d 0 h |
ranu |
/trunk/ |
warehouse access |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 37285 |
38 d 0 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
warehouse access |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
|
| 37190 |
48 d 5 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
level l1 to l9 commited |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 37188 |
48 d 22 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
level l1 to l9 commited |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 37160 |
49 d 22 h |
ranu |
/trunk/ |
super retailer club going live |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/images/super-retailer-club-5.jpeg
/trunk/profitmandi-fofo/src/main/webapp/resources/images/super-retailer-club-scheme.pdf
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysisDashboard.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
|
| 37096 |
63 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
old version app disabled for rbm |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 37095 |
64 d 0 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
old version app disabled for rbm |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
|
| 37019 |
72 d 16 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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/bootstrap/ContactUsTableBootstrap.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
|
| 36893 |
87 d 3 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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 36890 |
87 d 3 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. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/bootstrap
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/bootstrap/ContactUsTableBootstrap.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
|
| 36889 |
87 d 4 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. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
|
| 36888 |
87 d 5 h |
aman |
/trunk/ |
Feat: Editable Contact-Us page (add/edit/delete) for authorised users
- New fofo.contact_us table backs main + escalation lists (ContactUs entity, ContactUsRepository, contact_us.sql seed of current 40 rows)
- DashboardController: load lists from DB + editor flag; POST /contactUs/save and /contactUs/delete (soft delete), gated to kangan.monga/neha.sharma/gaurav.mathur1
- contact-us.vm renders dynamically with add/edit/delete + modal shown only to editors; contact.js handlers
- NOTE: run contact_us.sql on prod fofo DB before deploying the WAR (no auto-DDL) |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ContactUs.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ContactUsRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ContactUsRepositoryImpl.java
/trunk/profitmandi-dao/src/main/resources/sql/contact_us.sql
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
|
| 36870 |
91 d 1 h |
ranu |
/trunk/ |
tech access to rudy |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
|
| 36849 |
93 d 18 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
code committed fo bgc lead |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|