Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
37854 3 d 20 h amit /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ fix(dashboard): label Total/All Regions rows from screen warehouseMap, fall back to warehouseNames (r37846 regression showed raw $warehouseNames.get)  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
37846 4 d 3 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  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.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/IndentController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.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/PlacementPlanController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnPermissionHelper.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnToVendorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/RbmDrrDashboardController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PoStockApprovalController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-updation-timestamp.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-region-mapping-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-warehouse-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-combo.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing-purchase-item.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider-tat-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-activated-itemwise-model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-datewise-debitnote.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-open-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_accessories_itemwsie_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_partner_itemwise_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_accessoriesbrand_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_activated_model.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_brand_partners_sale.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
36922 107 d 3 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
36529 150 d 3 h ranu /trunk/profitmandi-fofo/src/main/ warehouse summary model removed from today po  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
35454 293 d 6 h amit /trunk/ perf: Optimize N+1 queries and reduce stream iterations in today_po and today_po_rbm endpoints

MonitorController.java:
- Consolidate 12 stream ops on rbmArrViewModels into single loop
- Consolidate 6 stream ops on sold15daysOldAgingModels into single loop
- Consolidate 6 stream ops on weeklyBillingData into single loop
- Merge double iteration loops into single pass operations
- Replace containsKey+get patterns with computeIfAbsent/getOrDefault
- Add extractRbmNames() helper to eliminate duplicated stream operations

CsServiceImpl.java:
- Fix N+1 in getAuthUserIdAndAuthUserMap using batch selectByIds
- Fix N+1 in getTicketIdAndAuthUserMapUsingTickets using batch selectByIds
- Fix N+1 in getAuthUserIdAndAuthUserMapUsingPositions using batch selectByIds
- Fix N+1 in getCategoryIdAndCategoryUsingPositions using batch selectAll
- Fix N+1 in getRegionIdAndRegionMap using batch selectAll
- Fix N+1 in getAuthUserByPartnerId using batch selectByIds
- Fix double N+1 in getAuthUserAndEsclationTypeByPartnerId
- Fix N+1 in authUserpartnerIdMap using selectByPositionIds
- Fix N+1 in getAuthUserIdPartnerIdMappingByCatIds
- Fix N+1 in getAuthUserIdPartnerIdMapping

RbmTargetServiceImpl.java:
- Fix O(n*m) stream filter in getRbmTodayArr using pre-built lookup maps
- Fix O(n*m) stream filter in setMovementWiseRbmTargets using pre-built maps

today_po.vm:
- Optimize template lookups with single get instead of containsKey+get		  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
33930 693 d 19 h ranu /trunk/profitmandi-fofo/src/main/ mtd and today target data query correction  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.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_po_rbm.vm
33925 695 d 2 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ mtd and today target data query correction  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
33922 695 d 3 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ mtd and today target data query correction  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
33921 695 d 3 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ mtd and today target data query correction  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
33917 695 d 9 h ranu /trunk/ rbm arr phase one updated  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MTDAchievedTargetModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/RbmArrViewModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/TodayAchievedMovementModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseMobileStockByMovementModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/WarehouseRbmTargetModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm-today-arr.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
33700 777 d 3 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed utilization  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
32938 974 d 2 h amit.gupta /trunk/profitmandi-fofo/src/main/ Added indent changes  
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
32937 974 d 2 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fixed changes  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31546 1340 d 12 h amit.gupta /trunk/ Visibility to L3 for Partnerwise Mapping  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/cs/EscalationType.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31545 1340 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Handling  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31544 1340 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Handling  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31543 1340 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Handling  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31542 1340 d 23 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Handling  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31538 1341 d 5 h amit.gupta /trunk/ Added Partner Region wise billing  
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTypeRegionBilledModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/PartnerTypeSecondaryModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/MarginController.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/fofo/PartnerType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/PartnerTypeChangeServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/hdfc/HdfcPaymentController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
31345 1386 d 6 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ F  
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm

←Prev12Next→

Show All