| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37846 |
1 d 4 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
|
| 37823 |
5 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
feat(seller): rebuild Sellers & Warehouses screen; PO supplier filter by warehouse; internal warehouse from active sellerwarehouse
Needs dao r37822 and the warehouseaddressmaster.active migration (applied on hadb1).
- Sellers & Warehouses (menu 113): SellerController is now a thin layer over
WarehouseSetupService. Seller list; per-seller physical warehouses with internal
store / supplier / Dummy / sequences, Active toggle and Change address (internal
stores follow); address list with Active toggle; New Address with city, pin,
contact and invoice preview; New Seller with GSTIN checks; New Warehouse creates
the OURS/BAD vendor 40 + Dummy shape. JSON posts; refusals come back as 400 text.
- PO create screen: vendor search takes the selected warehouse and lists only
suppliers mapped to it (/vendors?warehouseId); changing warehouse clears the vendor.
- Supplier create/edit: internal warehouse defaults to 0 and is picked from active
physical warehouses (transaction.sellerwarehouse.is_active), not WAREHOUSE_MAP;
validated on save. Fixes the edit form ticking "Internal Warehouse" for a stored 0
and saving the first option (7720), and the create form never sending it.
- jsVersion 441. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.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/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/edit-supplier.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/new-supplier.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/warehouse-create-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/common.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
|
| 37654 |
20 d 7 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Sync internal store addresses at the mapping write
/createNewWarehouse now calls syncInternalStoreAddresses right after
persisting the WarehouseAddressMapping, inside the same transaction, so the
rule lives at the mutation site rather than in an endpoint someone has to
remember to call. A brand new warehouse has no internal store yet so it is a
no-op today, but any later path that sets a mapping now cannot leave an
internal store billing to the previous address.
/syncWarehouseInternalAddress stays for remediating mappings repointed
directly in the database. Follows r37652/r37653. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 37653 |
20 d 7 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Add POST /syncWarehouseInternalAddress
Realigns the INTERNAL stores of a warehouse with its currently mapped
address. The warehouse address mapping has no edit screen - it is repointed
directly in the database - so a branch move never reached the internal
store's user.address and orders kept billing to the old premises. Run this
after changing a warehouse address mapping. Pairs with r37652. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 32383 |
1133 d 6 h |
amit.gupta |
/trunk/ |
Fixed front end related issues with add/remove row |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseLineItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseLineItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseLineItemRespository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseLineItemRespositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/StateGstRateRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SellerServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseInventoryServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.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/VendorController.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/PurchaseOrderController.java
|
| 32075 |
1223 d 12 h |
tejbeer |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
change |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.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/SellerController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
|
| 29510 |
1804 d 6 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
|
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 28989 |
1875 d 11 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Using seller Warehouse |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.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/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
|
| 28822 |
1890 d 7 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
|
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 28501 |
1931 d 11 h |
amit.gupta |
/trunk/ |
Fixed bugs related to seller creation |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 28500 |
1932 d 6 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
|
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 28499 |
1932 d 6 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed seller |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
|
| 28493 |
1935 d 7 h |
tejbeer |
/trunk/ |
|
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/Vendor.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/Warehouse.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/organisation.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/InventoryType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/inventory/WarehouseType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/transaction/OrganisationType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/CreateNewSupplier.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/hrms/WarehouseIdPrefixModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MarginCalculatorModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/WarehouseRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/WarehouseRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrganisationRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrganisationRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/State.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/Supplier.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/MonthSaleModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerWarehouseRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerWarehouseRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMappingRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMappingRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMasterRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WareHouseAddressMasterRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/SupplierRepositoryImpl.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/webapp/resources/js/seller.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
|
| 28300 |
1989 d 10 h |
tejbeer |
/trunk/profitmandi-fofo/src/main/ |
|
|
/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/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/supplier-in-active.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/supplier.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse.js
|