Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36790 41 d 23 h amit /trunk/profitmandi-dao/src/main/ Add PO_REJECTED status and release rejected-PO orders from pending indent

Rejected bulk-PO approvals refunded the wallet but left order rows in
status=0 (PAYMENT_PENDING) with billing/refund NULL, so they were counted
by pending indent forever and inflated the account-statement closing
balance with no matching wallet liability.

- OrderStatus.PO_REJECTED(91) new terminal status for approval rejection
- OrderRepository.cancelRejectedTransactionOrders sets status + refund_timestamp
on a rejected transaction's still-pending orders (side-effect free: wallet
already refunded at txn level, these never-processed orders hold no reservation)
- backfill_po_rejected_orders.sql releases 485 historically-stranded orders
(Group A: wallet already refunded). Deploy code before running.
 
36624 56 d 21 h amit /trunk/profitmandi-dao/src/main/java/ Thrift cleanup: migrate types, remove dead code, add moved files

- Added Affiliate.java POJO (replaces Thrift struct)
- Moved from profitmandi-common: WalletHistoryModel, ExcelUtils, CustomOrder
- Removed dead createReturnTransaction method from ReturnService/Impl
- Removed dead getPartnerStockOnDate from InventoryService/Impl
- Replaced CatalogServiceException with Exception in PdfPoSheetGenerator
- Removed Thrift client imports from UserServiceImpl
 
36619 57 d 0 h amit /trunk/profitmandi-dao/src/main/java/in/ refactor: migrate Thrift enums/models to profitmandi-dao under in.shop2020 package

Moved 22 enum files and 2 model classes (Address, OrderStatusGroups) from ThriftConfig
to profitmandi-dao with same package structure. Stripped all org.apache.thrift dependencies
(TEnum interface, TBase, read/write/validate methods). OrderStatusGroups rewritten as clean
POJO keeping only constructor defaults and getter methods used by callers.