| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36785 |
2 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some enhancement and bug fixes |
|
| 36784 |
33 m |
vikas |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Location Tracking - From Punch IN |
|
| 36783 |
1 h 30 m |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Location Tracking - From Punch IN |
|
| 36782 |
2 h 8 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 |
3 h 31 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some Enhancements or changes |
|
| 36780 |
3 h 39 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 |
4 h 0 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 |
4 h 14 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 |
4 h 25 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/wallet/ |
Remove unused getOpeningTillExcludingPurchase (no callers) |
|
| 36776 |
4 h 25 m |
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 |
5 h 7 m |
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 |
5 h 8 m |
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 |
5 h 53 m |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
some Enhancements or changes |
|
| 36772 |
21 h 27 m |
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). |
|
| 36771 |
21 h 43 m |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/ |
code commit for self lead creation |
|
| 36770 |
22 h 49 m |
aman |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/ |
Fix:Get Invoice Number is order detail |
|
| 36769 |
23 h 10 m |
amit |
/trunk/ |
Account statement: select the month-end scheme/margin credit notes by margin_month instead of cn_date.
Added CreditNoteRepository.selectByMarginMonth(fofoId, YearMonth) - fofo-scoped, keyed on margin_month passed as a YearMonth so the generic repo matches it as a whole-month range (robust to the stored day). populateData now uses it for the month-end CN block. margin_month is the explicit margin-period field (always populated for MARGINS and CN_CANCELLATION; RETURNS have none and are naturally excluded, consistent with returns being sourced from returnorderinfo). |
|
| 36768 |
23 h 29 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ |
Restore ActivatedImei.checked idempotency guard (revert r36579)
r36579 removed the 'ai.checked = false' filter from selectMissedActivationSale
and dropped the checked field, treating it as dead. It was not: the filter
prevented the daily activation-scheme sweep from re-processing the ~163K
already-evaluated historical activations (checked=1). Without it, the sweep
resurrected those old activations as PENDING scheme_in_out rows, and the
oldest ones (whose legacy orders have no fofo_order) made processActivation
throw FFORDR_1000 and roll back the entire batch every run since 2026-05-18,
stalling all special-support credits.
Restores the checked field + accessors and the 'ai.checked = false' filter.
checked column repopulated on fofo.activated_imei from backup; rogue PENDING
rows cleaned up separately. |
|
| 36767 |
23 h 58 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36766 |
1 d 6 h |
vikas |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ |
Punch, Check, Deferred handling improvements and mapbox |
|