| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 37630 |
1 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/ |
feat(mail): wire inactive-recipient filter and clean hardcoded addresses
Wire MailRecipientFilter into googleMailSender and gmailRelaySender. Remove inactive/unknown addresses from recipient and access lists, bulk uploader gate to akhil.kumar. |
|
| 37590 |
5 d 18 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Route admin wallet adjustment through WalletServiceImpl
/walletUpdate hand-rolled the balance update and history row, bypassing the
service entirely, and read the wallet with selectByRetailerId instead of
selectByRetailerIdForUpdate - so unlike every other wallet path it took no row
lock, and a concurrent adjustment and purchase could lose an update.
Now calls walletService.applyManualAdjustment, which reuses getManualReference
for the reference allocation and routes the movement through
addAmountToWallet/consumeAmountFromWallet(forced). Behaviour is preserved: admin
debits stay forced, so they can still push a wallet negative as before. Removes
~45 duplicated lines. |
|
| 37539 |
9 d 23 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed mail sender everywhere |
|
| 37171 |
48 d 23 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Wallet page: show sanctioned credit limit tile alongside utilization/total due; format amounts via currency class + formatCurrency on load; jsVersion 388 |
|
| 37124 |
60 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
ok |
|
| 37065 |
68 d 17 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Block scheme/CN-backed reference types from the wallet bulk-upload sheet
Manual scheme/incentive clawbacks posted from /wallet/upload as ADDITIONAL_SCHEME
(or any CN_WALLET_REFERENCES type) leave the offer_payout un-rejected, so the
month-end MARGINS credit note is over-issued and the account-statement
scheme-adjustment line breaks. Pre-validate the whole sheet and reject up-front;
manual scheme recoveries must be posted as OTHERS. |
|
| 37031 |
71 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Credit block/unblock UI + Kred cleanup (fofo): rename activateKred/deactivateKred -> blockCredit(reason)/unblockCredit(logs)/switchCreditGateway, add block/unblock modals + credit-block-logs fragment, bump jsVersion 372->373 |
|
| 37018 |
72 d 17 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
revival and focus bill be active on next billing |
|
| 36965 |
78 d 18 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
hdfc add-money: set credited flag on manual approval too
WalletController.addAmountToWallet now marks the matching hdfc_payment row
(by UTR) credited=true after a manual top-up credits the wallet. Makes the
credited flag mean 'credited by any path' (auto OR manual), so a later
duplicate approval or re-pushed HDFC credit for the same UTR cannot
double-credit. Complements the auto-path flag-set in HdfcPaymentController. |
|
| 36944 |
82 d 19 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
hdfc add-money: guard manual approval on credited flag + fix checkManualPayments
WalletController.addAmountToWallet now blocks a manual add-money approval only
when the UTR was actually auto-credited (hdfcPayment.isCredited()), not on mere
hdfc_payment row existence — so post-r36927 captured-but-uncredited rows
(VA missing/unmatched) are approvable again.
HdfcPaymentController: set credited=true on the captured row after a successful
wallet credit; fix checkManualPayments to filter on getStatus() (was comparing
transaction_reference String to an enum, always false) so an already-approved
manual payment correctly short-circuits the auto-credit (closes the reverse
double-credit path). |
|
| 36928 |
83 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix wallet-edit transaction search showing raw Velocity vars for credit summary
getWalletHistory (/getWalletHistory, the Search-by-transaction-id flow) rendered
wallet-history.vm without populating totalDue/creditlimit/availableLimit, so the
template printed the references literally. Populate them from
sdCreditService.getCreditSummary (same helper the dashboard uses). |
|
| 36904 |
85 d 19 h |
aman |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix FSP wallet approval blocked by cross-store reference collision
Scope the duplicate-reference guard in /addAmountToWallet to the same retailer.
Reference numbers (e.g. cheque no '000310') are not globally unique, so an
already-approved request from a different store falsely tripped 'Entry already
Approved Please reject' and blocked a legitimate Full Stock Payment approval. |
|
| 36831 |
97 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: reconcile month-end scheme line to wallet net; exclude loan from statement
- Add a "Scheme adjustment (per wallet)" line at each month-end = wallet scheme net minus
margin CN total, so the running balance follows the actual wallet (source of truth)
instead of the CN gross. Surfaces scheme reversals (e.g. demo-convert) that margin CNs
miss, instead of burying them in the FLOAT DIFF / rounding line.
- Statement excludes loan/interest entirely (closing = wallet + pending indent): keep
CREDIT_LIMIT/CREDIT_UTILIZED/LOAN/LOAN_REPAYMENT legs in the body so it reconciles to the
loan-free closing; drop the INTEREST ACCRUED line and interestAccruedCost plumbing. |
|
| 36801 |
100 d 18 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36780 |
104 d 22 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) |
|
| 36776 |
104 d 23 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 |
104 d 23 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 |
|
| 36772 |
105 d 16 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). |
|
| 36769 |
105 d 17 h |
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). |
|
| 36755 |
106 d 22 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: relabel the reconciling line as 'FLOAT DIFF' (rounding/float only).
It is not pending indent or a cross-period movement - with clean data it is only a few rupees of float. A large value indicates a data issue (e.g. MARGINS CN not yet rolled out) and is surfaced by the existing reconciliation warning. |
|
| 36754 |
106 d 23 h |
amit |
/trunk/ |
Account statement (Excel): reconcile running balance to net standing (wallet + pending indent - loan).
- populateData: categorised lines, scheme/margin shown as month-end MARGINS credit note (CN_CANCELLATION and negative-net CNs rendered as debit notes), interest-accrued line as the standing-moving loan cost, and a net-pending-indent/diff line that lands the running balance on closing.
- Returns shown individually from returnorderinfo (one credit line per return, against its invoice on refundedAt); billing-query RETURNED/RETURNS_CN suppressed to avoid double count.
- Exclude PURCHASE and CREDIT_LIMIT/CREDIT_UTILIZED (loan cash legs) from the wallet body.
- LoanStatementRepository.getInterestAccruedBetween; ReturnOrderInfoRepository.selectReturnsBetween. |
|
| 36746 |
108 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Restore Total Payables and Credit Utilization fields on wallet statement dashboard (NPE-safe via creditSummary) |
|
| 36720 |
112 d 15 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Remove redundant credit section from wallet dashboard: fixes NPE for users without SD Credit, credit info already available in partner report |
|
| 36513 |
129 d 17 h |
amit |
/trunk/ |
Add running_balance to userwallethistory: persist wallet balance after each transaction for instant ledger display. Populate at all write paths (WalletService, adjustTransaction). Read directly in wallet statement template and CSV download. Includes backfill migration SQL. Renamed walletSummart to walletSummary. |
|
| 36500 |
131 d 17 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
l3 and avobe show all warehouse stock |
|
| 36401 |
142 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked |
|
| 36242 |
159 d 16 h |
aman |
/trunk/ |
Fix:Attachment is Full-stock payment approval ,Timeline ui graphical summary, wod initianl mail after store code creation |
|
| 36064 |
175 d 15 h |
aman |
/trunk/ |
Fix:FULL_Stock flow , fin service mark unapplicable ,send invoice to whatsapp by default, update contact list ,Training mail issue |
|
| 35971 |
191 d 16 h |
aman |
/trunk/ |
Feat : Loi 2.0 Enhancement and redesigning |
|
| 35811 |
208 d 13 h |
amit |
/trunk/ |
Centralize credit/loan summary: CreditSummary DTO, bulk query, fix stale utilization, re-enable overdue check, fix interestPaid bug, optimize fresh money (3 queries vs 21), remove dead code |
|
| 35572 |
241 d 11 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fix: Remove duplicate persist in wallet approval
The addWalletRequest status was already being updated in memory,
and the entity is managed by Hibernate session - no explicit persist needed. |
|
| 35458 |
270 d 15 h |
amit |
/trunk/ |
Revert @Transactional(readOnly=true) - keep @Transactional only at Controller level
Changes:
- profitmandi-web: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional(readOnly = true)
- profitmandi-fofo: Controllers use @Transactional(rollbackFor = Throwable.class) at class level, removed method-level @Transactional
- profitmandi-dao: Removed @Transactional from services/repositories
Exceptions (called from interceptors, need own transaction):
- RoleManager: @Transactional(readOnly = true) - called from interceptor for auth
- PartnerTypeChangeServiceImpl.getBestPartner(): @Transactional - called from JWTUtil via interceptor
Fixed javax.transaction.Transactional to org.springframework.transaction.annotation.Transactional
Fixed rollbackOn to rollbackFor for Spring compatibility |
|
| 35197 |
337 d 16 h |
amit |
/trunk/ |
Fixed Add Wallet Request Logic |
|
| 34982 |
371 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Update |
|
| 34712 |
447 d 20 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
donotcommit |
|
| 34527 |
498 d 21 h |
tejus.lohani |
/trunk/ |
hdfc payment report and investometer in partner dashboard |
|
| 34441 |
513 d 23 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
wallet statement download and account statement download problem fix |
|
| 34440 |
513 d 23 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
config |
|
| 34435 |
515 d 20 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
upi payment capture details modification and remove admit check in wallet statement download and account statement download so that partner download his account and wallet statement |
|
| 34261 |
561 d 19 h |
tejus.lohani |
/trunk/ |
Give (a pending,approved,reject)add-wallet-req report |
|