| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36050 |
12 d 11 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 |
13 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 |
34 d 7 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 |
34 d 7 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 |
35 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 |
35 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 |
35 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 |
35 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 |
36 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 |
36 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
|
| 35857 |
38 d 8 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 |
54 d 4 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 |
96 d 11 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 |
96 d 11 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
|
| 35458 |
106 d 4 h |
amit |
/trunk/ |
Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level
Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories
Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor
Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility |
|
/trunk/profitmandi-dao/pinelabs.http
/trunk/profitmandi-dao /trunk/profitmandi-dao/build.gradle /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ActivatedImei.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsCustomerRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsOrderRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsPaymentMethodRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PinelabsRefundRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/PurSaleServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/RoleManager.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/catalog/SchemeBlockedImeiServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/BulkOrderService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AccessManagementController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/AnalysisDashboardController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ContentController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/CustomerController.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/FofoController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InvoiceController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemLedgerController.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/LoginController.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/MapTrackController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MongoMigrationController.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/PartnerPendingTasksController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerTargetController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PaymentOptionController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.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/PostOfficeController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PunchInOutController.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/SDCreditController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ScanRecordController.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/TagListingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/TrialController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebHookController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebListingController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WebOffersController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/logix/LogixController.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/provider/ProviderController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/purchase_sale_ratio/PurSaleController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/spicemoney/SpiceMoneyController.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_rider/WarehouseRiderController.java /trunk/profitmandi-fofo/src/main/resources/META-INF/env.property /trunk/profitmandi-fofo/src/main/resources/log4j2.xml /trunk/profitmandi-fofo/src/main/webapp/resources/js/cart.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/create-order.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/inventory.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/login.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/order.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/purchase.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js /trunk/profitmandi-fofo/src/main/webapp/resources/js/sale.js /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/AddressController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BannerListingController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/BrandController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CartController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/FileUploaderController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/GatewayController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/InsuranceController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/MigrationController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PageController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ShopController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SmartCartController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/SolrSearchController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrackingController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TransactionController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/TrialUserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/WalletController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/PayuPayController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/scratch/ScratchController.java /trunk/profitmandi-web/src/main/resources/META-INF/env.property /trunk/profitmandi-web/src/main/resources/log4j2.xml
|
| 35415 |
109 d 9 h |
amit |
/trunk/ |
Commit Changes |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/TicketRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeActivityRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FranchiseeActivityRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.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_margin_detail_partner.vm /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/CustomerController.java /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
|
| 35297 |
138 d 6 h |
amit |
/trunk/ |
Added logic to handle retailer |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-details.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/update-retailer-details.js
|
| 35205 |
172 d 8 h |
amit |
/trunk/ |
Offer send Notification refactoring |
|
/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
|
| 34620 |
311 d 11 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Added item id |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
|
| 34617 |
312 d 10 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Fixed Live demo issue |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
|