From 4ec41728afe006bf99df25c48bc078d2c0e8e6cb Mon Sep 17 00:00:00 2001
From: Yana Agun Siswanto <yana.developer@gmail.com>
Date: Wed, 29 Mar 2017 16:43:56 +0700
Subject: [PATCH] Fix Deprecation Warning. #27

---
 .../promotion_handler/coupon_decorator.rb      | 18 +++++++++++-------
 .../spree/tax/order_adjuster_decorator.rb      |  8 ++++----
 spec/models/spree/order_contents_spec.rb       |  6 +++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/models/spree/promotion_handler/coupon_decorator.rb b/app/models/spree/promotion_handler/coupon_decorator.rb
index cf02a7b..973643e 100644
--- a/app/models/spree/promotion_handler/coupon_decorator.rb
+++ b/app/models/spree/promotion_handler/coupon_decorator.rb
@@ -1,11 +1,15 @@
-Spree::PromotionHandler::Coupon.class_eval do
-  def apply_with_avatax
-    apply_without_avatax.tap do
-      if successful?
-        SpreeAvatax::SalesShared.reset_tax_attributes(order)
+module Solidus
+  module Avatax
+    module PromotionHandler
+      def apply
+        super.tap do
+          if successful?
+            SpreeAvatax::SalesShared.reset_tax_attributes(order)
+          end
+        end
       end
     end
   end
-
-  alias_method_chain :apply, :avatax
 end
+
+Spree::PromotionHandler::Coupon.send(:prepend, Solidus::Avatax::PromotionHandler)
diff --git a/app/models/spree/tax/order_adjuster_decorator.rb b/app/models/spree/tax/order_adjuster_decorator.rb
index 733faf8..9ece40c 100644
--- a/app/models/spree/tax/order_adjuster_decorator.rb
+++ b/app/models/spree/tax/order_adjuster_decorator.rb
@@ -1,9 +1,9 @@
-Spree::Tax::OrderAdjuster.class_eval do
-  def adjust_with_avatax!
+module Solidus::Avatax::OrderAdjuster
+  def adjust!
     # do nothing. we hook in in our own ways.
     # TODO: See if we can make OrderAdjuster pluggable and workable for what we
     # need to do.
   end
-
-  alias_method_chain :adjust!, :avatax
 end
+
+Spree::Tax::OrderAdjuster.send(:prepend, Solidus::Avatax::OrderAdjuster)
diff --git a/spec/models/spree/order_contents_spec.rb b/spec/models/spree/order_contents_spec.rb
index 172b7bb..34e39d1 100644
--- a/spec/models/spree/order_contents_spec.rb
+++ b/spec/models/spree/order_contents_spec.rb
@@ -7,7 +7,7 @@
   describe 'add_with_avatax' do
     let(:variant) { create :variant }
 
-    subject { order_contents.add_with_avatax(variant) }
+    subject { order_contents.add(variant) }
 
     it 'clears tax' do
       expect(SpreeAvatax::SalesShared).to receive(:reset_tax_attributes).with(order)
@@ -16,7 +16,7 @@
   end
 
   describe 'remove_with_avatax' do
-    subject { order_contents.remove_with_avatax(order.line_items.first.variant) }
+    subject { order_contents.remove(order.line_items.first.variant) }
 
     it 'recomputes tax' do
       expect(SpreeAvatax::SalesShared).to receive(:reset_tax_attributes).with(order)
@@ -25,7 +25,7 @@
   end
 
   describe 'update_cart_with_avatax' do
-    subject { order_contents.update_cart_with_avatax({}) }
+    subject { order_contents.update_cart({}) }
 
     it 'recomputes tax' do
       expect(SpreeAvatax::SalesShared).to receive(:reset_tax_attributes).with(order)