db/changes/10390-constitution/00-payMethod.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.payMethod CHANGE ibanRequiredForClients isIbanRequiredForClients tinyint(3) DEFAULT 0 NULL;
+ALTER TABLE vn.payMethod CHANGE ibanRequiredForSuppliers isIbanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL;

db/dump/fixtures.sql

@@ -217,7 +217,7 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
-INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `ibanRequiredForClients`, `ibanRequiredForSuppliers`)
+INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`)
     VALUES 
         (1, NULL,           'PayMethod one',            0,  001,    0, 0),
         (2, NULL,           'PayMethod two',            10, 001,    0, 0),

modules/client/back/models/client.js

@@ -138,7 +138,8 @@ module.exports = Self => {
 
     function hasIban(err, done) {
         Self.app.models.PayMethod.findById(this.payMethodFk, (_, instance) => {
-            if (instance && instance.ibanRequiredForClients && !this.iban)
+            const isMissingIban = instance && instance.isIbanRequiredForClients && !this.iban;
+            if (isMissingIban)
                 err();
             done();
         });

modules/client/back/models/pay-method.json

@@ -25,10 +25,10 @@
         "outstandingDebt": {
             "type": "Number"
         },
-        "ibanRequiredForClients": {
+        "isIbanRequiredForClients": {
             "type": "boolean"
         },
-        "ibanRequiredForSuppliers": {
+        "isIbanRequiredForSuppliers": {
             "type": "boolean"
         }
     }

modules/client/front/billing-data/index.html

@@ -19,7 +19,7 @@
                 vn-acl="salesAssistant"
                 ng-model="$ctrl.client.payMethodFk"
                 data="paymethods"
-                fields="['ibanRequiredForClients']"
+                fields="['isIbanRequiredForClients']"
                 initial-data="$ctrl.client.payMethod">
             </vn-autocomplete>
             <vn-input-number

modules/supplier/back/models/supplier.js

@@ -79,8 +79,9 @@ module.exports = Self => {
         const payMethod = await Self.app.models.PayMethod.findById(this.payMethodFk);
         const supplierAccount = await Self.app.models.SupplierAccount.findOne({where: {supplierFk: this.id}});
         const hasIban = supplierAccount && supplierAccount.iban;
+        const isMissingIban = payMethod && payMethod.isIbanRequiredForSuppliers && !hasIban;
 
-        if (payMethod && payMethod.ibanRequiredForSuppliers && !hasIban)
+        if (isMissingIban)
             err();
 
         done();

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

@@ -24,7 +24,7 @@
                 vn-acl="salesAssistant"
                 ng-model="$ctrl.supplier.payMethodFk"
                 data="paymethods"
-                fields="['ibanRequiredForSuppliers']"
+                fields="['isIbanRequiredForSuppliers']"
                 initial-data="$ctrl.supplier.payMethod">
             </vn-autocomplete>
             <vn-autocomplete