Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers
This commit is contained in:
@@ -102,8 +102,8 @@ func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCate
|
||||
return node, true
|
||||
}
|
||||
|
||||
func (s *MenuService) GetRoutes(id_lang uint) ([]model.Route, error) {
|
||||
return s.routesRepo.GetRoutes(id_lang)
|
||||
func (s *MenuService) GetRoutes(id_lang, roleId uint) ([]model.Route, error) {
|
||||
return s.routesRepo.GetRoutes(id_lang, roleId)
|
||||
}
|
||||
|
||||
func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) model.Category {
|
||||
|
||||
@@ -27,7 +27,7 @@ func (s *ProductService) Get(
|
||||
p_id_product, p_id_lang, p_id_customer, b2b_id_country, p_quantity uint,
|
||||
) (*json.RawMessage, error) {
|
||||
|
||||
product, err := s.productsRepo.GetBase(p_id_product, constdata.SHOP_ID, p_id_lang)
|
||||
product, err := s.productsRepo.GetBase(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user