Subversion Repositories SmartDukaan

Rev

Go to most recent revision | Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36578 64 d 11 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Flagship credit: fix sale conversion to use invoice reference, add IMEI activation trigger

- Sale flow: removed unnecessary model_flagship table lookup at sale time. The flagship loan's invoice number already links to the purchase orders, making the date-based check redundant and incorrect (would miss conversions if flagship entry removed after billing).
- IMEI activation: added flagship conversion in addActivatedImeis() for newly activated serials. Groups by partner, checks flagship limits, converts via invoice matching. Covers Samsung/Vivo/Oppo/Realme activation crons and manual UI uploads.
- Repository: added date-parameterized selectActiveFlagshipCatalogIds(catalogIds, asOfDate) overload for future use. Existing method delegates with LocalDate.now().
 
36577 64 d 12 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Bump cssVersion to 46  
36576 65 d 4 h amit /trunk/profitmandi-fofo/src/main/webapp/resources/css/ Fix mobile responsive: sidebar relative positioning, full-width overlay, proper close/open toggle, clean up obsolete rules  
36575 65 d 11 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Bump cssVersion to 45  
36574 65 d 11 h amit /trunk/profitmandi-fofo/src/main/webapp/ Standard layout: full-width header at top, sidebar starts below header at top:60px, reduced sidebar menu margin  
36573 65 d 12 h amit /trunk/ refactor: extract RTV methods from PurchaseReturnService into ReturnToVendorService, add ReturnPermissionHelper and PurchaseReturnOrderStatus  
36572 65 d 12 h amit /trunk/ fix: add debit note PDF labels, HDFC UTR duplicate lock, AJAX error handlers in common.js  
36571 65 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/ fix: add transient orderItems list field to FofoOrder for order creation response  
36570 65 d 12 h amit /trunk/profitmandi-fofo/src/main/webapp/ Fix header/content layout: header pinned top:0 left:180px, wrapper block+border-box, dashboard zoom on wrapper only, visible menu arrows, accessories tile aligned with brand tiles  
36569 65 d 12 h amit /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Replace generic icons with distinct ElegantIcons in partner dashboard sidebar  
36568 65 d 12 h amit /trunk/ refactor: RTV - add local caching, batch queries, typed DTO, fix documentNumber overwrite and settledAmount validation  
36567 65 d 12 h amit /trunk/profitmandi-dao/src/main/resources/sql/ Add SQL migration for sidebar menu icons (ElegantIcons per parent menu)  
36566 65 d 12 h amit /trunk/profitmandi-fofo/src/main/ UI modernization: sidebar redesign with CSS transitions, distinct menu icons, ellipsis overflow, flexbox header, HTML cleanup, improved text contrast  
36565 65 d 13 h amit /trunk/profitmandi-dao/src/main/resources/sql/ Remove commented-out migration step from model_flagship DDL - no existing flagship data  
36564 65 d 13 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ Flagship credit: add @Scheduled cron for expired flagship limit conversion (daily 1 AM)  
36563 65 d 13 h amit /trunk/profitmandi-fofo/src/main/ Flagship credit: admin UI for date-wise flagship model management, jsVersion bump to 338  
36562 65 d 13 h amit /trunk/profitmandi-dao/src/main/ Flagship credit: date-wise model_flagship table, sale-time conversion with pessimistic locking, batch queries, extracted doConvertFlagshipToLoan helper, removed Catalog.isFlagship  
36561 65 d 14 h amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ Flagship credit: @Scheduled daily 1AM for expired flagship conversion  
36560 65 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Flagship credit: sale-time conversion with FOR UPDATE locking and performance optimizations

- convertFlagshipOnSale: partial conversion at billed price when retailer sells flagship stock
- hasActiveFlagshipLimits: cheap COUNT check to skip catalog lookup for non-flagship partners
- selectActiveFlagshipLimitBlocksForUpdate: pessimistic lock prevents double-conversion from concurrent sales/cron
- selectFlagshipLoansForConversion: added FOR UPDATE lock for cron expiry path
- Batch order fetch instead of per-limit queries
- Wired into OrderServiceImpl.createOrder after stock update
 
36559 65 d 14 h amit /trunk/profitmandi-dao/src/main/ feat: auto-generate debit notes on RTV with proper DN/{prefix}/{sequence} numbering  

Show All