Total charge and currency code added to ship accept parser

Add the total charge with and without negotiated rates and currency code for VQ-13107

Author: benschool

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ups-ruby (0.17.0)
+    ups-ruby (0.18.1)
       excon (~> 0.45, >= 0.45.3)
       insensitive_hash (~> 0.3.3)
       levenshtein-ffi (~> 1.1)
@@ -14,7 +14,7 @@ GEM
       simplecov
     docile (1.1.5)
     excon (0.73.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     insensitive_hash (0.3.3)
     json (1.8.6)
     levenshtein-ffi (1.1.0)

lib/ups/parsers/ship_accept_parser.rb

@@ -42,8 +42,30 @@ def packages
         [UPS::Models::PackageResult.new(package_results)]
       end
 
+      def total_charge 
+        return shipment_charge unless negotiated_rate
+
+        negotiated_rate
+      end
+
+      def negotiated_rate
+        negotiated_rate_response && negotiated_rate_response[:NetSummaryCharges][:GrandTotal][:MonetaryValue].to_f
+      end
+
+      def currency_code 
+        shipment_results[:ShipmentCharges][:TotalCharges][:CurrencyCode]
+      end
+
       private
 
+      def negotiated_rate_response
+        shipment_results[:NegotiatedRates]
+      end
+
+      def shipment_charge
+        shipment_results[:ShipmentCharges][:TotalCharges][:MonetaryValue].to_f
+      end
+
       def form_graphic
         shipment_results[:Form]
       end

lib/ups/version.rb

@@ -1,7 +1,7 @@
 module UPS
   module Version
     MAJOR = 0
-    MINOR = 17
+    MINOR = 18
     PATCH = 1
     BUILD = nil
 

spec/stubs/ship_accept_success_without_negotiated_price.xml

@@ -15,6 +15,7 @@
 
   let(:stub_path) { File.expand_path("../../../stubs", __FILE__) }
   let(:server) { UPS::Connection.new(test_mode: true) }
+  let(:ship_accept_stub_file) { 'ship_accept_success' }
 
   describe 'if requesting a shipment' do
     describe 'single package shipment' do
@@ -27,7 +28,7 @@
             }
           when UPS::Connection::SHIP_ACCEPT_PATH
             {
-              body: File.read("#{stub_path}/ship_accept_success.xml"), status: 200
+              body: File.read("#{stub_path}/#{ship_accept_stub_file}.xml"), status: 200
             }
           end
         end
@@ -80,6 +81,24 @@
       it 'should return the tracking number' do
         subject.tracking_number.must_equal '1Z2220060292353829'
       end
+
+      describe 'total shipment cost' do
+        describe 'with negotiated rates' do
+          it 'returns the total shipment cost' do
+            subject.total_charge.must_equal 115.14
+            subject.currency_code.must_equal 'USD'
+          end
+        end 
+
+        describe 'without negotiated rates' do
+          let(:ship_accept_stub_file) { 'ship_accept_success_without_negotiated_price' }
+
+          it 'returns the total shipment cost' do
+            subject.total_charge.must_equal 118.48
+            subject.currency_code.must_equal 'USD'
+          end
+        end
+      end
     end
 
     describe 'when packaging type is specified' do