Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
36922 1 d 6 h amit /trunk/profitmandi-fofo/src/main/ Remove unused Digify retailer integration and fix slim-jQuery clobber on partner-performance/today_po/today_target pages

- Delete Digify controller, views and Buyback asset; drop dead .digify-retailer-login handler and buyback links/buttons
- Load full jQuery (3.5.1) instead of jquery slim on partner-performance/today_po/today_target so injected pages no longer overwrite the dashboard jQuery (restores $.ajax / slideUp)
- Bump jsVersion to 365
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-register.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/images/Buyback-Mobile.png
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-role.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.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-performance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_target.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36902 3 d 5 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  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/requested-allocations.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
36899 3 d 6 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  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/requested-allocations.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js
36892 3 d 10 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
36890 3 d 10 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
36873 6 d 12 h ranu /trunk/profitmandi-fofo/src/main/ kamini mam access issue on pending loi  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap-theme.css
/trunk/profitmandi-fofo/src/main/webapp/resources/css/bootstrap.css
/trunk/profitmandi-fofo/src/main/webapp/resources/fofo-form/css/bootstrap.min.css
36868 7 d 8 h ranu /trunk/ code committed fo bgc lead  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/BeatScheduleRepositoryImpl.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/LeadGeoLocationController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
36851 9 d 11 h aman /trunk/profitmandi-fofo/src/main/ Fix LOI Acquired Date validation rejecting manually-typed dates; bump asset version to 359

Validate the Acquired Date range on blur instead of change so typing the
year digit-by-digit in the type=date field no longer rejects intermediate
values. Bump cache-buster version 358->359 so clients reload the updated JS.
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/loi-form.js
36846 10 d 8 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Bump static asset version 357->358 to bust browser cache for loi-form.js Acquired Date fix (r36845)  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
36844 10 d 10 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Bump static asset cache-buster version to 357

Forces browsers to re-download updated JS (incl. loi-form.js Acquired Date
7-day enforcement). Resolved conflict with concurrent r36843 (version 356);
took the newer cssVersion 50 and bumped version past 356 to ensure a fresh value.
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
36836 13 d 5 h ranu /trunk/profitmandi-fofo/src/main/ code commit for agenda fill time stamp  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-user-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
36825 15 d 7 h ranu /trunk/profitmandi-fofo/src/main/ code commit for agenda fill time stamp  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style-responsive.css
36819 15 d 9 h amit /trunk/profitmandi-fofo/src/main/ Fix idempotency dedup to be server-authoritative (content + partner scoped)

PostInterceptor now keys duplicates on sha256(fofoId|method|uri|bodyHash) for
mutating methods only, instead of the client-supplied IdempotencyKey header.
The header was rotated per-request by the frontend (and old/sticky clients),
so identical submissions produced distinct keys and were never deduped - e.g.
a create-offer burst created 147 duplicate rows. Keying on the request body
makes dedup independent of client behaviour; partner scoping prevents cross-
partner collisions; distinct payloads (one-offer-per-partner) are unaffected.
GET/HEAD are now never deduped (removes spurious GET 400s).

common.js: attach IdempotencyKey only to mutating methods; stop rotating the
key on every ajaxComplete (kept reset on ajaxSuccess only). version 355.
 
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/PostInterceptor.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36814 15 d 12 h ranu /trunk/profitmandi-fofo/src/main/ code commit for agenda fill time stamp  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
36811 16 d 0 h ranu /trunk/ code commit for agenda fill time stamp  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/user/BeatRoute.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/BeatPlanController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
36806 16 d 5 h ranu /trunk/profitmandi-fofo/src/main/ code commit for agenda fill time stamp  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatReportController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report-data.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-report.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-report.js
36800 17 d 7 h ranu /trunk/profitmandi-fofo/src/main/ some enhancement and bug fixes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VisitRequestController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
36792 20 d 6 h ranu /trunk/profitmandi-fofo/src/main/ some enhancement and bug fixes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/BeatPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadGeoLocationController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/beat-plan-window.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
36789 20 d 13 h ranu /trunk/profitmandi-fofo/src/main/ some enhancement and bug fixes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
36788 20 d 13 h ranu /trunk/profitmandi-fofo/src/main/ some enhancement and bug fixes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/beat-plan-app.js

Show All