Merge pull request 'refs #6732 change name supplier.isSerious to supplier.isReal' (!2063) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2063 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
This commit is contained in:
commit
bd026af917
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE vn.supplier CHANGE COLUMN isSerious isReal tinyint(1) unsigned NOT NULL DEFAULT 0;
|
|
@ -1258,7 +1258,7 @@ export default {
|
||||||
},
|
},
|
||||||
supplierBasicData: {
|
supplierBasicData: {
|
||||||
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
|
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
|
||||||
isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]',
|
isReal: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isReal"]',
|
||||||
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
|
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
|
||||||
isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
|
isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
|
||||||
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
|
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
|
||||||
|
|
|
@ -20,7 +20,7 @@ describe('Supplier basic data path', () => {
|
||||||
it('should edit the basic data', async() => {
|
it('should edit the basic data', async() => {
|
||||||
await page.clearInput(selectors.supplierBasicData.alias);
|
await page.clearInput(selectors.supplierBasicData.alias);
|
||||||
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
|
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
|
||||||
await page.waitToClick(selectors.supplierBasicData.isSerious);
|
await page.waitToClick(selectors.supplierBasicData.isReal);
|
||||||
await page.waitToClick(selectors.supplierBasicData.isActive);
|
await page.waitToClick(selectors.supplierBasicData.isActive);
|
||||||
await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
|
await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
|
||||||
await page.write(selectors.supplierBasicData.notes, 'Some notes');
|
await page.write(selectors.supplierBasicData.notes, 'Some notes');
|
||||||
|
@ -41,8 +41,8 @@ describe('Supplier basic data path', () => {
|
||||||
expect(result).toEqual('Plants Nick SL');
|
expect(result).toEqual('Plants Nick SL');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should check the isSerious checkbox is now checked', async() => {
|
it('should check the isReal checkbox is now checked', async() => {
|
||||||
const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
|
const result = await page.checkboxState(selectors.supplierBasicData.isReal);
|
||||||
|
|
||||||
expect(result).toBe('checked');
|
expect(result).toBe('checked');
|
||||||
});
|
});
|
||||||
|
|
|
@ -11,7 +11,7 @@ columns:
|
||||||
postcodeFk: postcode
|
postcodeFk: postcode
|
||||||
isActive: active
|
isActive: active
|
||||||
isOfficial: official
|
isOfficial: official
|
||||||
isSerious: serious
|
isReal: real
|
||||||
isTrucker: trucker
|
isTrucker: trucker
|
||||||
note: note
|
note: note
|
||||||
street: street
|
street: street
|
||||||
|
|
|
@ -11,7 +11,7 @@ columns:
|
||||||
postcodeFk: código postal
|
postcodeFk: código postal
|
||||||
isActive: activo
|
isActive: activo
|
||||||
isOfficial: oficial
|
isOfficial: oficial
|
||||||
isSerious: serio
|
isReal: real
|
||||||
isTrucker: camionero
|
isTrucker: camionero
|
||||||
note: nota
|
note: nota
|
||||||
street: calle
|
street: calle
|
||||||
|
|
|
@ -25,7 +25,7 @@ module.exports = Self => {
|
||||||
'id',
|
'id',
|
||||||
'name',
|
'name',
|
||||||
'nickname',
|
'nickname',
|
||||||
'isSerious',
|
'isReal',
|
||||||
'isActive',
|
'isActive',
|
||||||
'note',
|
'note',
|
||||||
'nif',
|
'nif',
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
"isOfficial": {
|
"isOfficial": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"isSerious": {
|
"isReal": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"isTrucker": {
|
"isTrucker": {
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Verified"
|
label="Verified"
|
||||||
ng-model="$ctrl.supplier.isSerious">
|
ng-model="$ctrl.supplier.isReal">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Active"
|
label="Active"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
<vn-icon
|
<vn-icon
|
||||||
vn-tooltip="Unverified supplier"
|
vn-tooltip="Unverified supplier"
|
||||||
icon="icon-supplierfalse"
|
icon="icon-supplierfalse"
|
||||||
ng-if="$ctrl.supplier.isSerious == false">
|
ng-if="$ctrl.supplier.isReal == false">
|
||||||
</vn-icon>
|
</vn-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="quicklinks">
|
<div class="quicklinks">
|
||||||
|
|
|
@ -40,7 +40,7 @@ class Controller extends Descriptor {
|
||||||
'payDemFk',
|
'payDemFk',
|
||||||
'payDay',
|
'payDay',
|
||||||
'isActive',
|
'isActive',
|
||||||
'isSerious',
|
'isReal',
|
||||||
'isTrucker',
|
'isTrucker',
|
||||||
'account'
|
'account'
|
||||||
],
|
],
|
||||||
|
|
|
@ -26,7 +26,7 @@ describe('Supplier Component vnSupplierDescriptor', () => {
|
||||||
'payDemFk',
|
'payDemFk',
|
||||||
'payDay',
|
'payDay',
|
||||||
'isActive',
|
'isActive',
|
||||||
'isSerious',
|
'isReal',
|
||||||
'isTrucker',
|
'isTrucker',
|
||||||
'account'
|
'account'
|
||||||
],
|
],
|
||||||
|
|
|
@ -44,12 +44,12 @@
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Verified"
|
label="Verified"
|
||||||
ng-model="$ctrl.summary.isSerious"
|
ng-model="$ctrl.summary.isReal"
|
||||||
disabled="true">
|
disabled="true">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Is active"
|
label="Is active"
|
||||||
ng-model="$ctrl.summary.isActive"
|
ng-model="$ctrl.summary.isActive"
|
||||||
disabled="true">
|
disabled="true">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
</vn-vertical>
|
</vn-vertical>
|
||||||
|
@ -141,7 +141,7 @@
|
||||||
value="{{::$ctrl.summary.name}}">
|
value="{{::$ctrl.summary.name}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value
|
<vn-label-value
|
||||||
label="Tax number"
|
label="Tax number"
|
||||||
value="{{::$ctrl.summary.nif}}">
|
value="{{::$ctrl.summary.nif}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value
|
<vn-label-value
|
||||||
|
|
Loading…
Reference in New Issue