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
36454 3 d 15 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Add request/response logging to refundDebitNote endpoint  
36453 3 d 15 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 3 d 16 h amit /trunk/profitmandi-fofo/src/main/webapp/ Add reference field to offer/scheme create forms and admin views  
36451 3 d 16 h amit /trunk/profitmandi-dao/src/main/ Add reference field to catalog.offer and catalog.scheme for payout collation  
36450 3 d 17 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 3 d 17 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 4 d 10 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 4 d 10 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 4 d 10 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 4 d 14 h ranu /trunk/ knowlarity username password update  
36444 4 d 14 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/knowlarity/ uday sing maill added in po approval  
36443 4 d 18 h amit /trunk/profitmandi-dao/src/main/resources/sql/ Add ALTER TABLE migration to rename monitor_type normal to base  
36442 4 d 20 h amit /trunk/profitmandi-fofo/src/ Rename monitor type 'normal' to 'base' in controller, validator, UI, and tests  
36441 4 d 20 h amit /trunk/profitmandi-dao/src/main/ Rename monitor type 'normal' to 'base' in enum and SQL schema  
36440 4 d 22 h amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Set outlet_name from retailerAddress on FofoStore creation in RetailerController  
36439 4 d 22 h amit /trunk/profitmandi-dao/src/main/ Add outlet_name field to FofoStore entity, set from address.name on store creation

Adds outlet_name (VARCHAR 255) to FofoStore entity so the store's display
name is persisted directly on fofo_store instead of requiring a join through
retailer_registered_address -> address every time it is needed.

Sets fofoStore.setOutletName(retailerAddress.getName()) in both creation
paths: RetailerServiceImpl.createFofoStoreCodeByRetailerId (primary) and
RetailerController.createFofoStore (secondary).

Includes migration SQL script (migration_outlet_name_to_fofo_store.sql) to
ALTER TABLE and backfill existing rows from address.name. Must be run during
low-traffic window - fofo_store is heavily queried and ALTER takes a metadata
lock that blocks all concurrent SELECTs.
 
36438 4 d 22 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix SD Credit over-utilization: use live loan SUM + row lock + sanction guard

- blockLoan: use SELECT FOR UPDATE to prevent concurrent orders from both passing credit check
- processLoanRequest: replace stored utilized_limit counter with live SUM(pending_amount) from loan table
- processLoanRequest + getAvailableAmount: only add sanction amount if not already used today
- Prevents credit limit from going negative due to counter drift or race conditions
 
36437 4 d 23 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/ Fix  
36436 5 d 16 h ranu /trunk/ without vendor catalog pricing po will not create  
36435 5 d 20 h aman /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fix:Mark Inauguration Timestamp & Create Store Timeline Entry on Training Completion  

Show All