| Line 16... |
Line 16... |
| 16 |
import com.spice.profitmandi.dao.model.VendorCatalogPricingModel;
|
16 |
import com.spice.profitmandi.dao.model.VendorCatalogPricingModel;
|
| 17 |
import com.spice.profitmandi.dao.model.VendorPriceCircularModel;
|
17 |
import com.spice.profitmandi.dao.model.VendorPriceCircularModel;
|
| 18 |
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
|
18 |
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
|
| 19 |
import com.spice.profitmandi.dao.repository.catalog.CategorisedCatalogRepository;
|
19 |
import com.spice.profitmandi.dao.repository.catalog.CategorisedCatalogRepository;
|
| 20 |
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
|
20 |
import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
|
| - |
|
21 |
import com.spice.profitmandi.dao.repository.inventory.InventoryWarehouseRepository;
|
| 21 |
import com.spice.profitmandi.dao.repository.inventory.VendorCatalogPricingLogRepository;
|
22 |
import com.spice.profitmandi.dao.repository.inventory.VendorCatalogPricingLogRepository;
|
| 22 |
import com.spice.profitmandi.dao.repository.inventory.VendorCatalogPricingRepository;
|
23 |
import com.spice.profitmandi.dao.repository.inventory.VendorCatalogPricingRepository;
|
| 23 |
import com.spice.profitmandi.dao.repository.inventory.VendorRepository;
|
24 |
import com.spice.profitmandi.dao.repository.inventory.VendorRepository;
|
| 24 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
25 |
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
|
| 25 |
import com.spice.profitmandi.dao.repository.warehouse.SupplierRepository;
|
26 |
import com.spice.profitmandi.dao.repository.warehouse.SupplierRepository;
|
| Line 68... |
Line 69... |
| 68 |
|
69 |
|
| 69 |
@Autowired
|
70 |
@Autowired
|
| 70 |
VendorRepository vendorRepository;
|
71 |
VendorRepository vendorRepository;
|
| 71 |
|
72 |
|
| 72 |
@Autowired
|
73 |
@Autowired
|
| - |
|
74 |
private InventoryWarehouseRepository inventoryWarehouseRepository;
|
| - |
|
75 |
|
| - |
|
76 |
@Autowired
|
| 73 |
private CookiesProcessor cookiesProcessor;
|
77 |
private CookiesProcessor cookiesProcessor;
|
| 74 |
|
78 |
|
| 75 |
@Autowired
|
79 |
@Autowired
|
| 76 |
private RoleManager roleManager;
|
80 |
private RoleManager roleManager;
|
| 77 |
|
81 |
|
| Line 155... |
Line 159... |
| 155 |
return "vendor-catalog-pricing-view";
|
159 |
return "vendor-catalog-pricing-view";
|
| 156 |
}
|
160 |
}
|
| 157 |
|
161 |
|
| 158 |
|
162 |
|
| 159 |
@RequestMapping(value = "/vendors", method = RequestMethod.GET)
|
163 |
@RequestMapping(value = "/vendors", method = RequestMethod.GET)
|
| 160 |
public String getVendor(Model model, @RequestParam String query) throws Throwable {
|
164 |
public String getVendor(Model model, @RequestParam String query,
|
| - |
|
165 |
@RequestParam(required = false) Integer warehouseId) throws Throwable {
|
| - |
|
166 |
// With a warehouse, offer only suppliers mapped to it - those with a vendor warehouse there to receive into.
|
| - |
|
167 |
Set<Integer> mappedSupplierIds = warehouseId == null || warehouseId <= 0 ? null
|
| - |
|
168 |
: inventoryWarehouseRepository.selectSupplierIdsWithGoodWarehouse(warehouseId);
|
| 161 |
List<Supplier> vendors = supplierRepository.selectAll().stream().filter(x -> x.getName().toLowerCase().matches(".*?" + query.toLowerCase() + ".*?"))
|
169 |
List<Supplier> vendors = supplierRepository.selectAll().stream().filter(x -> x.getName().toLowerCase().matches(".*?" + query.toLowerCase() + ".*?"))
|
| - |
|
170 |
.filter(x -> x.isStatus())
|
| - |
|
171 |
.filter(x -> mappedSupplierIds == null || mappedSupplierIds.contains(x.getId()))
|
| 162 |
.filter(x -> x.isStatus()).collect(Collectors.toList());
|
172 |
.collect(Collectors.toList());
|
| 163 |
model.addAttribute("response1", mvcResponseSender.createResponseString(vendors));
|
173 |
model.addAttribute("response1", mvcResponseSender.createResponseString(vendors));
|
| 164 |
return "response";
|
174 |
return "response";
|
| 165 |
}
|
175 |
}
|
| 166 |
|
176 |
|
| 167 |
|
177 |
|