| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36795 |
30 m |
amit |
/trunk/profitmandi-dao/src/main/resources/sql/ |
Add pending-indent phantom-cleanup migrations (drafts + PAYMENT_FAILED)
selectPendingIndentWalletAmount counts any billing/refund-NULL order regardless
of status, so abandoned draft orders and old PAYMENT_FAILED orders inflated
partner 'unbilled PO' and broke finance reco.
- cleanup_abandoned_draft_orders.sql: 2019-21 never-submitted, wallet-never-debited
drafts (status=0, not rejected) -> PAYMENT_FAILED + refund_timestamp. ~1970 rows.
- cleanup_phantom_payment_failed.sql: 2017-19 PAYMENT_FAILED orders counted as
unbilled PO -> drop ONLY phantom (no-debit or net-settled) via refund_timestamp;
KEEP net-committed (real payable). Temp-table form to avoid locking the live DB.
Both data-only (no code), idempotent, ran on hadb1; pending prod + replicas. |
|
| 36794 |
1 d 21 h |
aman |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/ |
Fix:Branding->Verification |
|
| 36793 |
2 d 16 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
some enhancement and bug fixes |
|
| 36792 |
2 d 18 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36791 |
3 d 0 h |
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 |
3 d 0 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. |
|
| 36789 |
3 d 1 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36788 |
3 d 2 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36787 |
3 d 2 h |
ranu |
/trunk/ |
some enhancement and bug fixes |
|
| 36786 |
3 d 20 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
some enhancement and bug fixes |
|
| 36785 |
3 d 20 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36784 |
3 d 20 h |
vikas |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Location Tracking - From Punch IN |
|
| 36783 |
3 d 21 h |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Location Tracking - From Punch IN |
|
| 36782 |
3 d 22 h |
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 |
3 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some Enhancements or changes |
|
| 36780 |
3 d 23 h |
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 |
4 d 0 h |
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 |
4 d 0 h |
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 |
4 d 0 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
Remove unused getOpeningTillExcludingPurchase (no callers) |
|
| 36776 |
4 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) |
|