| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36791 |
11 m |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Mark rejected PO order rows on transaction rejection
In OrderController.updateApprovalStatus reject branch, after the wallet
refund and loan settlement, call cancelRejectedTransactionOrders so the
rejected PO's order rows move to PO_REJECTED and drop out of pending
indent. Previously they were left in status=0, permanently inflating the
partner's account-statement pending indent. Requires dao r36790. |
|
| 36790 |
11 m |
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. |
|
| 36789 |
1 h 25 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36788 |
2 h 0 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36787 |
2 h 33 m |
ranu |
/trunk/ |
some enhancement and bug fixes |
|
| 36786 |
19 h 39 m |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
some enhancement and bug fixes |
|
| 36785 |
19 h 45 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36784 |
20 h 17 m |
vikas |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Location Tracking - From Punch IN |
|
| 36783 |
21 h 13 m |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Location Tracking - From Punch IN |
|
| 36782 |
21 h 51 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ |
Fix YearMonth equals-predicate to match LocalDate columns (account statement 500)
The generic repo's YearMonth branch always built LocalDateTime bounds. For a
LocalDate column (CreditNote.marginMonth) those bounds are bound through the
auto-applied LocalDateAttributeConverter, which casts the value to LocalDate
and throws 'Error attempting to apply AttributeConverter' (GE_1007).
Surfaced by selectByMarginMonth (r36769) - the first YearMonth query against a
LocalDate column - which crashed the /account/statement endpoint for any
full-calendar-month range. Now mirrors the DateRangeModel branch: LocalDate
bounds for LocalDate columns, LocalDateTime bounds otherwise. |
|
| 36781 |
23 h 14 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some Enhancements or changes |
|
| 36780 |
23 h 23 m |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Rename reco CSV column header In Transit -> Unbilled PO (label only; calculation unchanged) |
|
| 36779 |
23 h 43 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ |
Fix NPE in selectPendingIndentWalletAmount for all-partners reco: exclude null-retailerId orphan orders (which formed a null GROUP BY key) and guard null group sums |
|
| 36778 |
23 h 57 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/ |
Fix account closing queries: cn.created_at -> cn.create_timestamp in selectOpeningAmount (r36719 missed it); remove dead single-partner selectOpeningAmount overload; correct pending-indent filter to exclude orders billed-before but refunded-after closingDate |
|
| 36777 |
1 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
Remove unused getOpeningTillExcludingPurchase (no callers) |
|
| 36776 |
1 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Remove redundant /account/closing-statements; repoint wallet-details closing button to /account/reco (now on the wallet+PI-loan model) |
|
| 36775 |
1 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Align /account/reco closing with individual account statement: closing = wallet + pending indent - loan outstanding; add Loan Outstanding column |
|
| 36774 |
1 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ |
Add bulk getLoanOutstandingAtDate (principal+interest per partner at a date) for account reco closing |
|
| 36773 |
1 d 1 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
some Enhancements or changes |
|
| 36772 |
1 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: per-CN scheme/margin lines + non-month-end raw-scheme fallback.
- Month-end: one 'Margin / Scheme Payout' line PER credit note (MARGINS net >=0 -> Credit Note (CN); CN_CANCELLATION or negative net -> Debit Note (DN), reducing the balance), referenced by CN number.
- Non-month-end statements: the trailing month's MARGINS CN isn't issued yet, so consolidate that month's raw scheme wallet entries into a single 'Margin / Scheme Payout' line placed at the end, just before the FLOAT DIFF. Keeps partial-period statements reconciling (verified AYAAN 01-15/04 float -1.97 vs 36,462 in the diff without it). |
|