goc_daniel/b2b
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: goc_daniel:small_fixes
Branches Tags
goc_daniel:main goc_daniel:expand_orders goc_daniel:translate goc_daniel:front-styles goc_daniel:is_oem goc_daniel:countries_bugfix goc_daniel:expand_carts goc_daniel:small_fixes goc_daniel:orders goc_daniel:update_categories goc_daniel:product-procedures goc_daniel:favorites goc_daniel:addresses goc_daniel:storage goc_daniel:translate_new_field goc_daniel:user_teleport goc_daniel:add_image_link goc_daniel:test goc_daniel:routing goc_daniel:mailisearch
...
pull from: goc_daniel:countries_bugfix
Branches Tags
goc_daniel:main goc_daniel:expand_orders goc_daniel:translate goc_daniel:front-styles goc_daniel:is_oem goc_daniel:countries_bugfix goc_daniel:expand_carts goc_daniel:small_fixes goc_daniel:orders goc_daniel:update_categories goc_daniel:product-procedures goc_daniel:favorites goc_daniel:addresses goc_daniel:storage goc_daniel:translate_new_field goc_daniel:user_teleport goc_daniel:add_image_link goc_daniel:test goc_daniel:routing goc_daniel:mailisearch

2 Commits
small_fixe ... countries_

Author SHA1 Message Date
Daniel Goc
2fd9472db1 bugfix 2026-04-15 11:48:29 +02:00
goc_daniel
80a1314dc0 Merge pull request 'some small fixes' (#68) from small_fixes into main 
Reviewed-on: #68
 2026-04-14 13:16:17 +00:00
1 changed files with 4 additions and 1 deletions
Expand all files Collapse all files

5
app/repos/localeSelectorRepo/localeSelectorRepo.go
View File

@@ -3,6 +3,7 @@ package localeSelectorRepo
import ( import (
"git.ma-al.com/goc_daniel/b2b/app/db" "git.ma-al.com/goc_daniel/b2b/app/db"
"git.ma-al.com/goc_daniel/b2b/app/model" "git.ma-al.com/goc_daniel/b2b/app/model"
"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
) )
type UILocaleSelectorRepo interface { type UILocaleSelectorRepo interface {
@@ -25,7 +26,9 @@ func (r *LocaleSelectorRepo) GetLanguages() ([]model.Language, error) {
func (r *LocaleSelectorRepo) GetCountriesAndCurrencies() ([]model.Country, error) { func (r *LocaleSelectorRepo) GetCountriesAndCurrencies() ([]model.Country, error) {
var countries []model.Country var countries []model.Country
err := db.Get(). err := db.Get().
Preload("PSCurrency"). Select("*").
Preload("Currency").
Joins("LEFT JOIN " + dbmodel.TableNamePsCountryLang + " AS cl ON cl." + dbmodel.PsCountryLangCols.IDCountry.Col() + " = b2b_countries.ps_id_country AND cl." + dbmodel.PsCountryLangCols.IDLang.Col() + " = 2").
Find(&countries).Error Find(&countries).Error
return countries, err return countries, err
} }