Revert "Merge pull request #1 from sherryson/subscription-mailers"

This reverts commit 151e982, reversing
changes made to 56971fc.

undo merge from subscription-mailer to remove polluted commits

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.2

Gemfile

@@ -5,7 +5,6 @@ gem 'solidus', github: 'solidusio/solidus', branch: 'master'
 gem 'solidus_auth_devise', github: 'solidusio/solidus_auth_devise', branch: 'master'
 gem 'active_model_serializers', '~> 0.8.3'
 gem 'stripe'
-gem 'slim-rails'
 
 group :test do
   gem 'factory_girl', '4.5.0'
@@ -18,8 +17,4 @@ group :test do
   gem 'simplecov', require: false
 end
 
-group :development do
-  gem 'letter_opener'
-end
-
 gemspec

app/controllers/spree/api/subscriptions_controller.rb

@@ -3,13 +3,6 @@ module Api
     class SubscriptionsController < Spree::Api::BaseController
       before_action :find_subscription, except: [:index]
 
-      def self.prepended(base)
-        base.prepend_after_action :deliver_cancellation_email, only: [:cancel]
-        base.prepend_after_action :deliver_pause_email, only: [:pause]
-        # need to touch user so the address list is updated
-        base.prepend_after_action :touch_user, only: [:update_address, :create_address, :select_address]
-      end
-
       def index
         render json: current_api_user.subscriptions,
           root: false,
@@ -21,12 +14,10 @@ def show
       end
 
       def update
-        @previous_interval = @subscription.interval
         result = @subscription.update_attributes(subscription_params)
 
         if result
-          render json: @subscription.to_json
-          Spree::SubscriptionMailer.delay.updated(@subscription, @previous_interval)
+          render_subscription
         else
           invalid_resource!(@subscription)
         end
@@ -122,18 +113,6 @@ def create_credit_card
 
       private
 
-      def deliver_cancellation_email
-        Spree::SubscriptionMailer.cancel(@subscription).deliver_now
-      end
-
-      def deliver_pause_email
-        Spree::SubscriptionMailer.pause(@subscription).deliver_now
-      end
-
-      def touch_user
-        @subscription.user.touch
-      end
-
       def render_subscription
         render json: @subscription,
           root: false,