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

feat: refs #7039 country #2361

Merged
robert merged 18 commits from 7039-country-country into dev 2024-05-14 08:12:14 +00:00
Conversation 0 Commits 18 Files Changed 41 +57 -57
31 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8153a526ce - Show all commits

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

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

2
back/models/country.json
View File

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

4
e2e/tests.js
View File

@ -23,8 +23,8 @@ async function test() {
const opts = getopts(process.argv.slice(2), {
boolean: ['show']
});
if (opts.show)
robert marked this conversation as resolved Outdated
guillermo commented 2024-04-26 07:25:19 +00:00
Outdated
Review
Copy Link

???

???
process.env.E2E_SHOW = true;
// if (opts.show)
process.env.E2E_SHOW = true;
console.log('Building and running DB container.');
const myt = new Myt();

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

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

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

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

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

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

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

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

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

@ -74,7 +74,7 @@
rule>
<tpl-item>
{{code}} - {{town.name}} ({{town.province.name}},
{{town.province.country.country}})
{{town.province.country.name}})
</tpl-item>
<append>
<vn-icon-button
@ -96,7 +96,7 @@
value-field="name">
<tpl-item>
{{name}}, {{province.name}}
({{province.country.country}})
({{province.country.name}})
</tpl-item>
</vn-datalist>
<vn-autocomplete vn-id="province" vn-one
@ -107,7 +107,7 @@
show-field="name"
value-field="id"
rule>
<tpl-item>{{name}} ({{country.country}})</tpl-item>
<tpl-item>{{name}} ({{country.name}})</tpl-item>
</vn-autocomplete>
</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.city">{{::address.city}},</span>
<span ng-show="::address.province.name">{{::address.province.name}},</span>
{{::address.province.country.country}}
{{::address.province.country.name}}
</div>
<div class="ellipsize">
{{::address.phone}}<span ng-if="::address.mobile">, </span>

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

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

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

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

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

@ -104,7 +104,7 @@
value="{{$ctrl.summary.province.name}}">
</vn-label-value>
<vn-label-value label="Country"
value="{{$ctrl.summary.country.country}}">
value="{{$ctrl.summary.country.name}}">
</vn-label-value>
<vn-label-value label="Street" no-ellipsize
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
ENGINE = MEMORY
SELECT co.code company,
cou.country,
cou.name AS country,
robert marked this conversation as resolved Outdated
guillermo commented 2024-04-26 07:27:08 +00:00
Outdated
Review
Copy Link

Quitar el AS

Quitar el AS
c.id clientId,
c.socialName clientSocialName,
u.nickname workerSocialName,

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

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

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

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

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

@ -103,7 +103,7 @@ module.exports = Self => {
SELECT t.cmrFk,
t.id ticketFk,
t.routeFk,
co.country,
co.name AS country,
robert marked this conversation as resolved Outdated
guillermo commented 2024-04-26 07:27:23 +00:00
Outdated
Review
Copy Link

Quitar el AS

Quitar el AS
t.clientFk,
IF(sub.id, TRUE, FALSE) hasCmrDms,
DATE(t.shipped) shipped

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -6,7 +6,7 @@ SELECT
c.id,
c.name AS clientName,
p.name AS province,
co.country
co.name AS country
FROM client c
JOIN province p ON c.provinceFk = p.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.nickname,
p.name AS province,
ct.country,
ct.name AS country,
IFNULL(c.phone, cc.phone) AS phone
FROM claim cl
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.fi,
p.name AS province,
ct.country
ct.name AS country
FROM client c
JOIN country ct ON ct.id = c.countryFk
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.postCode carrierPostCode,
s.city carrierCity,
cou.country carrierCountry,
cou.name carrierCountry,
s2.name senderName,
s2.street senderStreet,
s2.postCode senderPostCode,
s2.city senderCity,
cou2.country senderCountry,
cou2.name senderCountry,
a.street deliveryStreet,
a.id deliveryAddressFk,
a.postalCode deliveryPostalCode,
@ -27,12 +27,12 @@ SELECT c.id cmrFk,
a.nickname deliveryName,
a.phone deliveryPhone,
a.mobile deliveryMobile,
cou3.country deliveryCountry,
cou3.name deliveryCountry,
cl.phone clientPhone,
a2.street loadStreet,
a2.postalCode loadPostalCode,
a2.city loadCity,
cou4.country loadCountry,
cou4.name loadCountry,
co.stamp senderStamp,
s.stamp deliveryStamp
FROM cmr c

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

@ -4,7 +4,7 @@ SELECT
c.name,
c.fi,
c.street,
cty.country
cty.name AS country
robert marked this conversation as resolved Outdated
guillermo commented 2024-04-26 07:28:09 +00:00
Outdated
Review
Copy Link

Quitar AS

Quitar AS
FROM client c
JOIN country cty ON cty.id = c.countryFk
WHERE c.id = ?

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

@ -6,7 +6,7 @@ SELECT
c.city,
c.fi,
p.name AS province,
ct.country
ct.name AS country
FROM client c
JOIN country ct ON ct.id = c.countryFk
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.fi,
p.name AS province,
ct.country,
ct.name AS country,
ct.code AS countryCode,
ct.ibanLength AS ibanLength
FROM client c

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

@ -2,7 +2,7 @@ SELECT
m.code mandateCode,
s.name,
s.street,
sc.country,
sc.name AS country,
robert marked this conversation as resolved Outdated
guillermo commented 2024-04-26 07:28:19 +00:00
Outdated
Review
Copy Link

Quitar AS

Quitar AS
s.postCode,
s.city,
sp.name province,

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

@ -5,7 +5,7 @@ SELECT
s.id,
s.name AS supplierName,
p.name AS province,
co.country
co.name AS country
robert marked this conversation as resolved Outdated
guillermo commented 2024-04-26 07:28:24 +00:00
Outdated
Review
Copy Link

Quitar AS

Quitar AS
FROM supplier s
JOIN province p ON s.provinceFk = p.id
JOIN country co ON s.countryFk = co.id