Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
37101 6 d 1 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 19 d 22 h ranu /trunk/ rbm calling target issue fix according to aquil  
36369 89 d 21 h vikas /trunk/profitmandi-fofo/src/main/ Fix: Sale purchase invoice item quantity calculation  
35962 137 d 3 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 165 d 16 h amit /trunk/profitmandi-fofo/src/main/ Add multi-month duration option for manual partner category upgrade (up to 3 months)  
35648 169 d 5 h ranu /trunk/ code commit for calling target / retailer contact  
35509 203 d 0 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 213 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
 
35452 214 d 4 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed npe issue and performance issue  
35375 222 d 22 h aman /trunk/ Feat:Upload Banner for trail user  
35372 223 d 21 h aman /trunk/ Fix:Store Code Creation for trial user  
35370 224 d 0 h aman /trunk/ DEBUG:add debugger for trialform  
35305 243 d 22 h amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed bug related to trial form  
35289 249 d 7 h amit /trunk/ Added trial franchisee feature  
35236 267 d 22 h amit /trunk/ Fixed notification related issues with scheme also stopped using mongo for brands Schema  
34640 414 d 5 h tejus.lohani /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ check loi on code creation process condition  
34639 414 d 21 h tejus.lohani /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ check loi on code creation process condition  
34631 417 d 21 h tejus.lohani /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ check loi on code creation process condition  
34527 442 d 2 h tejus.lohani /trunk/ hdfc payment report and investometer in partner dashboard  
34211 518 d 4 h vikas.jangra /trunk/ Changed email Ids  
34018 599 d 4 h tejus.lohani /trunk/ purchase sele ratio further detail like model aging , on the click of catalog chart click  
34013 600 d 4 h tejus.lohani /trunk/ purchase sele ratio chart data fix  
34009 601 d 5 h tejus.lohani /trunk/ now fetch pur-sale ratio report on the change of period also  
33990 606 d 5 h tejus.lohani /trunk/ Purchase sale ratio graph related files  
33814 663 d 4 h ranu /trunk/ retailer alternate contacts ui  
33769 677 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Added Transporter details  
33763 678 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Added Transporter details  
33247 823 d 2 h ranu /trunk/ warehouse billing phase one and added signature exception  
33083 862 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Removed logging  
32887 909 d 5 h shampa /trunk/profitmandi-fofo/src/main/ inactive promoter  
32751 945 d 23 h amit.gupta /trunk/ Added changes Related for bronze in case of min limit  
32736 950 d 2 h ranu /trunk/ on brand limit page default limit correction on time of 0  
32731 951 d 5 h ranu /trunk/profitmandi-fofo/src/main/ online order is not showing  
32667 966 d 1 h raveendra.bharati /trunk/profitmandi-fofo/src/main/ Email Update recorrect  
32629 984 d 22 h amit.gupta /trunk/ Fixed logic for invoice edit  
32207 1104 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/ Category changes rights restricted to Special List  
32190 1111 d 4 h amit.gupta /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Fixed additional scheme logic  
32129 1140 d 0 h tejbeer /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ change  
31521 1266 d 23 h amit.gupta /trunk/ Change Cutoff investment to 40
and MIN_INVESTMENT_PERCENT to 20
 
31321 1311 d 1 h tejbeer /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/