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

fix(payMethod): alter colums name #793

Merged
carlosjr merged 6 commits from 3379-payMethod_ibanRequired into dev 2021-11-22 14:55:34 +00:00
Conversation 0 Commits 6 Files Changed 7 +11 -7
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/changes/10390-constitution/00-payMethod.sql Normal file
View File

@ -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;

2
db/dump/fixtures.sql
View File

@ -217,7 +217,7 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'
UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE `id` = 23; 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 VALUES
(1, NULL, 'PayMethod one', 0, 001, 0, 0), (1, NULL, 'PayMethod one', 0, 001, 0, 0),
(2, NULL, 'PayMethod two', 10, 001, 0, 0), (2, NULL, 'PayMethod two', 10, 001, 0, 0),

3
modules/client/back/models/client.js
View File

@ -138,7 +138,8 @@ module.exports = Self => {
function hasIban(err, done) { function hasIban(err, done) {
Self.app.models.PayMethod.findById(this.payMethodFk, (_, instance) => { Self.app.models.PayMethod.findById(this.payMethodFk, (_, instance) => {
if (instance && instance.ibanRequiredForClients && !this.iban) const isMissingIban = instance && instance.isIbanRequiredForClients && !this.iban;
carlosjr commented 2021-11-19 11:45:14 +00:00
Outdated
Review
Copy Link

try extracting logic gates to constants like:

        const isMissingIban = instance && instance.ibanRequiredForClients && !this.iban;
        if (isMissingIban)
try extracting logic gates to constants like: const isMissingIban = instance && instance.ibanRequiredForClients && !this.iban; if (isMissingIban)
if (isMissingIban)
err(); err();
done(); done();
}); });

4
modules/client/back/models/pay-method.json
View File

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

2
modules/client/front/billing-data/index.html
View File

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

3
modules/supplier/back/models/supplier.js
View File

@ -79,8 +79,9 @@ module.exports = Self => {
const payMethod = await Self.app.models.PayMethod.findById(this.payMethodFk); const payMethod = await Self.app.models.PayMethod.findById(this.payMethodFk);
const supplierAccount = await Self.app.models.SupplierAccount.findOne({where: {supplierFk: this.id}}); const supplierAccount = await Self.app.models.SupplierAccount.findOne({where: {supplierFk: this.id}});
const hasIban = supplierAccount && supplierAccount.iban; const hasIban = supplierAccount && supplierAccount.iban;
const isMissingIban = payMethod && payMethod.isIbanRequiredForSuppliers && !hasIban;
carlosjr commented 2021-11-19 11:45:29 +00:00
Outdated
Review
Copy Link

same as above

same as above
if (payMethod && payMethod.ibanRequiredForSuppliers && !hasIban) if (isMissingIban)
err(); err();
done(); done();

2
modules/supplier/front/billing-data/index.html
View File

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