workarea-afterpay 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f170109c4e7aadf5517d681dae21220ff6cbe1e35126ab58aa54180cd02884d
-  data.tar.gz: 900b3992335bbf4f70be4b1a521d6aa484b9a1a319fced02a44b257aa490f951
+  metadata.gz: 1d55ac37dc33ec6051c925f6964e5a65eacf7bed2aa21d73bbcc0923c88e668d
+  data.tar.gz: 0cdba1f66ba8968182b81bb0c0f084798cf96ccea1e54e6dcee4610297c2c003
 SHA512:
-  metadata.gz: 92464c1f313772dfe084620492874c17fe712f957cdd0591da6a5fa3615e583e95a537f3fe10e75a600e03d2a5348818c88416408ee94c926198ecfbb729ee7f
-  data.tar.gz: 45a8347a3823439093570d7c8f85388b0a89ee685f79131a4bf15e3df00eec4f6a7366ab033a9674c213f71388b037087e2afd244a9ab77210611bd59d9b07a3
+  metadata.gz: 8c76bd1947fba5535f98bd2d85d08b8d37f727e1caaeff6154f053b8854fbee2e2eae4a0898fbc106e9d9dc7c2908207f3abf9b700c0c8fafa39e1226034ce53
+  data.tar.gz: a946e31b8fe386d5b5725635600880c69d0cd4b4ce977b929bc4cca928ed185efc2706562f43e9c834a9d5150edfde5925a86bfcd5cca63edfe83e7af9c503dd

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+Workarea Afterpay 2.1.2 (2020-05-06)
+--------------------------------------------------------------------------------
+
+*   Fix error showing admin config panel
+
+
+    Ben Crouse
+
+
+
 Workarea Afterpay 2.1.1 (2020-05-04)
 --------------------------------------------------------------------------------
 

data/app/view_models/workarea/admin/afterpay_configuration_view_model.rb

@@ -5,7 +5,7 @@ module Workarea
 
       def au_limits
         return unless Workarea::Afterpay.merchant_id(:au).present?
-        limits = afterpay_configuration(:au).first
+        limits = afterpay_configuration(:au)
         {
           min: min_price(limits),
           max: max_price(limits)
@@ -14,7 +14,7 @@ module Workarea
 
       def us_limits
         return unless Workarea::Afterpay.merchant_id(:us).present?
-        limits = afterpay_configuration(:us).first
+        limits = afterpay_configuration(:us)
         {
           min: min_price(limits),
           max: max_price(limits)
@@ -24,11 +24,12 @@ module Workarea
       private
 
         def min_price(limits)
-          return 0.to_m unless limits["minimumAmount"].present?
+          return 0.to_m unless limits.present? && limits["minimumAmount"].present?
           limits["minimumAmount"]["amount"].to_m
         end
 
         def max_price(limits)
+          return unless limits.present?
           limits["maximumAmount"]["amount"].to_m
         end
     end

data/lib/workarea/afterpay/version.rb

@@ -1,5 +1,5 @@
 module Workarea
   module Afterpay
-    VERSION = '2.1.1'.freeze
+    VERSION = '2.1.2'.freeze
   end
 end

data/test/view_models/workarea/admin/afterpay_configuration_view_model_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class AfterpayConfigurationViewModelTest < TestCase
+      def test_limits
+        Workarea::Afterpay
+          .stubs(:credentials)
+          .returns(us: { merchant_id: 'foo' }, au: { merchant_id: 'bar' })
+
+        model = Workarea::Afterpay::Configuration.current
+        view_model = AfterpayConfigurationViewModel.new(model)
+
+        assert_equal({ min: 0.to_m, max: nil }, view_model.au_limits)
+        assert_equal({ min: 0.to_m, max: nil }, view_model.us_limits)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-afterpay
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Jeff Yucis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -161,6 +161,7 @@ files:
 - test/system/workarea/storefront/logged_in_checkout_system_test.decorator
 - test/teaspoon_env.rb
 - test/test_helper.rb
+- test/view_models/workarea/admin/afterpay_configuration_view_model_test.rb
 - test/view_models/workarea/storefront/afterpay_view_model_test.rb
 - test/view_models/workarea/storefront/product_view_model_afterpay_test.rb
 - workarea-afterpay.gemspec