Subversion Repositories SmartDukaan

Rev

Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37143 1 h 16 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Brand eligibility: unified blocked + LOI-ineligible enforcement — new BlockedBrandService; BrandsService restrictedBrands/applyRestrictedSolrExclusion/validateOrderableBrands; hard-validate at add-to-cart (fofoId-aware addItemsToCart) and bulk order; cart validation uses restricted union  
37119 7 d 1 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ old version app disabled for rbm  
37110 8 d 1 h 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.
 
37091 9 d 22 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.
 
36936 28 d 4 h vikas /trunk/ Update Email Ids  
36613 64 d 23 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ Fix:Update L3 to L4 for first po approval mail  
36534 72 d 2 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ Fix:First Po check (is it pending )  
36518 74 d 3 h aman /trunk/ Fix:Fix first po and edge case for bulk order  
36399 88 d 3 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked  
36262 101 d 22 h aman /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix:Send Mail for filled loi form to finance team  
36064 120 d 22 h aman /trunk/ Fix:FULL_Stock flow , fin service mark unapplicable ,send invoice to whatsapp by default, update contact list ,Training mail issue  
36024 126 d 22 h aman /trunk/ Fix:Exclude non working days and approval flow based on role and PO type.  
35995 132 d 22 h aman /trunk/ Fix:Redesign the Po Approval page, and po creation logic for first po, trail mails formatting fix  
35971 136 d 23 h aman /trunk/ Feat : Loi 2.0 Enhancement and redesigning  
35956 139 d 5 h amit /trunk/profitmandi-dao/src/main/ Mail outbox pattern: persist mail in transaction, send async after commit. Fixes lock contention between /cancelOrder and /om/addBillingDetailsForGrouppedOrders caused by SMTP calls inside transactions holding DB locks.  
35690 165 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Optimize order creation performance: add overloaded focusedModelShortageValidation with pre-fetched data, add overloaded payThroughWallet and processTransaction to avoid duplicate fetches, fix N+1 queries in BulkOrderService by batch-fetching items and tagListings  
35458 215 d 22 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
 
34959 323 d 4 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ Update  
34958 323 d 4 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ Update  
34957 323 d 4 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/ Update  

Show All