Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37118 28 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ old version app disabled for rbm  
37117 18 h 10 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ adld ui launch for mannual  
37116 18 h 53 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37115 19 h 1 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Guard /partnerdeals/{id} against empty deal response: return DEAL_NOT_FOUND instead of 500 (IndexOutOfBoundsException on dealResponse.get(0)) when the catalog is not a matching partner deal in Solr  
37114 19 h 2 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/ Map refurbished mobile (category 10007) to Solr categoryId_i=3 like new mobile (10006), so refurb catalogs/combos surface under the Mobile deal category in both indexers (populateTagItems + updateSingleCatalog)  
37113 19 h 32 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Trial-registration GST duplicate check now via FofoStoreRepository.existsByGstNumber (fofo_store) instead of PrivateDealUserRepository.isActiveByGst  
37112 19 h 32 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/ Source trial-registration GST duplicate check from fofo_store instead of counter/privatedealuser: add FofoStoreRepository.existsByGstNumber, remove now-dead PrivateDealUserRepository.isActiveByGst (last reader of Counter.gstin)  
37111 19 h 35 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37110 20 h 17 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 20 h 18 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37108 20 h 24 m aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ contact updated  
37107 20 h 59 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37106 21 h 4 m ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/ v2 version some fixes  
37105 21 h 4 m amit /trunk/profitmandi-fofo/src/main/ Add non-prod password reset page for auth users and partners (HRMS); bump jsVersion to 380  
37104 21 h 5 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/ Add UserService.resetPasswordById for non-prod password reset by id  
37103 21 h 55 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ Remove dead PrivateDealUser.bulkShipmentAmountLimit writes in retailer creation  
37102 21 h 55 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 22 h 1 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 22 h 5 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 23 h 24 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.
 

Show All