| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 37803 |
12 d 1 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
feat(scheme): offer only serialized Ear Buds models in the scheme picker
Scheme payouts are IMEI-driven, so a non-serialized earbud can never earn one.
For category 10024 the scheme-creation brand list and model list now ask the
inventory service for serialized items only (the dao side is already in
trunk); LED TV and the other categories are unchanged. |
|
| 37799 |
12 d 8 h |
ranu |
/trunk/ |
offer-radar notification commit |
|
| 37798 |
12 d 9 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Show a settled debit note as settled instead of offering Receive
The DN screens decided everything from "does a purchase_return_order exist",
which no return settled before the receive workflow ever had. A note settled
years ago therefore read "Pending Receive" with a Receive button, and receiving
one handed a partner back a phone already returned, refunded and resold
(DN UPBLY975/4, IMEI 864973083197734).
The debit note's own status now carries the fact - CREATED means there is
genuinely something to receive, anything else means it is settled - so the
screens read it directly instead of re-deriving it from warehouse scans on
every page load. r37797 backfilled the 4,154 notes the old flow left behind.
- invoice-return-results, debit-notes-table, debit-note-details,
receive-debit-note: Receive only while the note is CREATED with no return
order; otherwise "Processed - settled earlier".
- debit-notes-table: Refund only on a note received and not yet settled,
rather than on every row.
- PurchaseReturnController: the admin debit-note list now loads the return
orders its Refund button needs.
Deploy with profitmandi-dao r37797. |
|
| 37794 |
12 d 10 h |
ranu |
/trunk/ |
offer-radar notification commit |
|
| 37791 |
12 d 11 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Sale returns: Finance-only B2C settlement after a NIC GSTIN refusal
Once NIC has refused a return because the buyer's GSTIN is cancelled or
invalid, only Finance may act on it - approve, retry or reject. The pending
queue shows the refusal reason and, on the day it happened, a "Refund as
B2C" action; Logistics sees "IRN failed - awaiting Finance" and no buttons.
The B2C screen states NIC's reason and every returned line with its value
including and excluding GST, and fixes the refund at the value net of GST
in whole rupees. Finance types that figure back by hand, enters a remark and
ticks the consent box before the button enables; the server re-checks the
amount, the remark, the consent and the same-day window, so the screen is a
convenience and not the control. Cancelling or finishing returns to the
queue, and a refused approval now reloads the queue so the B2C action
appears without a manual refresh.
jsVersion 438 -> 439 for return.js. |
|
| 37787 |
14 d 3 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
feat(partner-access): demo grant picker lists Platinum partners only
Partner multi-select on Demo Partner Access filters active partners to the
current effective tier PLATINUM (PartnerTypeChangeService.getTypesForFofoIds,
same lookup as Indent/Order Management). Active grants table unchanged. |
|
| 37784 |
15 d 10 h |
vikas |
/trunk/ |
Corrected LMS Data and Added filter |
|
| 37783 |
15 d 10 h |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Corrected LMS Data |
|
| 37780 |
15 d 12 h |
amit |
/trunk/profitmandi-fofo/src/ |
feat(partner-access): demo partner access page + validation
- Demo Partner Access page (Admin Control): grant partners to a Sales person,
list and revoke active grants; server-guarded by canManage
- Partner access dropdown: position partners + active demo partners "(Demo)";
shared cached mapping is copied, never mutated
- /login-as-partner-readonly: partner must be in caller's positions or demo
grants (was unchecked; Partner access is its only caller)
- /mobileapp?emailId=: Sales position holders get the partner app token only
for position/demo partners; other admins (Partner Info) unchanged
- DemoPartnerAccessTest (5, local DB, rolled back)
- jsVersion 437
Needs dao r37779 and migration_demo_partner_access.sql applied. |
|
| 37777 |
16 d 5 h |
amit |
/trunk/profitmandi-fofo/src/ |
returns: finance endpoint to reverse a return whose goods never reached the warehouse
PUT /return/reverse?imei=&reason=&dryRun= calls ReturnReversalService (r37776) for one
IMEI. Finance only, same canRefund gate as the refund it undoes, and dryRun defaults to
true so a call without it reports the plan and writes nothing.
ReturnReversalTest covers the four cases against the local database with NIC on the
sandbox: the dry run writes nothing, a note past its 24h window issues a DBN and undoes
every effect of the refund (warehouse scan and stock, partner stock and offers, order
status, wallet, return item, debit note, audit row), a note inside the window has its IRN
cancelled and drops out of the statement, and bad input or a second reversal is refused.
Run it as `gradle :test --tests ...` - without the colon the filter also reaches
profitmandi-common and fails with "No tests found". |
|
| 37775 |
16 d 6 h |
ranu |
/trunk/ |
aging po approval process |
|
| 37773 |
16 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
fix: show live partner investment on sanction request approval screens
Total/short investment on /getSanctionRequest, /getRbmL2SanctionRequest and the
row re-render after submit now read the 2-minute partner_investment snapshot via
PartnerInvestmentService instead of yesterday's partner_daily_investment row. |
|
| 37770 |
16 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
fix(movement): GRN of a movement invoice validated against its own PO + billed IMEIs; Reopen removed; PO list shows Created By; supplier state from GSTIN; jsVersion 436 |
|
| 37765 |
16 d 8 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
feat(store-closure): closure popup with reason, remark and approval mail upload
- Close Store (inactive stores page and deactivate flow) opens one shared popup; /closeStore
delegates to StoreClosureService (dao r37764)
- store status access checks read StoreAccess lists; mohit.gulati removed from extend billing
- jsVersion 435 |
|
| 37761 |
16 d 12 h |
ranu |
/trunk/ |
aging po approval process |
|
| 37760 |
17 d 6 h |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Upload directory and Data correction for lead |
|
| 37750 |
17 d 7 h |
ranu |
/trunk/ |
aging sku purchasing need to approval of niranjan kala sir |
|
| 37749 |
17 d 7 h |
vikas |
/trunk/ |
Upload directory and Data correction for lead |
|
| 37748 |
17 d 10 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
today po rbm view showing only for l7 and above |
|
| 37747 |
17 d 10 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/ |
today po rbm view showing only for l7 and above |
|