Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37074 4 d 20 h amit /trunk/profitmandi-dao/src/main/resources/sql/ Add T3.1 re-tag SQL: manual scheme-reversal legs ADDITIONAL_SCHEME -> OTHERS

One-time reconciliation applied to hadb1: 19 manual scheme/incentive clawback
wallet legs (Rs 2,25,110) whose offer_payout was never rejected (MARGINS CN still
stands) were re-tagged ADDITIONAL_SCHEME -> OTHERS so the account-statement
scheme-adjustment line nets out. Money unchanged (reference_type + description
only). Includes backup + verify + rollback. Backup table
transaction._bak_addl_scheme_others_20260710.
 
37030 11 d 16 h amit /trunk/profitmandi-dao/src/main/ Add credit block/unblock audit log (dao): CreditBlockLog entity/enum/repo + blockCredit/unblockCredit/getCreditBlockLogs service methods  
36999 16 d 13 h amit /trunk/profitmandi-dao/src/main/ Price-hike deduction (self-contained): revert hike logic from price-drop flow + remove deduct_on_hike flag; add GRN hook (PurchaseServiceImpl, before schemes) and on-demand executor endpoint that debit under-charged units billed in the hike's [affected_on, created_on] window. Idempotent per (hike, imei).  
36977 17 d 16 h amit /trunk/profitmandi-dao/src/main/ Price-hike deduction: add deduct_on_hike flag; process flagged hikes as symmetric mirror of drops (wallet debit + scheme reverse/recompute); remove getPayouts price-increase clamp so hikes raise scheme/offer margin  
36958 18 d 15 h amit /trunk/profitmandi-dao/src/main/ Flagship credit: fire interest-free limits at billing + per-IMEI conversion

- createLoanForBilling now detects flagship lines inside the billing transaction (fixes the
REQUIRES_NEW visibility bug where flagship detection re-queried uncommitted invoice_number and
never fired). Creates one combined flagship limit (is_flagship=1, limit_block=1, 30-day deadline)
plus one transaction.loan_imei row per device.
- convertFlagshipOnSale / IMEI activation now convert only the sold device's slice (matched by IMEI),
so same-model siblings and other billing tranches keep their interest-free window; full convert at
30-day expiry. Lock order aligned (loan -> loan_imei) to avoid sale/expiry deadlock.
- New transaction.loan_imei table + LoanImei entity/repository (migration_loan_imei_table.sql).
- selectAllLoansByInvoice: PurchaseReturn now settles BOTH the real loan and the flagship limit on a
flagship-invoice return (prevents credit leak from a stranded limit).
- Cap guard (flagship credit never exceeds amount drawn) and robust limit settlement (paisa threshold
instead of exact float equality).
 
36943 22 d 14 h amit /trunk/profitmandi-dao/src/main/ hdfc_payment: add credited flag to fix blocked manual add-money approval

Since r36927 the HDFC push-credits flow captures every payment into
hdfc_payment BEFORE validating the virtual account, so VA-missing/unmatched
rows are stored uncredited. The manual add-money approval guarded on mere
row existence, wrongly blocking these recoverable payments.

Add a credited flag (default false) set true only when a wallet credit
actually happens. Includes migration + backfill (reference=id AUTOMATED_ADVANCE
match, plus pre-r36927 rows credited by construction).
 
36926 23 d 16 h amit /trunk/profitmandi-dao/src/main/ Link returnorderinfo to credit_note in DN-refund path (approveDebitNoteRefund)

approveDebitNoteRefund issues a RETURNS credit note but created the
ReturnOrderInfo rows before the CN and never set credit_note_id, so DN
returns showed a null FK (blank CN in reports) despite a valid CN existing.
r36817 only wired this FK into applyInvoiceReturnViaCreditNote. Collect the
created ReturnOrderInfo rows and stamp credit_note_id after the CN is
persisted (parity with the invoice-return path).

Add backfill_dn_return_credit_note_id.sql to link existing null-FK rows by
invoice -> RETURNS CN, excluding ambiguous multi-CN invoices.
 
36910 24 d 18 h amit /trunk/profitmandi-dao/src/main/ Internal PO: map created transaction to PO; block warehouse change for PO-mapped orders

- WarehousePurchaseOrder: add transactionId column + selectByTransactionId
- createOrderInternally returns txn id; createPurchaseOrder maps it onto the PO
- Block order.setWarehouseId for PO-mapped orders in changeFulfillmentWarehouse; cron moveOrders skips them
- Migration: add warehouse.purchaseorder.transactionId
 
36894 26 d 15 h amit /trunk/profitmandi-dao/src/main/ HID allocation: requested qty is now an additional one-time allowance (purchase-limit override, HID target unchanged); add approved_by column; add 5-day billed/activated serial lookups for the edit screen  
36888 26 d 18 h aman /trunk/ Feat: Editable Contact-Us page (add/edit/delete) for authorised users

- New fofo.contact_us table backs main + escalation lists (ContactUs entity, ContactUsRepository, contact_us.sql seed of current 40 rows)
- DashboardController: load lists from DB + editor flag; POST /contactUs/save and /contactUs/delete (soft delete), gated to kangan.monga/neha.sharma/gaurav.mathur1
- contact-us.vm renders dynamically with add/edit/delete + modal shown only to editors; contact.js handlers
- NOTE: run contact_us.sql on prod fofo DB before deploying the WAR (no auto-DDL)
 
36817 38 d 15 h amit /trunk/profitmandi-dao/src/main/ Link returnorderinfo to credit_note via credit_note_id FK

Add a direct credit_note_id column on returnorderinfo so a return row
can be tied to the Credit Note it was refunded via, replacing the
indirect/ambiguous association through original_invoice_number + the CN
number embedded in refundDescription. Stamped in
applyInvoiceReturnViaCreditNote; migration adds the column and backfills
existing rows by parsing the CN number out of refundDescription.
 
36796 40 d 16 h amit /trunk/profitmandi-dao/src/main/resources/sql/ Add migration: void net-settled stranded status=0 orders

Captures the two ad-hoc cleanups run on hadb1 (the live DB): rejected-txn orders
the PO_REJECTED backfill missed (non-standard refund) -> PO_REJECTED(91), and
non-rejected status=0 orders whose wallet debit was reversed by a non-standard
entry -> refund_timestamp. Net-settled only; net-committed/awaiting-approval POs
left untouched. Temp-table form to avoid locking the live DB. Idempotent.
 
36795 40 d 17 h 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.
 
36790 43 d 17 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.
 
36713 52 d 11 h amit /trunk/profitmandi-dao/src/main/ PI idempotency fix: original_wallet_amount + order_wallet_adjustment tracking for price drops and splits. Modernize statement queries with INVOICE_CANCELLED and RETURNS_CN unions.  
36711 52 d 12 h ranu /trunk/ beat plan info commit  
36691 53 d 13 h amit /trunk/profitmandi-dao/src/main/ fix account statement balance gap: include pending orders with NULL billing/refund in getPendingIndentValueMap, fix double query execution in selectOpeningAmount, remove verbose logging in selectDetailsBetween, add indexes for returnorderinfo and returnorder  
36681 53 d 17 h ranu /trunk/ beat plan info commit  
36675 54 d 11 h amit /trunk/profitmandi-dao/src/main/ Add irn_error_message column to einvoice_details entity and migration SQL  
36655 56 d 13 h ranu /trunk/ beat plan info commit  

Show All