Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
35848 5 d 0 h amit /trunk/ Refactor investment logic to use own investment (total - utilized), remove minimumInvestmentOld, add OK_INVESTMENT_SHORT_PERCENTAGE constant, update thresholds CUTOFF_INVESTMENT=10 MIN_INVESTMENT_PERCENTAGE=5  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/InvestmentRelatedTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/CurrentPartnerDailyInvestment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoStore.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerDailyInvestment.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/FofoUser.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerInvestmentServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PartnerStatsServiceImpl.java
/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
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.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/SchemeController.java
35797 10 d 22 h amit /trunk/ Margin scheme (Rule 32(5)) support for refurbished category (10007)

- FofoSolr: Add 10007 to CATEGORY_MASTER, stop remapping to categoryId 3
- TransactionServiceImpl: Use RF- invoice prefix (fits NIC 16-char limit)
- InvoiceService: Margin calculation (GST on margin only), separate regular/margin items, purchase price lookup, restructured saveInvoice flow
- GstProService: Use InvoicePdfModel for correct taxable values, OthChrg for non-taxable component so TotInvVal = full selling price (GSTR1 & EWB compliance), safe Optional check for EWBPPD, email alert on missing EWB
- LogisticsServiceImpl: Null checks for shipment sequence and provider to prevent NPE in EWB details
- RunOnceTasks: Fix testIrnLive to generate InvoicePdfModel before calling getEInvoice
 
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/LogisticsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java
35613 32 d 22 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Fix: Remove method-level @Transactional, use class-level transaction management  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35612 32 d 22 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Fix: Add @Transactional(propagation=REQUIRES_NEW) to resolveOldEscalationTickets to fix Hibernate session error  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35610 32 d 22 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Add endpoint to resolve old escalation tickets created before Sept 30, 2025

- Added resolveOldEscalationTickets method in RunOnceTasks.java
- Added GET /resolveOldEscalationTickets endpoint in ExposeController.java
- Supports dryRun=true (preview) and dryRun=false (execute)
- Marks Sales/RBM Escalation tickets (subcategory 83, 84) as RESOLVED on behalf of Gaurav CRM
 
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/controller/ExposeController.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35267 111 d 23 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ without invoice cancel request  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35266 111 d 23 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ without invoice cancel request  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35179 140 d 21 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Added SD Credit Scheduler  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35161 144 d 2 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Fixed SD Credit HardLimit Check  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35159 144 d 2 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Fixed SD Credit HardLimit Check  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35150 145 d 16 h vikas /trunk/ Oppo Sale Rewards Duration Wise  
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/SaleRewardServiceImpl.java
35146 145 d 21 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ Fixed the build  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35132 146 d 21 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Added scheduled Tasks  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
35105 149 d 2 h vikas /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Oppo Sale Rewards  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
34946 180 d 1 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ abm sender  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ambreports/AbmReportSender.java
34836 213 d 20 h vikas /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Employee task wise report scheduled at 04:00 PM, 09:00 PM  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
34770 235 d 20 h vikas.jangra /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Employee task wise report  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
34710 249 d 2 h amit.gupta /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Added Credit Related changes  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
34563 291 d 4 h vikas.jangra /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Consolidated Bid Message  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/monitored/CronJobMonitorAspect.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
34547 292 d 23 h vikas.jangra /trunk/profitmandi-cron/src/main/ Bidding push notifications  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-cron/src/main/resources/META-INF/prod.properties

Show All