Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37019 15 d 15 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
36892 30 d 2 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
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/contact.js
36891 30 d 2 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)  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36890 30 d 2 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 30 d 3 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 30 d 4 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
36887 30 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact-us - remove Mohit Gulati from escalations  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36886 30 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ contact updated  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36753 50 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Contact us list update  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36603 63 d 21 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact-us  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/onboarding_timeline.vm
36595 64 d 0 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact-us  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36594 64 d 0 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact-us  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36456 79 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact us list  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36393 86 d 3 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update contact-us list  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36280 96 d 22 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Contact-us list update  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36264 99 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact-us list  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36233 103 d 4 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update contact list  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
36064 118 d 20 h aman /trunk/ Fix:FULL_Stock flow , fin service mark unapplicable ,send invoice to whatsapp by default, update contact list ,Training mail issue  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/CreateOrderRequest.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/OnboardingEmail.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/OnboardingEmailRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/OnboardingEmailRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/NotificationServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/StoreTimelineTatService.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/OrderController.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/ServiceConfigContoller.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-open.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-onboarding-row-index.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js
35976 133 d 23 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Contact Us list update  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
35975 134 d 0 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Contact Us list update  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm

Show All