| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 37110 |
10 m |
aman |
/trunk/ |
Business-agreement e-sign gate between Full Stock Payment and PO creation
New AGREEMENT_ESIGN onboarding stage, verified by Legal (Gaurav Sharma):
- Hard-blocks first PO creation until the e-sign is verified (BulkOrderService),
mirroring the existing Full Stock Payment block.
- Agreement E-Sign panel (Partner Acquisition menu) listing FSP-done partners who
have not yet created their first PO: upload signed agreement + Gaurav-only verify.
- New agreement_esign table/entity + repository for the signed doc and audit trail.
- Timeline grid column + stepper stage for the new event.
Prod DB (separate, with sign-off): CREATE TABLE user.agreement_esign;
INSERT auth.menu + auth.menu_category rows for the panel. |
|
| 37109 |
11 m |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ |
v2 version some fixes |
|
| 37108 |
17 m |
aman |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
contact updated |
|
| 37107 |
51 m |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ |
v2 version some fixes |
|
| 37106 |
56 m |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ |
v2 version some fixes |
|
| 37105 |
57 m |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add non-prod password reset page for auth users and partners (HRMS); bump jsVersion to 380 |
|
| 37104 |
57 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/ |
Add UserService.resetPasswordById for non-prod password reset by id |
|
| 37103 |
1 h 48 m |
amit |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ |
Remove dead PrivateDealUser.bulkShipmentAmountLimit writes in retailer creation |
|
| 37102 |
1 h 48 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ |
Remove dead Counter/PrivateDealUser code: drop unused isFofo, bulkShipmentAmountLimit, verifiedOn, documentVerified fields and accessors; remove dead selectByIds repo methods; drop redundant Counter/PrivateDealUser repository injections in OrderServiceImpl and InvoiceService |
|
| 37101 |
1 h 53 m |
amit |
/trunk/profitmandi-fofo/src/main/ |
Guard blocked-brand mapping against null brand (server + JS); bump jsVersion to 379
getBlockBrandMappping now rejects null/blank/"null"/"0" brand before delete+persist,
and retailer-block-brands.js alerts instead of submitting when no brand is selected.
Stops literal "null" rows in dtr.retailer_block_brands. |
|
| 37100 |
1 h 57 m |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/ |
Simplify HDFC push-credits: drop Redis, store only credited payments
- Remove the Redis UTR lock entirely. It was redundant with the DB
UNIQUE(utr) + INSERT IGNORE dedup, and actively harmful: a concurrent
HDFC retry hit the Redis lock, got acked 'Duplicate', and stopped
retrying while the original rolled back on a wallet lock conflict --
losing the credit (4 lost credits Jul-11..15, all recovered manually).
- Store ONLY credited payments. Missing/unmatched-VA transfers are internal
onboarding virtual accounts reconciled via the separate account-entries
ledger, so they are no longer captured here. Removes the merely-captured
row states and the credited-vs-captured ambiguity.
- Drop the lock-conflict rethrow / isLockConflict helper. A credit failure
now simply propagates -> class @Transactional(rollbackFor=Throwable)
rolls the row back -> HDFC's own retry re-credits cleanly (no Redis lock
to swallow the retry).
Dedup now: manual-approval check + selectByUtrNo (a stored row means
credited) + INSERT IGNORE for the concurrent-retry race. |
|
| 37099 |
3 h 17 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ |
GRN: default supplier invoiceDate to received date when blank
Operators frequently leave invoiceDate empty on PO-based GRN uploads
(addPORowModels), persisting NULL invoice.invoiceDate (~26% of received
invoices historically). This breaks the warehouse ageing/valuation
reports that key off invoiceDate. Default it to the received date at the
single feed into addWarehouseSupplierInvoice, matching the historical
backfill convention. Fofo newReceiveInvoice already enforces this. |
|
| 37098 |
4 h 47 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ |
Align CatalogRepository.selectCatalog signature with impl param order (brand, modelNumber, modelName)
Interface declared (brand, modelName, modelNumber) while CatalogRepositoryImpl
binds equalsMap keys off its own params (brand, modelNumber, modelName). The lone
caller, ItemLoaderService.addItem, passes impl order, so lookups worked by accident.
Any new caller trusting the interface signature would have silently swapped
modelName/modelNumber and minted phantom catalogs on lookup miss.
Names only; binary signature (String,String,String) is unchanged, so behaviour and
all callers are unaffected. |
|
| 37097 |
22 h 14 m |
ranu |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
bulletin api giving us error |
|
| 37096 |
22 h 21 m |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
old version app disabled for rbm |
|
| 37095 |
23 h 54 m |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
old version app disabled for rbm |
|
| 37094 |
1 d 3 h |
ranu |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ |
v2 version some fixes |
|
| 37093 |
1 d 3 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
old version app disabled for rbm |
|
| 37092 |
1 d 5 h |
ranu |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
old version app disabled for rbm |
|
| 37091 |
1 d 21 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ |
Bulk orders: enforce combo requirements for RBM/SALES creators
Bulk PO path skipped combo validation, letting RBM/SALES-created bulk orders bill a
combo main without its required side(s). Now, when the creator holds an RBM(18) or
SALES(4) position, run the existing cart-path comboService.validateCombo on the
per-partner cart (already built via cartService.setCartItems) right before the
transaction is created. Restrict-only: throws 'Missing required Qty for Combo' if a
side is missing; never auto-injects. Gate fail-open; other creators (incl AUTO PO) unaffected. |
|