Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37079 7 d 12 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ old version app disabled for rbm  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
36922 27 d 7 h amit /trunk/profitmandi-fofo/src/main/ Remove unused Digify retailer integration and fix slim-jQuery clobber on partner-performance/today_po/today_target pages

- Delete Digify controller, views and Buyback asset; drop dead .digify-retailer-login handler and buyback links/buttons
- Load full jQuery (3.5.1) instead of jquery slim on partner-performance/today_po/today_target so injected pages no longer overwrite the dashboard jQuery (restores $.ajax / slideUp)
- Bump jsVersion to 365		  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/digify
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-login.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/digify-retailer-register.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/images/Buyback-Mobile.png
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-role.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/order-index.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_target.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
36885 29 d 14 h amit /trunk/profitmandi-fofo/src/main/ Fix partner-performance loan table columns and add missing lastUnbilledActivated attribute

- Add lastUnbilledActivated model attribute (from investment.getUnbilledAmount()) so the Unbilled Activated Stock gate renders
- Align Active Loans table to its 9 headers: add serial # column and Total Pending cell
- Pending Interest = interest accrued - interest paid
- Total Pending = pending principal + pending interest		  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
36543 68 d 4 h amit /trunk/profitmandi-fofo/src/main/ Add Others row to PartnerPerformance Secondary/Tertiary/Earning tabs so brandwise sum matches total  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
35310 242 d 7 h aman /trunk/profitmandi-fofo/src/main/ Fix:Fix Monthly sale  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
35119 288 d 13 h aman /trunk/ FIx: contact-us update , Seconday sale method , Running model on dashboard modal  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrderItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerPendingTasksController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-modal.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
35064 300 d 5 h aman /trunk/ Feat:BrandwiseSale and brandWise Item wise sale and live scratch offer  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BrandItemWisePartnerSaleModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PurchaseRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/FofoUser.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/monthSales.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
34591 426 d 6 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ partner perfomance ..app and dashboard button added  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
34590 426 d 6 h ranu /trunk/profitmandi-fofo/src/main/ partner perfomance ..app and dashboard button added  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
33990 605 d 14 h tejus.lohani /trunk/ Purchase sale ratio graph related files  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/BrandWiseSupplier.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/CatalogPurchaseSaleModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/purchaseSaleRatio/PurchaseSaleQuantity.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/analysis/purchase-sale-ratio-panel.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis
/trunk/profitmandi-fofo/src/main/webapp/resources/js/analysis/purchase-sale-panel.js
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/CatalogMovingEnum.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/auth_user_partner_detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bar_chart.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-wise-mobile-lmp-chart.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-wise-mobile-lms-chart.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/investmentdetails.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lmsLineChart.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-health.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price_drop_chart.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase_chart.vm
32149 1131 d 12 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed Billing to deliver  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
32128 1140 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
32044 1155 d 14 h tejbeer /trunk/ change  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/RetailerFilter.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BillingDaysAvg.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/LastSaleDateModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RetailerFilterModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RetailerPeformanceFilterModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerFilterRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/RetailerFilterRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PerformanceService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/PerformanceServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/filtered-retailer.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/retailer-filter.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/FofoOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Order.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/FofoOrderRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PerformanceController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/retailer.js
32002 1166 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
32001 1166 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
31980 1168 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
31979 1168 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
31978 1168 d 12 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
31968 1169 d 14 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm
31967 1169 d 14 h tejbeer /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-performance.vm

←Prev12Next→

Show All