fix(ibanRequired): set different ibanRequired for Client and Supplier

db/changes/10370-pickles/payMethod.sql

@@ -0,0 +1,4 @@
+ALTER TABLE vn.payMethod CHANGE ibanRequired ibanRequiredForClients tinyint(3) DEFAULT 0 NULL;
+ALTER TABLE vn.payMethod ADD ibanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL;
+ALTER TABLE vn.payMethod CHANGE ibanRequiredForSuppliers ibanRequiredForSuppliers tinyint(3) DEFAULT 0 NULL AFTER ibanRequiredForClients;
+UPDATE vn.payMethod SET ibanRequiredForSuppliers = 1 WHERE code = 'wireTransfer';

db/dump/fixtures.sql

@@ -217,14 +217,14 @@ 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`, `ibanRequired`)
+INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `ibanRequiredForClients`, `ibanRequiredForSuppliers`)
     VALUES 
-        (1, NULL,           'PayMethod one',            0,  001,    0),
+        (1, NULL,           'PayMethod one',            0,  001,    0, 0),
-        (2, NULL,           'PayMethod two',            10, 001,    0),
+        (2, NULL,           'PayMethod two',            10, 001,    0, 0),
-        (3, 'compensation', 'PayMethod three',          0,  001,    0),
+        (3, 'compensation', 'PayMethod three',          0,  001,    0, 0),
-        (4, NULL,           'PayMethod with IBAN',      0,  001,    1),
+        (4, NULL,           'PayMethod with IBAN',      0,  001,    1, 0),
-        (5, NULL,           'PayMethod five',           10, 001,    0),
+        (5, NULL,           'PayMethod five',           10, 001,    0, 0),
-        (8,'wireTransfer',  'WireTransfer',             5,  001,    1);
+        (8,'wireTransfer',  'WireTransfer',             5,  001,    1, 1);
 
 INSERT INTO `vn`.`payDem`(`id`, `payDem`)
     VALUES 

db/dump/structure.sql

@@ -34324,7 +34324,8 @@ CREATE TABLE `payMethod` (
   `solution` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
   `outstandingDebt` tinyint(3) unsigned zerofill NOT NULL DEFAULT '000',
   `graceDays` int(11) unsigned NOT NULL DEFAULT '0',
-  `ibanRequired` tinyint(3) DEFAULT '0',
+  `ibanRequiredForClients` tinyint(3) DEFAULT '0',
+  `ibanRequiredForSuppliers` tinyint(3) DEFAULT '0',
   `isNotified` tinyint(3) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

modules/client/back/models/client.js

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

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

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

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

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

modules/supplier/back/models/supplier.js

@@ -80,7 +80,7 @@ module.exports = Self => {
         const supplierAccount = await Self.app.models.SupplierAccount.findOne({where: {supplierFk: this.id}});
         const hasIban = supplierAccount && supplierAccount.iban;
 
-        if (payMethod && payMethod.ibanRequired && !hasIban)
+        if (payMethod && payMethod.ibanRequiredForSuppliers && !hasIban)
             err();
 
         done();

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

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