verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-04-25 12:35:21 +02:00
parent 5efe286382
commit 8153a526ce
31 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/methods/postcode/filter.js
View File

@ -45,7 +45,7 @@ module.exports = Self => {
{'pc.code': {like: `%${value}%`}}, {'pc.code': {like: `%${value}%`}},
{'t.name': {like: `%${value}%`}}, {'t.name': {like: `%${value}%`}},
{'p.name': {like: `%${value}%`}}, {'p.name': {like: `%${value}%`}},
{'c.country': {like: `%${value}%`}} {'c.name': {like: `%${value}%`}}
] ]
}; };
} }
@ -62,7 +62,7 @@ module.exports = Self => {
pc.code, pc.code,
t.name as town, t.name as town,
p.name as province, p.name as province,
c.country c.name as country
FROM FROM
postCode pc postCode pc
JOIN town t on t.id = pc.townFk JOIN town t on t.id = pc.townFk

2
back/models/country.json
View File

@ -13,7 +13,7 @@
"id": true, "id": true,
"description": "Identifier" "description": "Identifier"
}, },
"country": { "name": {
"type": "string", "type": "string",
"required": true "required": true
}, },

2
e2e/tests.js
View File

@ -23,7 +23,7 @@ async function test() {
const opts = getopts(process.argv.slice(2), { const opts = getopts(process.argv.slice(2), {
boolean: ['show'] boolean: ['show']
}); });
if (opts.show) // if (opts.show)
process.env.E2E_SHOW = true; process.env.E2E_SHOW = true;
console.log('Building and running DB container.'); console.log('Building and running DB container.');

2
front/salix/components/bank-entity/index.html
View File

@ -28,7 +28,7 @@
ng-model="$ctrl.data.countryFk" ng-model="$ctrl.data.countryFk"
url="Countries" url="Countries"
fields="['id', 'country', 'code']" fields="['id', 'country', 'code']"
show-field="country" show-field="name"
value-field="id" value-field="id"
label="Country"> label="Country">
</vn-autocomplete> </vn-autocomplete>

2
modules/client/back/methods/client/extendedListFilter.js
View File

@ -123,7 +123,7 @@ module.exports = Self => {
c.hasLcr, c.hasLcr,
c.hasCoreVnl, c.hasCoreVnl,
ct.id AS countryFk, ct.id AS countryFk,
ct.country, ct.name AS country,
p.id AS provinceFk, p.id AS provinceFk,
p.name AS province, p.name AS province,
u.id AS salesPersonFk, u.id AS salesPersonFk,

2
modules/client/back/methods/defaulter/filter.js
View File

@ -69,7 +69,7 @@ module.exports = Self => {
uw.name workerName, uw.name workerName,
c.creditInsurance, c.creditInsurance,
d.defaulterSinced, d.defaulterSinced,
cn.country, cn.name AS country,
c.countryFk, c.countryFk,
pm.name payMethod pm.name payMethod
FROM vn.defaulter d FROM vn.defaulter d

6
modules/client/front/address/create/index.html
View File

@ -61,7 +61,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -83,7 +83,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
<vn-autocomplete vn-id="province" vn-one <vn-autocomplete vn-id="province" vn-one
@ -94,7 +94,7 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

6
modules/client/front/address/edit/index.html
View File

@ -74,7 +74,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -96,7 +96,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
<vn-autocomplete vn-id="province" vn-one <vn-autocomplete vn-id="province" vn-one
@ -107,7 +107,7 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

2
modules/client/front/address/index/index.html
View File

@ -50,7 +50,7 @@
<span ng-show="::address.postalCode">{{::address.postalCode}} -</span> <span ng-show="::address.postalCode">{{::address.postalCode}} -</span>
<span ng-show="::address.city">{{::address.city}},</span> <span ng-show="::address.city">{{::address.city}},</span>
<span ng-show="::address.province.name">{{::address.province.name}},</span> <span ng-show="::address.province.name">{{::address.province.name}},</span>
{{::address.province.country.country}} {{::address.province.country.name}}
</div> </div>
<div class="ellipsize"> <div class="ellipsize">
{{::address.phone}}<span ng-if="::address.mobile">, </span> {{::address.phone}}<span ng-if="::address.mobile">, </span>

8
modules/client/front/create/index.html
View File

@ -66,7 +66,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -88,7 +88,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
</vn-horizontal> </vn-horizontal>
@ -101,14 +101,14 @@
url="Provinces/location" url="Provinces/location"
fields="['id', 'name', 'countryFk']" fields="['id', 'name', 'countryFk']"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
vn-id="country" vn-id="country"
label="Country" label="Country"
ng-model="$ctrl.client.countryFk" ng-model="$ctrl.client.countryFk"
url="Countries" url="Countries"
show-field="country"> show-field="name">
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

10
modules/client/front/fiscal-data/index.html
View File

@ -16,7 +16,7 @@
auto-load="true" auto-load="true"
url="Countries" url="Countries"
data="countries" data="countries"
order="country"> order="name">
</vn-crud-model> </vn-crud-model>
<vn-crud-model <vn-crud-model
auto-load="true" auto-load="true"
@ -87,7 +87,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -110,7 +110,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
</vn-horizontal> </vn-horizontal>
@ -126,14 +126,14 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete
vn-one vn-one
vn-id="country" vn-id="country"
ng-model="$ctrl.client.countryFk" ng-model="$ctrl.client.countryFk"
data="countries" data="countries"
show-field="country" show-field="name"
value-field="id" value-field="id"
label="Country" label="Country"
rule> rule>

2
modules/client/front/summary/index.html
View File

@ -104,7 +104,7 @@
value="{{$ctrl.summary.province.name}}"> value="{{$ctrl.summary.province.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Country" <vn-label-value label="Country"
value="{{$ctrl.summary.country.country}}"> value="{{$ctrl.summary.country.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Street" no-ellipsize <vn-label-value label="Street" no-ellipsize
value="{{$ctrl.summary.street}}"> value="{{$ctrl.summary.street}}">

2
modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
View File

@ -59,7 +59,7 @@ module.exports = Self => {
`CREATE OR REPLACE TEMPORARY TABLE tmp.filter `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
ENGINE = MEMORY ENGINE = MEMORY
SELECT co.code company, SELECT co.code company,
cou.country, cou.name AS country,
c.id clientId, c.id clientId,
c.socialName clientSocialName, c.socialName clientSocialName,
u.nickname workerSocialName, u.nickname workerSocialName,

2
modules/item/front/summary/index.html
View File

@ -181,7 +181,7 @@
ng-show="!$ctrl.isBuyer && !$ctrl.isAdministrative"> ng-show="!$ctrl.isBuyer && !$ctrl.isAdministrative">
Tax Tax
</h4> </h4>
<vn-label-value label="{{tax.country.country}}" <vn-label-value label="{{tax.country.name}}"
ng-repeat="tax in $ctrl.summary.item.taxes" ng-repeat="tax in $ctrl.summary.item.taxes"
value="{{tax.taxClass.description}}"> value="{{tax.taxClass.description}}">
</vn-label-value> </vn-label-value>

2
modules/item/front/tax/index.html
View File

@ -15,7 +15,7 @@
<vn-textfield <vn-textfield
vn-one vn-one
label="Country" label="Country"
ng-model="tax.country.country" ng-model="tax.country.name"
disabled="true"> disabled="true">
</vn-textfield> </vn-textfield>
<vn-autocomplete <vn-autocomplete

2
modules/route/back/methods/route/getExternalCmrs.js
View File

@ -103,7 +103,7 @@ module.exports = Self => {
SELECT t.cmrFk, SELECT t.cmrFk,
t.id ticketFk, t.id ticketFk,
t.routeFk, t.routeFk,
co.country, co.name AS country,
t.clientFk, t.clientFk,
IF(sub.id, TRUE, FALSE) hasCmrDms, IF(sub.id, TRUE, FALSE) hasCmrDms,
DATE(t.shipped) shipped DATE(t.shipped) shipped

6
modules/supplier/front/address/create/index.html
View File

@ -43,7 +43,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -65,7 +65,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
<vn-autocomplete vn-id="province" vn-one <vn-autocomplete vn-id="province" vn-one
@ -76,7 +76,7 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

6
modules/supplier/front/address/edit/index.html
View File

@ -41,7 +41,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -63,7 +63,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
<vn-autocomplete vn-id="province" vn-one <vn-autocomplete vn-id="province" vn-one
@ -74,7 +74,7 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

10
modules/supplier/front/fiscal-data/index.html
View File

@ -16,7 +16,7 @@
auto-load="true" auto-load="true"
url="Countries" url="Countries"
data="countries" data="countries"
order="country"> order="name">
</vn-crud-model> </vn-crud-model>
<vn-crud-model <vn-crud-model
auto-load="true" auto-load="true"
@ -143,7 +143,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -172,7 +172,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
<vn-autocomplete <vn-autocomplete
@ -187,7 +187,7 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
@ -198,7 +198,7 @@
vn-name="country" vn-name="country"
ng-model="$ctrl.supplier.countryFk" ng-model="$ctrl.supplier.countryFk"
data="countries" data="countries"
show-field="country" show-field="name"
value-field="id" value-field="id"
rule> rule>
</vn-autocomplete> </vn-autocomplete>

2
modules/supplier/front/summary/index.html
View File

@ -162,7 +162,7 @@
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Country" label="Country"
value="{{::$ctrl.summary.country.country}}"> value="{{::$ctrl.summary.country.name}}">
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>

6
modules/worker/front/create/index.html
View File

@ -65,7 +65,7 @@
rule> rule>
<tpl-item> <tpl-item>
{{code}} - {{town.name}} ({{town.province.name}}, {{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}}) {{town.province.country.name}})
</tpl-item> </tpl-item>
<append> <append>
<vn-icon-button <vn-icon-button
@ -85,7 +85,7 @@
url="Provinces/location" url="Provinces/location"
fields="['id', 'name', 'countryFk']" fields="['id', 'name', 'countryFk']"
rule> rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item> <tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
@ -99,7 +99,7 @@
value-field="name"> value-field="name">
<tpl-item> <tpl-item>
{{name}}, {{province.name}} {{name}}, {{province.name}}
({{province.country.country}}) ({{province.country.name}})
</tpl-item> </tpl-item>
</vn-datalist> </vn-datalist>
<vn-textfield <vn-textfield

2
modules/zone/front/delivery-days/index.html
View File

@ -37,7 +37,7 @@
{{code}} {{town.name}} {{code}} {{town.name}}
</div> </div>
<div class="text-caption text-secondary"> <div class="text-caption text-secondary">
{{town.province.name}}, {{town.province.country.country}} {{town.province.name}}, {{town.province.country.name}}
</div> </div>
</tpl-item> </tpl-item>
</vn-autocomplete> </vn-autocomplete>

2
print/templates/reports/campaign-metrics/sql/client.sql
View File

@ -6,7 +6,7 @@ SELECT
c.id, c.id,
c.name AS clientName, c.name AS clientName,
p.name AS province, p.name AS province,
co.country co.name AS country
FROM client c FROM client c
JOIN province p ON c.provinceFk = p.id JOIN province p ON c.provinceFk = p.id
JOIN country co ON c.countryFk = co.id JOIN country co ON c.countryFk = co.id

2
print/templates/reports/claim-pickup-order/sql/client.sql
View File

@ -8,7 +8,7 @@ SELECT
a.street, a.street,
a.nickname, a.nickname,
p.name AS province, p.name AS province,
ct.country, ct.name AS country,
IFNULL(c.phone, cc.phone) AS phone IFNULL(c.phone, cc.phone) AS phone
FROM claim cl FROM claim cl
JOIN client c ON c.id = cl.clientFk JOIN client c ON c.id = cl.clientFk

2
print/templates/reports/client-debt-statement/sql/client.sql
View File

@ -6,7 +6,7 @@ SELECT
c.city, c.city,
c.fi, c.fi,
p.name AS province, p.name AS province,
ct.country ct.name AS country
FROM client c FROM client c
JOIN country ct ON ct.id = c.countryFk JOIN country ct ON ct.id = c.countryFk
LEFT JOIN province p ON p.id = c.provinceFk LEFT JOIN province p ON p.id = c.provinceFk

8
print/templates/reports/cmr/sql/data.sql
View File

@ -14,12 +14,12 @@ SELECT c.id cmrFk,
s.street carrierStreet, s.street carrierStreet,
s.postCode carrierPostCode, s.postCode carrierPostCode,
s.city carrierCity, s.city carrierCity,
cou.country carrierCountry, cou.name carrierCountry,
s2.name senderName, s2.name senderName,
s2.street senderStreet, s2.street senderStreet,
s2.postCode senderPostCode, s2.postCode senderPostCode,
s2.city senderCity, s2.city senderCity,
cou2.country senderCountry, cou2.name senderCountry,
a.street deliveryStreet, a.street deliveryStreet,
a.id deliveryAddressFk, a.id deliveryAddressFk,
a.postalCode deliveryPostalCode, a.postalCode deliveryPostalCode,
@ -27,12 +27,12 @@ SELECT c.id cmrFk,
a.nickname deliveryName, a.nickname deliveryName,
a.phone deliveryPhone, a.phone deliveryPhone,
a.mobile deliveryMobile, a.mobile deliveryMobile,
cou3.country deliveryCountry, cou3.name deliveryCountry,
cl.phone clientPhone, cl.phone clientPhone,
a2.street loadStreet, a2.street loadStreet,
a2.postalCode loadPostalCode, a2.postalCode loadPostalCode,
a2.city loadCity, a2.city loadCity,
cou4.country loadCountry, cou4.name loadCountry,
co.stamp senderStamp, co.stamp senderStamp,
s.stamp deliveryStamp s.stamp deliveryStamp
FROM cmr c FROM cmr c

2
print/templates/reports/incoterms-authorization/sql/client.sql
View File

@ -4,7 +4,7 @@ SELECT
c.name, c.name,
c.fi, c.fi,
c.street, c.street,
cty.country cty.name AS country
FROM client c FROM client c
JOIN country cty ON cty.id = c.countryFk JOIN country cty ON cty.id = c.countryFk
WHERE c.id = ? WHERE c.id = ?

2
print/templates/reports/letter-debtor/sql/client.sql
View File

@ -6,7 +6,7 @@ SELECT
c.city, c.city,
c.fi, c.fi,
p.name AS province, p.name AS province,
ct.country ct.name AS country
FROM client c FROM client c
JOIN country ct ON ct.id = c.countryFk JOIN country ct ON ct.id = c.countryFk
LEFT JOIN province p ON p.id = c.provinceFk LEFT JOIN province p ON p.id = c.provinceFk

2
print/templates/reports/sepa-core/sql/client.sql
View File

@ -7,7 +7,7 @@ SELECT
c.city, c.city,
c.fi, c.fi,
p.name AS province, p.name AS province,
ct.country, ct.name AS country,
ct.code AS countryCode, ct.code AS countryCode,
ct.ibanLength AS ibanLength ct.ibanLength AS ibanLength
FROM client c FROM client c

2
print/templates/reports/sepa-core/sql/supplier.sql
View File

@ -2,7 +2,7 @@ SELECT
m.code mandateCode, m.code mandateCode,
s.name, s.name,
s.street, s.street,
sc.country, sc.name AS country,
s.postCode, s.postCode,
s.city, s.city,
sp.name province, sp.name province,

2
print/templates/reports/supplier-campaign-metrics/sql/supplier.sql
View File

@ -5,7 +5,7 @@ SELECT
s.id, s.id,
s.name AS supplierName, s.name AS supplierName,
p.name AS province, p.name AS province,
co.country co.name AS country
FROM supplier s FROM supplier s
JOIN province p ON s.provinceFk = p.id JOIN province p ON s.provinceFk = p.id
JOIN country co ON s.countryFk = co.id JOIN country co ON s.countryFk = co.id