From 7c17696a00ca66cac8afaacd2e871c01707a575c Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Thu, 1 Dec 2016 18:29:25 +0200 Subject: [PATCH] WIPP --- lamassu-schema.json | 15 +++++++++++++++ lib/email.js | 2 +- lib/sms.js | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lamassu-schema.json b/lamassu-schema.json index 069722b8..cfeb7374 100644 --- a/lamassu-schema.json +++ b/lamassu-schema.json @@ -20,6 +20,7 @@ "display": "Cash-out commission", "fieldType": "percentage", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] }, { @@ -34,6 +35,7 @@ "display": "Zero conf limit", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] } ] @@ -108,13 +110,16 @@ "display": "Top cash-out denomination", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] + }, { "code": "bottomCashOutDenomination", "display": "Bottom cash-out denomination", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] }, { @@ -122,6 +127,7 @@ "display": "Virtual cash-out denomination", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] }, { @@ -129,6 +135,7 @@ "display": "Empty bill margin", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] } ] @@ -151,6 +158,7 @@ "display": "Cash-out tx limit", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["cashOutEnabled"], "fieldValidation": [] }, { @@ -172,6 +180,7 @@ "display": "ID verify service", "fieldType": "account", "fieldClass": "idVerifier", + "enabledIf": ["idVerificationEnabled"], "fieldValidation": [] }, { @@ -179,6 +188,7 @@ "display": "ID Verification Limit", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["idVerificationEnabled"], "fieldValidation": [] } ] @@ -223,6 +233,7 @@ "display": "Email notifications", "fieldType": "onOff", "fieldClass": null, + "enabledIf": ["notificationsEnabled"], "fieldValidation": [{"code": "required"}] }, { @@ -230,6 +241,7 @@ "display": "SMS notifications", "fieldType": "onOff", "fieldClass": null, + "enabledIf": ["notificationsEnabled"], "fieldValidation": [{"code": "required"}] }, { @@ -237,6 +249,7 @@ "display": "SMS gateway", "fieldType": "account", "fieldClass": "sms", + "enabledIf": ["notificationsEnabled", "cashOutEnabled"], "fieldValidation": [] }, { @@ -244,6 +257,7 @@ "display": "Email gateway", "fieldType": "account", "fieldClass": "email", + "enabledIf": ["notificationsEnabled"], "fieldValidation": [] }, { @@ -251,6 +265,7 @@ "display": "Low Balance Threshold", "fieldType": "integer", "fieldClass": null, + "enabledIf": ["notificationsEnabled"], "fieldValidation": [] } ] diff --git a/lib/email.js b/lib/email.js index 3674eaec..aeb4f16d 100644 --- a/lib/email.js +++ b/lib/email.js @@ -5,7 +5,7 @@ function sendMessage (rec) { return Promise.resolve() .then(() => { const settings = settingsLoader.settings() - const pluginCode = configManager.unscoped(settings.config).extraServices.email + const pluginCode = configManager.unscoped(settings.config).notifications.email if (!pluginCode) throw new Error('No email plugin defined') const account = settings.accounts[pluginCode] diff --git a/lib/sms.js b/lib/sms.js index 87de165c..a0ac6f4e 100644 --- a/lib/sms.js +++ b/lib/sms.js @@ -5,7 +5,7 @@ function sendMessage (rec) { return Promise.resolve() .then(() => { const settings = settingsLoader.settings() - const pluginCode = configManager.unscoped(settings.config).extraServices.sms + const pluginCode = configManager.unscoped(settings.config).notifications.sms if (!pluginCode) throw new Error('No sms plugin defined') const account = settings.accounts[pluginCode]