From 41b06673509df865aa3e5107204ac0b5496e88f9 Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Thu, 12 Dec 2019 09:59:38 +1100
Subject: [PATCH] fix rubocop newer version

---
 app/controllers/admin/plans_controller.rb         | 10 +++++-----
 app/controllers/admin/products_controller.rb      | 10 +++++-----
 app/controllers/admin/subscriptions_controller.rb |  4 ++--
 app/controllers/customers_controller.rb           |  2 +-
 app/controllers/invoices_controller.rb            |  2 +-
 app/controllers/plans_controller.rb               |  2 +-
 app/controllers/products_controller.rb            |  4 ++--
 app/controllers/subscriptions_controller.rb       |  4 ++--
 app/controllers/user/subscriptions_controller.rb  |  4 ++--
 config/locales/client.en.yml                      |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/controllers/admin/plans_controller.rb b/app/controllers/admin/plans_controller.rb
index 1fbcfbf..b083ce3 100644
--- a/app/controllers/admin/plans_controller.rb
+++ b/app/controllers/admin/plans_controller.rb
@@ -14,7 +14,7 @@ module DiscourseSubscriptions
           render_json_dump plans.data
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -34,7 +34,7 @@ module DiscourseSubscriptions
           render_json_dump plan
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -47,7 +47,7 @@ module DiscourseSubscriptions
           render_json_dump serialized
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -64,7 +64,7 @@ module DiscourseSubscriptions
           render_json_dump plan
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -75,7 +75,7 @@ module DiscourseSubscriptions
           render_json_dump plan
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb
index dc5217a..93fc9bf 100644
--- a/app/controllers/admin/products_controller.rb
+++ b/app/controllers/admin/products_controller.rb
@@ -13,7 +13,7 @@ module DiscourseSubscriptions
 
           render_json_dump products.data
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -30,7 +30,7 @@ module DiscourseSubscriptions
           render_json_dump product
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -41,7 +41,7 @@ module DiscourseSubscriptions
           render_json_dump product
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -55,7 +55,7 @@ module DiscourseSubscriptions
           render_json_dump product
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -66,7 +66,7 @@ module DiscourseSubscriptions
           render_json_dump product
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
diff --git a/app/controllers/admin/subscriptions_controller.rb b/app/controllers/admin/subscriptions_controller.rb
index e0ef450..b9bb483 100644
--- a/app/controllers/admin/subscriptions_controller.rb
+++ b/app/controllers/admin/subscriptions_controller.rb
@@ -13,7 +13,7 @@ module DiscourseSubscriptions
 
           render_json_dump subscriptions
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -37,7 +37,7 @@ module DiscourseSubscriptions
           render_json_dump subscription
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
     end
diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb
index 5c15020..f95299c 100644
--- a/app/controllers/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@@ -21,7 +21,7 @@ module DiscourseSubscriptions
         render_json_dump customer
 
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
   end
diff --git a/app/controllers/invoices_controller.rb b/app/controllers/invoices_controller.rb
index 94a035e..5ebba81 100644
--- a/app/controllers/invoices_controller.rb
+++ b/app/controllers/invoices_controller.rb
@@ -18,7 +18,7 @@ module DiscourseSubscriptions
           render_json_dump []
         end
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
 
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 980a3e6..dd4e8c0 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -21,7 +21,7 @@ module DiscourseSubscriptions
         render_json_dump serialized
 
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
   end
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb
index 393cd12..f44b7df 100644
--- a/app/controllers/products_controller.rb
+++ b/app/controllers/products_controller.rb
@@ -17,7 +17,7 @@ module DiscourseSubscriptions
         render_json_dump products
 
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
 
@@ -28,7 +28,7 @@ module DiscourseSubscriptions
         render_json_dump serialize(product)
 
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
 
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index fde6262..0e5101a 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -21,7 +21,7 @@ module DiscourseSubscriptions
         render_json_dump subscriptions
 
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
 
@@ -50,7 +50,7 @@ module DiscourseSubscriptions
         render_json_dump @subscription
 
       rescue ::Stripe::InvalidRequestError => e
-        return render_json_error e.message
+        render_json_error e.message
       end
     end
 
diff --git a/app/controllers/user/subscriptions_controller.rb b/app/controllers/user/subscriptions_controller.rb
index 6d42c32..da79393 100644
--- a/app/controllers/user/subscriptions_controller.rb
+++ b/app/controllers/user/subscriptions_controller.rb
@@ -31,7 +31,7 @@ module DiscourseSubscriptions
           render_json_dump subscriptions
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
 
@@ -58,7 +58,7 @@ module DiscourseSubscriptions
           end
 
         rescue ::Stripe::InvalidRequestError => e
-          return render_json_error e.message
+          render_json_error e.message
         end
       end
     end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5eaf70d..5f76a13 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -29,7 +29,7 @@ en:
         subscribe: Subscribe
         billing: Billing
       plans:
-        select: Select subscription period
+        select: Select subscription plan
         purchase: Purchase a subscription
         interval:
           adverb: