| 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 |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/fofo/DebitNoteStatus.java /trunk/profitmandi-dao/src/main/resources/sql/migration_dn_status_retailer_ack.sql
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnOrder.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnNotificationServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
|
| 23539 |
2947 d 21 h |
amit.gupta |
/trunk/ |
Added debit notes for return |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Test.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/recharge/RechargeServiceImpl.java /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 23509 |
2953 d 2 h |
amit.gupta |
/trunk/ |
Checking in Returns and added cron like behaviour to profitmandi |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/enumuration/PurchaseReturnStatus.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/DebitNotePdfModel.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/DebitNote.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PurchaseReturnItem.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/DebitNoteRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseReturnItemRepositoryImpl.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/Utils.java /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/web/client/RestClient.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InventoryItem.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/InvoiceNumberGenerationSequence.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/SchemeInOut.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/GenericRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/InventoryItemRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepository.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/user/UserRepositoryImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/indent/IndentServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/InventoryServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletService.java /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/WalletServiceImpl.java /trunk/profitmandi-fofo/src/main/resources/META-INF/prod.properties
|