From 30299a5f135f813ea9fa3af20d861bfe38a96c95 Mon Sep 17 00:00:00 2001
From: Raj Rathore <rajr4thore@gmail.com>
Date: Thu, 23 Apr 2020 16:06:02 +0530
Subject: [PATCH] fix(currency-symbol): hard-coded dollar symbol removed

---
 app/serializers/payment_serializer.rb            |  8 +++++---
 .../discourse/helpers/format-curency.js.es6      | 16 ++++++++--------
 assets/javascripts/discourse/models/plan.js.es6  |  2 +-
 config/settings.yml                              |  8 ++++----
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/serializers/payment_serializer.rb b/app/serializers/payment_serializer.rb
index a2903e8..a8119a2 100644
--- a/app/serializers/payment_serializer.rb
+++ b/app/serializers/payment_serializer.rb
@@ -29,9 +29,11 @@ class PaymentSerializer < ApplicationSerializer
   private
 
   def user
-    User.find(object.user_id)
-  rescue StandardError
-    nil
+    begin
+      User.find(object.user_id)
+    rescue StandardError
+      nil
+    end
   end
 
   def currency_unit
diff --git a/assets/javascripts/discourse/helpers/format-curency.js.es6 b/assets/javascripts/discourse/helpers/format-curency.js.es6
index 3ee80e1..49c35bb 100644
--- a/assets/javascripts/discourse/helpers/format-curency.js.es6
+++ b/assets/javascripts/discourse/helpers/format-curency.js.es6
@@ -3,18 +3,18 @@ export default Ember.Helper.helper(function (params) {
   let currencySign
 
   switch (Discourse.SiteSettings.discourse_subscriptions_currency) {
-    case 'EUR':
-      currencySign = '€'
+    case "EUR":
+      currencySign = "€";
       break
-    case 'GBP':
-      currencySign = '£'
+    case "GBP":
+      currencySign = "£";
       break
-    case 'INR':
-      currencySign = '₹'
+    case "INR":
+      currencySign = "₹";
       break
     default:
-      currencySign = '$'
+      currencySign = "$";
   }
 
-  return [currencySign, params[0]].join('')
+  return [currencySign, params[0]].join("");
 })
diff --git a/assets/javascripts/discourse/models/plan.js.es6 b/assets/javascripts/discourse/models/plan.js.es6
index 62be08c..a724c2f 100644
--- a/assets/javascripts/discourse/models/plan.js.es6
+++ b/assets/javascripts/discourse/models/plan.js.es6
@@ -16,7 +16,7 @@ const Plan = EmberObject.extend({
 
   @computed("amountDollars", "currency", "interval")
   subscriptionRate(amountDollars, currency, interval) {
-    return `$${amountDollars} ${currency.toUpperCase()} / ${interval}`;
+    return `${amountDollars} ${currency.toUpperCase()} / ${interval}`;
   }
 });
 
diff --git a/config/settings.yml b/config/settings.yml
index 163aba4..df16d87 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -5,20 +5,20 @@ plugins:
     default: false
     client: true
   discourse_subscriptions_public_key:
-    default: ""
+    default: ''
     client: true
   discourse_subscriptions_secret_key:
-    default: ""
+    default: ''
     client: false
   discourse_subscriptions_webhook_secret:
-    default: ""
+    default: ''
     client: false
   discourse_subscriptions_allow_payments:
     default: false
     client: true
   discourse_subscriptions_currency:
     client: true
-    default: "USD"
+    default: 'USD'
     type: enum
     choices:
       - AUD