Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37058 7 d 11 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Add regenerateBilledInvoices CLI task (--fromTime/--toTime) to re-generate invoice PDFs over a billing window; qualify InvoicePdfModel reference after the PdfUtils/DocumentRenderer refactor  
/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/ScheduledTasks.java
36863 31 d 1 h vikas /trunk/ Updated Redesigned Tracking Report  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/LocationTrackingServiceImpl.java
36585 60 d 13 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/ code commit for levwel wise trcking report  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
36584 60 d 13 h ranu /trunk/ code commit for levwel wise trcking report  
/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/LocationTrackingServiceImpl.java
36554 62 d 19 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ feat: one-off credit note posting for duplicate invoice NSNOI8965 against NSNOI8966  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
36420 80 d 7 h amit /trunk/profitmandi-cron/ OkHttp→RestClient migration for IMEI activation services (Itel, Tecno, Vivo). Added test deps. Updated RunOnceTasks, ScheduledTasks, OrderTrackingService.  
/trunk/profitmandi-cron/build.gradle
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/itelImeiActivation/ItelImeiActivationNewService.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/itelImeiActivation/ItelImeiActivationService.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/itelImeiActivation/TecnoImeiActivation.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-cron/src/main/java/com/smartdukaan/cron/scheduled/VivoImeiActivationService.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ordertracking/OrderTrackingService.java
36402 81 d 10 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked  
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/OnBoardingRelatedSchelduleTask.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/Reconciliation.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/TicketRelatedScheduledTask.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/razorpay/FetchPartnersDisbursementTask.java
36053 115 d 7 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Fix cancelDn: bug fixes, wallet reversal, RETURNED guard, recreatePri option

- Fix itemId bug in CurrentInventorySnapshot (was using inventoryItem PK instead of catalog itemId)
- Fix NoSuchElementException on missing PURCHASE_RET scan record (findFirst().get() -> ifPresent)
- Reverse wallet refund via consumeAmountFromWallet if DN was already refunded
- Block cancellation if any PRI has RETURNED status (already refunded to wallet)
- Add recreatePri flag: true resets PRIs to CREATED for re-initiation, false deletes them
 
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/RunOnceTasks.java
35848 142 d 9 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 148 d 7 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 170 d 7 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 170 d 7 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 170 d 7 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 249 d 8 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 249 d 9 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 278 d 6 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 281 d 11 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 281 d 11 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 283 d 1 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 283 d 7 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

Show All