From f1545a4ab6713c58e65bd455a74a86e46eabac38 Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Fri, 23 Feb 2018 16:42:04 +1100
Subject: [PATCH] Show fee estimates in subscription totals in UI

---
 .../services/subscription_functions.js.coffee            | 5 ++++-
 app/serializers/api/admin/subscription_serializer.rb     | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/subscriptions/services/subscription_functions.js.coffee b/app/assets/javascripts/admin/subscriptions/services/subscription_functions.js.coffee
index be274360d1..9eee828dd0 100644
--- a/app/assets/javascripts/admin/subscriptions/services/subscription_functions.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/services/subscription_functions.js.coffee
@@ -8,8 +8,11 @@ angular.module("admin.subscriptions").factory 'SubscriptionFunctions', ($injecto
       subtotal += item.price_estimate * item.quantity
     , 0
 
+  estimatedFees: ->
+    @shipping_fee_estimate + @payment_fee_estimate
+
   estimatedTotal: ->
-    @estimatedSubtotal()
+    @estimatedSubtotal() + @estimatedFees()
 
   customer: ->
     return unless @customer_id
diff --git a/app/serializers/api/admin/subscription_serializer.rb b/app/serializers/api/admin/subscription_serializer.rb
index d0fbb0497c..cbba4cc483 100644
--- a/app/serializers/api/admin/subscription_serializer.rb
+++ b/app/serializers/api/admin/subscription_serializer.rb
@@ -3,6 +3,7 @@ module Api
     class SubscriptionSerializer < ActiveModel::Serializer
       attributes :id, :shop_id, :customer_id, :schedule_id, :payment_method_id, :shipping_method_id, :begins_at, :ends_at
       attributes :customer_email, :schedule_name, :edit_path, :canceled_at, :paused_at, :state, :credit_card_id
+      attributes :shipping_fee_estimate, :payment_fee_estimate
 
       has_many :subscription_line_items, serializer: Api::Admin::SubscriptionLineItemSerializer
       has_many :closed_proxy_orders, serializer: Api::Admin::ProxyOrderSerializer
@@ -38,6 +39,14 @@ module Api
         return '' unless object.id
         edit_admin_subscription_path(object)
       end
+
+      def shipping_fee_estimate
+        object.shipping_fee_estimate.to_f
+      end
+
+      def payment_fee_estimate
+        object.payment_fee_estimate.to_f
+      end
     end
   end
 end