| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37190 |
2 d 0 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 |
2 d 17 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 |
3 d 17 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 |
17 d 18 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 |
17 d 19 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 |
26 d 11 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 |
40 d 22 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 |
40 d 22 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 |
40 d 23 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 |
41 d 0 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 |
44 d 20 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 |
47 d 13 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
|
| 36816 |
52 d 23 h |
aman |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Updated IT Emails |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 36725 |
66 d 0 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
beat plan info commit |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 36481 |
87 d 17 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
l3 and avobe show all warehouse stock |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 36480 |
87 d 18 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
without vendor catalog pricing po will not create |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
|
| 36268 |
109 d 21 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
escaltions updated on dashboard detail |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
|
| 36242 |
113 d 17 h |
aman |
/trunk/ |
Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod initianl mail after store code creation |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/AddWalletRequestRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/FullStockPaymentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/StoreTimelineTatRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatServiceImpl.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/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-rejected.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-req.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/add-wallet-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding-timeline-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history-paginated.vm
|
| 35995 |
141 d 17 h |
aman |
/trunk/ |
Fix:Redesign the Po Approval page, and po creation logic for first po, trail mails formatting fix |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/LineItemModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/SalesThoughtConstants.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/TransactionApprovalModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/services/EmailServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/TransactionApproval.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/TrialServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.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
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/transaction/transaction-approvals.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/transaction-approval.js
|
| 35943 |
149 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/ |
Reduce log noise: demote interceptor/cookie per-request INFO to DEBUG, demote large object dumps and loop logging to DEBUG, fix string concatenation in log statements |
|
/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
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/AuthenticationInterceptor.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/RoleInterceptor.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/util/CookiesProcessor.java
|