| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36521 |
3 d 1 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 |
5 d 22 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 |
6 d 2 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 |
7 d 0 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 |
22 d 2 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 |
22 d 5 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 |
51 d 4 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 |
51 d 21 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 |
72 d 23 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 |
73 d 0 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 |
74 d 5 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 |
74 d 5 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 |
74 d 5 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 |
74 d 5 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 |
74 d 21 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 |
74 d 23 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
|
| 35857 |
77 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add bulk publish all, delete offer UI/endpoints, offer cache eviction on activate, 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/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
|
| 35726 |
92 d 21 h |
vikas |
/trunk/ |
Pinelabs offer discovery on billing and stock page |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/pinelabs/PinelabsOfferCacheService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.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/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/resources/message_en.properties
/trunk/profitmandi-fofo/src/main/resources/messages_en.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-paginated.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-info.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/css/style.css
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
|
| 35505 |
135 d 4 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
today offer modal done |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
|
| 35501 |
135 d 4 h |
ranu |
/trunk/ |
today offer modal done |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/CatalogBrief.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerCriteriaPojo.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PayoutSlabModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/SchemeOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayCatalogOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferGroupKey.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WebOfferModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/TodayOfferServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-fofo-offer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today-offer.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Catalog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CatalogRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CustomerOfferItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemCriteriaRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/SchemeRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/IciciLombardService.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/OfferController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-brandwise-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-stock.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/price-circular.js
|