| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37105 |
6 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add non-prod password reset page for auth users and partners (HRMS); bump jsVersion to 380 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reset-password.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/AuthUserController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/authUser.js
|
| 37101 |
6 d 1 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Guard blocked-brand mapping against null brand (server + JS); bump jsVersion to 379
getBlockBrandMappping now rejects null/blank/"null"/"0" brand before delete+persist,
and retailer-block-brands.js alerts instead of submitting when no brand is selected.
Stops literal "null" rows in dtr.retailer_block_brands. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer-block-brands.js
|
| 37072 |
8 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
PO creation: alert on missing approved vendor price + JS version bump 378 (T10); POST whitespace sanitizer deserializer + VendorController search fix (T9.5) |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 37064 |
11 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
edit lead on bgc can schedule |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 37050 |
12 d 21 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
serching work globally lead management |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 37046 |
12 d 22 h |
aman |
/trunk/profitmandi-fofo/src/main/ |
Lead Management: add a bottom global search box mirroring the top lead-table search (name/mobile/outlet/city, any date) so users don't need to scroll back up on a long list; bump asset version to 375 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 37037 |
13 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add Order Report under Partner Reports: /orderReport page + per-fofo /downloadOrderReport CSV (admin partner filter, blank=all partners; non-admin forced to own store), reports.js handlers, jsVersion 373->374 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-report.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/ReportsController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
|
| 37031 |
15 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Credit block/unblock UI + Kred cleanup (fofo): rename activateKred/deactivateKred -> blockCredit(reason)/unblockCredit(logs)/switchCreditGateway, add block/unblock modals + credit-block-logs fragment, bump jsVersion 372->373 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/credit-block-logs.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/WalletController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail-row.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-credit-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/partner-credit-detail.js
|
| 37025 |
15 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
FOFO add-to-cart: show held Live Demo IMEIs as disabled 'Sellable from <date>' checkboxes instead of falling back to quantity field |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js
|
| 37021 |
15 d 5 h |
aman |
/trunk/profitmandi-fofo/src/main/ |
Lead Dashboard: make the lead-table Search box a global partner search (search-as-you-type, debounced) - matches any lead by name/mobile/outlet/city across ALL statuses and dates via /globalLeadSearch; add placeholder + results heading; bump asset version to 371 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 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
|
| 37003 |
19 d 5 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
positions without partner |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CsController.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/VisitRequestController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 36989 |
20 d 21 h |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Changed mail sender password and Duplicate Req interceptor behavior |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/interceptor/PostInterceptor.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
|
| 36984 |
20 d 23 h |
aman |
/trunk/ |
Lead Management: (1) fix date-range CSV download to mirror the on-screen view - all statuses in range PLUS follow-ups - so it no longer returns empty or 500s on empty windows; guard empty result set. (2) Add global lead search (name/mobile/outlet/city across ALL leads, any status/date) wired to the existing lead-table search box (Enter = search all). Bump JS cache version to 369. |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/LeadRepositoryImpl.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/LeadController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
|
| 36968 |
21 d 23 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
HID approval: add period (approved-date) search on Approved tab, default to today |
|
/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
|
| 36961 |
22 d 1 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Combo cancellation: wire combo cascade into FOFO cancelOrder with confirm flow; bump js version for cache-bust |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js
|
| 36922 |
27 d 22 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 |
29 d 21 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 |
29 d 22 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 |
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
|