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
36459 79 d 20 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ mail out box queue added in default loans  
36458 79 d 20 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ mail out box queue added in default loans  
36457 79 d 20 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ mail out box queue added in default loans  
36456 79 d 20 h aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Update Contact us list  
36455 79 d 21 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ Fix: populate saleQtyByKey for serialized items too, include DOA_IN in returnQtyByKey  
36454 81 d 14 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Add request/response logging to refundDebitNote endpoint  
36453 81 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fix NPE in credit note IRN: modularize InvoiceService.getInvoicePdfModel into core (ForIrn) and enrichment (EWB/eInvoice), switch purchase return CN to model-based IRN builder  
36452 81 d 15 h amit /trunk/profitmandi-fofo/src/main/webapp/ Add reference field to offer/scheme create forms and admin views  
36451 81 d 15 h amit /trunk/profitmandi-dao/src/main/ Add reference field to catalog.offer and catalog.scheme for payout collation  
36450 81 d 15 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Refactor applyReceipt: extract scan creation to WarehouseInventoryService.recordReturnScan with validation for all return types (SALE_RET/DOA_IN/SALE_RET_UNUSABLE), qty>0, sold-qty capacity check, and SALE_RET warehouse capacity check  
36449 81 d 16 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ Fix duplicate PurchaseReturnItem creation for serialized items - use list query with CREATED/APPROVED status check instead of single-result query  
36448 82 d 9 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ DN lifecycle: add acknowledge rejected return V2 REST endpoint for partnerapp  
36447 82 d 9 h amit /trunk/profitmandi-fofo/src/main/ DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS handler

- Add PUT /return/debit-note/reject/acknowledge/{debitNoteId} endpoint
- invoice-return.vm: Rejected-Pending Acknowledgment + Cancelled status labels, Acknowledge Receipt button
- return.js: click handler for acknowledge-rejected-return
 
36446 82 d 9 h amit /trunk/profitmandi-dao/src/main/ DN lifecycle: decouple rejection from restore, add DebitNoteStatus, retailer acknowledgment flow

- Add DebitNoteStatus enum (CREATED/RECEIVED/APPROVED/REJECTED/CANCELLED) on debit_note table
- Add retailer_acknowledge_timestamp on purchase_return_order
- rejectReturn() no longer calls restoreReturnedItems() — inventory stays reduced until retailer confirms goods received back
- New acknowledgeRejectedReturn(): retailer confirms receipt, restores inventory+schemes+offers, DN→CANCELLED
- Set DN status in receiveDebitNoteItems (RECEIVED), refundOrder (APPROVED), rejectReturn (REJECTED)
- notifyReturnRejected: updated message, added Finance L1+L2 to CC
- notifyItemsReceived: added Finance L1
- New notifyRejectedGoodsAcknowledged notification
- SQL migration with backfill for existing data
 
36445 82 d 13 h ranu /trunk/ knowlarity username password update  
36444 82 d 13 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/knowlarity/ uday sing maill added in po approval  
36443 82 d 17 h amit /trunk/profitmandi-dao/src/main/resources/sql/ Add ALTER TABLE migration to rename monitor_type normal to base  
36442 82 d 19 h amit /trunk/profitmandi-fofo/src/ Rename monitor type 'normal' to 'base' in controller, validator, UI, and tests  
36441 82 d 19 h amit /trunk/profitmandi-dao/src/main/ Rename monitor type 'normal' to 'base' in enum and SQL schema  
36440 82 d 20 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Set outlet_name from retailerAddress on FofoStore creation in RetailerController  

Show All