From 53a11872efcfa5db0b999d25ee4e24efea5e396c Mon Sep 17 00:00:00 2001 From: Raj Rathore Date: Thu, 23 Apr 2020 17:11:00 +0530 Subject: [PATCH] fix(coding-style): linting changes reverted to be consistent with existing style --- app/serializers/payment_serializer.rb | 2 +- .../discourse/helpers/format-curency.js.es6 | 6 ++-- .../discourse/helpers/format-currency.js.es6 | 28 +++++++++---------- config/settings.yml | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/serializers/payment_serializer.rb b/app/serializers/payment_serializer.rb index a8119a2..2d46499 100644 --- a/app/serializers/payment_serializer.rb +++ b/app/serializers/payment_serializer.rb @@ -31,7 +31,7 @@ class PaymentSerializer < ApplicationSerializer def user begin User.find(object.user_id) - rescue StandardError + rescue nil end end diff --git a/assets/javascripts/discourse/helpers/format-curency.js.es6 b/assets/javascripts/discourse/helpers/format-curency.js.es6 index 49c35bb..8b029f0 100644 --- a/assets/javascripts/discourse/helpers/format-curency.js.es6 +++ b/assets/javascripts/discourse/helpers/format-curency.js.es6 @@ -1,6 +1,6 @@ // TODO: typo in this helper name: currency not curency. -export default Ember.Helper.helper(function (params) { - let currencySign +export default Ember.Helper.helper(function(params) { + let currencySign; switch (Discourse.SiteSettings.discourse_subscriptions_currency) { case "EUR": @@ -17,4 +17,4 @@ export default Ember.Helper.helper(function (params) { } return [currencySign, params[0]].join(""); -}) +}); diff --git a/assets/javascripts/discourse/helpers/format-currency.js.es6 b/assets/javascripts/discourse/helpers/format-currency.js.es6 index a878e31..4f342f1 100644 --- a/assets/javascripts/discourse/helpers/format-currency.js.es6 +++ b/assets/javascripts/discourse/helpers/format-currency.js.es6 @@ -1,22 +1,22 @@ -export default Ember.Helper.helper(function (params) { - let currencySign +export default Ember.Helper.helper(function(params) { + let currencySign; switch (params[0]) { - case 'EUR': - case 'eur': - currencySign = '€' + case "EUR": + case "eur": + currencySign = "€"; break - case 'GBP': - case 'gbp': - currencySign = '£' + case "GBP": + case "gbp": + currencySign = "£"; break - case 'INR': - case 'inr': - currencySign = '₹' + case "INR": + case "inr": + currencySign = "₹"; break default: - currencySign = '$' + currencySign = "$"; } - return currencySign + params.map((p) => p.toUpperCase()).join(' ') -}) + return currencySign + params.map(p => p.toUpperCase()).join(" "); +}); diff --git a/config/settings.yml b/config/settings.yml index df16d87..5ee2b3b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -18,7 +18,7 @@ plugins: client: true discourse_subscriptions_currency: client: true - default: 'USD' + default: "USD" type: enum choices: - AUD