Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37035 13 d 23 h aman /trunk/profitmandi-fofo/src/main/ AI lead intake in fofo app (deployable via fofo_deploy): add POST /add/lead to fofo LeadController mirroring the profitmandi-web contract (Auth-Token->401, dedup by mobile, NOT-NULL coalesced, stores state+recordingUrl, status=pending, SUCCESS envelope); exclude /add/lead from auth/role/post interceptors in WebConfig; add ai.lead.intake.token to dev/staging/prod (same values as profitmandi-web). Bot repoints host apis.smartdukaan.com -> partners.smartdukaan.com, same path/token/payload.  
36989 19 d 21 h vikas /trunk/profitmandi-fofo/src/main/ Changed mail sender password and Duplicate Req interceptor behavior  
36962 21 d 2 h vikas /trunk/ L4 and Above can now assign beat on same day  
36781 47 d 3 h ranu /trunk/profitmandi-fofo/src/main/ some Enhancements or changes  
36408 84 d 21 h amit /trunk/profitmandi-fofo/src/main/ Sale-return reversal: controller wiring + UI for cancellability gate + INV reject + date filter

PurchaseReturnController:
/return/invoice/process — autoApprove now isIrnCancellable && !isShipped.
!isShipped guard restored: shipped goods route through manual approval
even within 24h, so the physical return goes through CN flow.
/return/invoice/reject/{proId} — new endpoint for finance to reject a
pending INV PRO (sale stands, no inventory/wallet/GST action).
/return/invoice — date filter (fromDate/toDate query params, default
last 30 days) backed by selectByWarehouseIdsAndDateRange. Limit
bumped to 200 to accommodate longer ranges.
receive-debit-note view — passes $requiresFinanceApproval so the
template can render the finance-approval banner when DN's IRN is
past the 24h window.

invoice-return.vm:
Added From/To date inputs + Apply button.
Added Reject button next to Approve & Refund for pending INV PROs.

receive-debit-note.vm:
Added one informational banner (#if $requiresFinanceApproval) above
the receipt form. No layout / JS / submit-URL change.

return.js:
#invoice-return-date-apply handler — POSTs the selected range to
/return/invoice and refreshes the table.
.reject-invoice-return handler — prompts for reason, calls the new
reject endpoint.

dev/staging/prod.properties: feature flag finance.receipt.approval.email.enabled
(default false, flip per env when mail infra is ready).
 
36369 88 d 21 h vikas /trunk/profitmandi-fofo/src/main/ Fix: Sale purchase invoice item quantity calculation  
36080 116 d 21 h aman /trunk/profitmandi-fofo/src/main/ Fix:Replace "FOFO/FOCO/COCO" with "Partner" — Visual Only  
35879 143 d 22 h ranu /trunk/profitmandi-fofo/ code commit for agent live status 2.0  
35868 144 d 3 h ranu /trunk/profitmandi-fofo/src/main/ code commit for agent live status roll back  
35867 144 d 3 h ranu /trunk/ code commit for agent live status  
35832 148 d 1 h amit /trunk/ Unify property loading: all modules use runtime profile with shared properties from dao, remove duplicated DB/Hibernate/HikariCP/integration keys from module files  
35798 151 d 22 h amit /trunk/profitmandi-fofo/src/main/ Fixed offer image rendering - removed html escaping on itemCriteriaString which contains intentional HTML from HtmlModelFormatter  
35726 160 d 21 h vikas /trunk/ Pinelabs offer discovery on billing and stock page  
35633 171 d 4 h amit /trunk/ Add hikari.keepaliveTime property to all environment configs  
35601 174 d 4 h amit /trunk/profitmandi-fofo/src/main/ Filter out Sales/RBM Escalation tickets from CRM user's My Tickets view

- CRM users should not see Sales Escalation (84) and RBM Escalation (83) subcategory tickets
- These escalation tickets are internal and not relevant for CRM team
 
35597 174 d 19 h amit /trunk/profitmandi-fofo/src/main/resources/META-INF/ Migrate from C3P0 to HikariCP connection pooling

- Replace C3P0 properties with HikariCP settings
- New settings: maximumPoolSize=20, minimumIdle=2, idleTimeout=30s, maxLifetime=30min
 
35499 203 d 23 h aman /trunk/ Fix:Trial Activation Mail, All trial user page and gst validation  
35459 212 d 20 h amit /trunk/ Revert non-Java file changes from r35458  
35458 212 d 20 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
 
35450 213 d 18 h amit /trunk/profitmandi-fofo/src/main/resources/META-INF/ Fixed  

Show All