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

Reviewed-on: #2063
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

db/versions/10900-redOak/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.supplier CHANGE COLUMN isSerious isReal tinyint(1) unsigned NOT NULL DEFAULT 0;

e2e/helpers/selectors.js

@@ -1258,7 +1258,7 @@ export default {
     },
     supplierBasicData: {
         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"]',
         isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
         notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',

e2e/paths/13-supplier/02_basic_data.spec.js

@@ -20,7 +20,7 @@ describe('Supplier basic data path', () => {
     it('should edit the basic data', async() => {
         await page.clearInput(selectors.supplierBasicData.alias);
         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.isPayMethodChecked);
         await page.write(selectors.supplierBasicData.notes, 'Some notes');
@@ -41,8 +41,8 @@ describe('Supplier basic data path', () => {
         expect(result).toEqual('Plants Nick SL');
     });
 
-    it('should check the isSerious checkbox is now checked', async() => {
-        const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
+    it('should check the isReal checkbox is now checked', async() => {
+        const result = await page.checkboxState(selectors.supplierBasicData.isReal);
 
         expect(result).toBe('checked');
     });

modules/supplier/back/locale/supplier/en.yml

@@ -11,7 +11,7 @@ columns:
     postcodeFk: postcode
     isActive: active
     isOfficial: official
-    isSerious: serious
+    isReal: real
     isTrucker: trucker
     note: note
     street: street

modules/supplier/back/locale/supplier/es.yml

@@ -11,7 +11,7 @@ columns:
     postcodeFk: código postal
     isActive: activo
     isOfficial: oficial
-    isSerious: serio
+    isReal: real
     isTrucker: camionero
     note: nota
     street: calle

modules/supplier/back/methods/supplier/getSummary.js

@@ -25,7 +25,7 @@ module.exports = Self => {
                 'id',
                 'name',
                 'nickname',
-                'isSerious',
+                'isReal',
                 'isActive',
                 'note',
                 'nif',

modules/supplier/back/models/supplier.json

@@ -48,7 +48,7 @@
         "isOfficial": {
             "type": "boolean"
         },
-        "isSerious": {
+        "isReal": {
             "type": "boolean"
         },
         "isTrucker": {

modules/supplier/front/basic-data/index.html

@@ -26,7 +26,7 @@
         <vn-horizontal>
             <vn-check
                 label="Verified"
-                ng-model="$ctrl.supplier.isSerious">
+                ng-model="$ctrl.supplier.isReal">
             </vn-check>
             <vn-check
                 label="Active"

modules/supplier/front/descriptor/index.html

@@ -32,7 +32,7 @@
             <vn-icon
                 vn-tooltip="Unverified supplier"
                 icon="icon-supplierfalse"
-                ng-if="$ctrl.supplier.isSerious == false">
+                ng-if="$ctrl.supplier.isReal == false">
             </vn-icon>
         </div>
         <div class="quicklinks">

modules/supplier/front/descriptor/index.js

@@ -40,7 +40,7 @@ class Controller extends Descriptor {
                 'payDemFk',
                 'payDay',
                 'isActive',
-                'isSerious',
+                'isReal',
                 'isTrucker',
                 'account'
             ],

modules/supplier/front/descriptor/index.spec.js

@@ -26,7 +26,7 @@ describe('Supplier Component vnSupplierDescriptor', () => {
                     'payDemFk',
                     'payDay',
                     'isActive',
-                    'isSerious',
+                    'isReal',
                     'isTrucker',
                     'account'
                 ],

modules/supplier/front/summary/index.html

@@ -44,12 +44,12 @@
                 </vn-label-value>
                 <vn-check
                     label="Verified" 
-                    ng-model="$ctrl.summary.isSerious" 
+                    ng-model="$ctrl.summary.isReal"
                     disabled="true">
                 </vn-check>
                 <vn-check
                     label="Is active" 
-                    ng-model="$ctrl.summary.isActive" 
+                    ng-model="$ctrl.summary.isActive"
                     disabled="true">
                 </vn-check>
             </vn-vertical>
@@ -141,7 +141,7 @@
                 value="{{::$ctrl.summary.name}}">
             </vn-label-value>
             <vn-label-value 
-                label="Tax number" 
+                label="Tax number"
                 value="{{::$ctrl.summary.nif}}">
             </vn-label-value>
             <vn-label-value