| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 35894 |
7 h 17 m |
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 |
7 h 18 m |
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 |
7 h 22 m |
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 |
7 h 35 m |
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
|
| 35890 |
21 h 0 m |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Fix edit targets UI to show unique targets only (2 inputs instead of 4) |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/offer_margin_detail_partner.vm
|
| 35889 |
21 h 34 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/ |
Fix updateOfferTargets unique key constraint - group slabs by payout_target and use updateById |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
|
| 35888 |
23 h 16 m |
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
|
| 35887 |
23 h 16 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Fix: use partner_criteria JSON instead of offer_partners table for partner management |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
|
| 35886 |
1 d 1 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
|
| 35885 |
1 d 1 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Admin offer management: add/remove partners, clone offer, update targets + empty guard fix in getCreateOfferRequest |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferPartnerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferTargetSlabRepositoryImpl.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
|
| 35884 |
1 d 3 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/ |
Update GRN correction UI: rename labels, add IMEI field for serialized item corrections |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-request-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 35883 |
1 d 3 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ |
Handle serialized items in GRN qty corrections - reassign IMEI to correct item on approval |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
|
| 35882 |
1 d 3 h |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ |
Add optional serialNumber field to ItemQtyMapping for serialized GRN item corrections |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ItemQtyMapping.java
|
| 35881 |
1 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/ |
code commit for agent live status 2.0 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.java
|
| 35880 |
2 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Remove dead blocked loan methods: selectBlockedLoans(retailerId) and getAllBlockedLoans() - zero callers. Keep selectAllBlockedLoans() as canonical. Remove unused Loan.findBlockedLoans named query (was buggy - missing settledOn filter). |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
|
| 35879 |
2 d 0 h |
ranu |
/trunk/profitmandi-fofo/ |
code commit for agent live status 2.0 |
|
/trunk/profitmandi-fofo/build.gradle
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/AgentLiveStatusService.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/service/KnowlarityScraperService.java
/trunk/profitmandi-fofo/src/main/resources/META-INF/dev.properties
/trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm
|
| 35878 |
2 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ |
Remove duplicate getDefaultLoanWithoutLimit (alias of getDefaultLoans), consolidate fundWallet to use single code path |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
|
| 35877 |
2 d 0 h |
amit |
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ |
Credit cron fixes: correct interest rates in notifications, show total+bifurcation in messages, fix internal email text, filter limit blocks, limit WhatsApp to 2 per run, replace N+1 loan statement queries with loan fields, use selectAllBlockedLoans for fixBlockedCredit. |
|
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
|
| 35876 |
2 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
3-tier interest calculation, partner-aware dueDate, selectAllActiveLoan excludes limit blocks.
- Loan.java: add getPenaltyDate(), update isOverdue()/isDefault() to use it
- LoanRepositoryImpl: add limitBlock=false to selectAllActiveLoan queries
- SDCreditServiceImpl: add getTier1Days(), partner-aware dueDate in createLoan, rewrite addInterest/checkLoans with 3-tier rates, remove redundant isLimit filters |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Loan.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/SDCreditServiceImpl.java
|
| 35875 |
2 d 0 h |
amit |
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ |
Add tiered interest rate constants and partner-type-aware credit days. Currently using old policy values (0.06/0.12/0.24, 15 days for all). New policy values commented for easy switch (0.06/0.09/0.12, 20 days for DIAMOND/PLATINUM). |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
|