Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
37846 1 d 7 h amit /trunk/profitmandi-fofo/src/main/ feat(warehouse): dashboards list ACTIVE warehouses only, warehouse-team screens ACTIVE+SUSPENDED (from BillingWarehouseService, WAREHOUSE_MAP gone); global $warehouseNames for labels of data rows in any state; Sellers & Warehouses screen: all-warehouse overview with status tabs, 3-state status, rename, stock/unshipped orders/stores/mapping usage, send stock alert; partner zone offers active warehouses only; brand stock 'All' = active warehouses (replaces r37838 loop); jsVersion 442  
37780 11 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.
 
37765 12 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
 
37630 21 d 12 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/ feat(mail): wire inactive-recipient filter and clean hardcoded addresses

Wire MailRecipientFilter into googleMailSender and gmailRelaySender. Remove inactive/unknown addresses from recipient and access lists, bulk uploader gate to akhil.kumar.
 
37101 82 d 10 h 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.
 
37001 96 d 7 h ranu /trunk/ rbm calling target issue fix according to aquil  
36369 166 d 6 h vikas /trunk/profitmandi-fofo/src/main/ Fix: Sale purchase invoice item quantity calculation  
35962 213 d 12 h amit /trunk/profitmandi-fofo/src/main/ Add store closure UI - close store with code confirmation from deactivation flow and inactive stores page. Bump jsVersion to 326.  
35674 242 d 1 h amit /trunk/profitmandi-fofo/src/main/ Add multi-month duration option for manual partner category upgrade (up to 3 months)  
35648 245 d 14 h ranu /trunk/ code commit for calling target / retailer contact  
35509 279 d 9 h amit /trunk/ Add manual partner type upgrade support with source tracking

- Add PartnerTypeSource enum (CALCULATED, MANUAL)
- Add source and upgradedBy fields to PartnerTypeChange entity
- Manual upgrades now backdated to 1st of month for full month effect
- Fix repository queries to use id DESC as tie-breaker (MySQL 5.7 compatible)
- Track who performed manual upgrade via upgradedBy field
 
35458 290 d 5 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
 
35452 290 d 13 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed npe issue and performance issue  
35375 299 d 7 h aman /trunk/ Feat:Upload Banner for trail user  
35372 300 d 6 h aman /trunk/ Fix:Store Code Creation for trial user  
35370 300 d 9 h aman /trunk/ DEBUG:add debugger for trialform  
35305 320 d 7 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed bug related to trial form  
35289 325 d 16 h amit /trunk/ Added trial franchisee feature  
35236 344 d 7 h amit /trunk/ Fixed notification related issues with scheme also stopped using mongo for brands Schema  
34640 490 d 14 h tejus.lohani /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ check loi on code creation process condition  
34639 491 d 6 h tejus.lohani /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ check loi on code creation process condition  
34631 494 d 6 h tejus.lohani /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ check loi on code creation process condition  
34527 518 d 11 h tejus.lohani /trunk/ hdfc payment report and investometer in partner dashboard  
34211 594 d 13 h vikas.jangra /trunk/ Changed email Ids  
34018 675 d 13 h tejus.lohani /trunk/ purchase sele ratio further detail like model aging , on the click of catalog chart click  
34013 676 d 13 h tejus.lohani /trunk/ purchase sele ratio chart data fix  
34009 677 d 13 h tejus.lohani /trunk/ now fetch pur-sale ratio report on the change of period also  
33990 682 d 14 h tejus.lohani /trunk/ Purchase sale ratio graph related files  
33814 739 d 13 h ranu /trunk/ retailer alternate contacts ui  
33769 754 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Added Transporter details  
33763 755 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Added Transporter details  
33247 899 d 11 h ranu /trunk/ warehouse billing phase one and added signature exception  
33083 939 d 8 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Removed logging  
32887 985 d 14 h shampa /trunk/profitmandi-fofo/src/main/ inactive promoter  
32751 1022 d 8 h amit.gupta /trunk/ Added changes Related for bronze in case of min limit  
32736 1026 d 11 h ranu /trunk/ on brand limit page default limit correction on time of 0  
32731 1027 d 14 h ranu /trunk/profitmandi-fofo/src/main/ online order is not showing  
32667 1042 d 10 h raveendra.bharati /trunk/profitmandi-fofo/src/main/ Email Update recorrect  
32629 1061 d 7 h amit.gupta /trunk/ Fixed logic for invoice edit  
32207 1180 d 13 h amit.gupta /trunk/profitmandi-fofo/src/main/ Category changes rights restricted to Special List