| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37846 |
1 d 5 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
feat(warehouse): dashboards list ACTIVE warehouses only, warehouse-team screens ACTIVE+SUSPENDED (from BillingWarehouseService, WAREHOUSE_MAP gone); global $warehouseNames for labels of data rows in any state; Sellers & Warehouses screen: all-warehouse overview with status tabs, 3-state status, rename, stock/unshipped orders/stores/mapping usage, send stock alert; partner zone offers active warehouses only; brand stock 'All' = active warehouses (replaces r37838 loop); jsVersion 442 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.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/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.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/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnPermissionHelper.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnToVendorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.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/monitors/RbmDrrDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.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/controller/warehouse/PoStockApprovalController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-updation-timestamp.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-region-mapping-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-warehouse-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-combo.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing-purchase-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider-tat-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-activated-itemwise-model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-datewise-debitnote.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-open-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_accessories_itemwsie_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_partner_itemwise_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_accessoriesbrand_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_activated_model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_brand_partners_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
|
| 37725 |
18 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed mail sender everywhere |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36703 |
132 d 11 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add Refresh Cache button on offer history page. Endpoint /offer/refreshCache evicts monthOfferIds, catalog.published_yearmonth, todayOffers for selected month. Bump version to 341. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
|
| 36634 |
138 d 3 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix offer activation cache race: use activateOffers service, catch notification failures |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36521 |
148 d 7 h |
amit |
/trunk/ |
Added RequestCachingFilter |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/config/CacheConfig.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36501 |
151 d 5 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Fixed Offer edit logic only finance team can edit |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
|
| 36492 |
151 d 8 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed scheme item enddate to expire when scheme is expired |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36487 |
152 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
offer process: stamp processedTimestamp on click, block reprocess if batch unfinished |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36348 |
167 d 9 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
/offer/process/{offerId} now fire-and-forget: calls offerBatchService.submitBatchAsync (dao r36347) and returns the status message immediately. User no longer waits on the 5+ min batch run; duplicate clicks for the same offer return 'already being processed' instead of spawning parallel deadlocking batches. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36344 |
167 d 11 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Route /offer/process/{offerId} through OfferBatchService (dao r36342). Per-partner REQUIRES_NEW replaces the single outer transaction — fixes lock-acquisition failures (e.g. offer 8802) by releasing row locks between partners and isolating per-partner failures in cron_batch_item instead of aborting the whole run. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36050 |
196 d 10 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Move offer cache eviction to service layer, remove cache manager dependencies from controller |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 36047 |
197 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix offer cache: clear entire partnerOffers cache on offer mutations instead of selective eviction |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 35925 |
218 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Per-criteria offer editing UI + fix cache eviction bugs
- Add POST /offer/updateSlabs endpoint with JSON body for per-slab target+payout editing
- Replace flat target editor with grouped table (Models, Slab, Target, Payout columns)
- Fix: publishedOffersWithAchievement evicted from wrong cache manager (redisShort->oneDay)
- Fix: todayOffers cache never evicted on offer mutations — added to all mutating operations
- Extract evictOfferCaches() helper for update endpoints |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
|
| 35923 |
218 d 6 h |
aman |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix:Offer activation error |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 35894 |
219 d 12 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Add descriptive comments for cache eviction logic across all offer endpoints |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 35893 |
219 d 12 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Add partnerOffers cache eviction to activateOffer and publishAll, use injected Gson bean |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 35892 |
219 d 12 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Add partnerOffers cache eviction to partner management and target update endpoints |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 35891 |
219 d 12 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Remove cache eviction from removePartners and addPartners - eviction happens only on activate/deactivate |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 35888 |
220 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Fix: use partner_criteria JSON for partner modal, remove offer_partners table dependency |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_partners.vm
|
| 35886 |
220 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Admin offer management UI: manage partners modal, edit targets, JS handlers, bump version to 325 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_partners.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/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_history.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/scheme_offer.js
|