workarea-gift_cards 3.4.10 → 4.0.3

data/test/queries/workarea/admin_redemptions_export_test.rb

@@ -3,50 +3,46 @@ require 'test_helper'
 module Workarea
   class AdminRedemptionsExportTest < IntegrationTest
     def test_total
-      Workarea.with_config do |config|
-        config.per_page = 5
-        config.bulk_action_per_page = 5
+      Workarea.config.per_page = 5
+      Workarea.config.bulk_action_per_page = 5
 
+      card = create_gift_card(amount: 20)
+      create_gift_card_redemption(gift_card: card, amount: 10)
+      create_gift_card_redemption(gift_card: card, amount: 10)
+      query = Search::AdminGiftCards.new
+
+      export = AdminRedemptionsExport.new(gift_cards_query_id: query.to_gid_param)
+      assert_equal(2, export.total)
+
+      15.times do
         card = create_gift_card(amount: 20)
         create_gift_card_redemption(gift_card: card, amount: 10)
-        create_gift_card_redemption(gift_card: card, amount: 10)
-        query = Search::AdminGiftCards.new
+      end
 
-        export = AdminRedemptionsExport.new(gift_cards_query_id: query.to_gid_param)
-        assert_equal(2, export.total)
+      export = AdminRedemptionsExport.new(gift_cards_query_id: query.to_gid_param)
+      assert_equal(17, export.total)
+    end
 
-        15.times do
-          card = create_gift_card(amount: 20)
-          create_gift_card_redemption(gift_card: card, amount: 10)
-        end
+    def test_scroll
+      Workarea.config.bulk_action_per_page = 2
 
-        export = AdminRedemptionsExport.new(gift_cards_query_id: query.to_gid_param)
-        assert_equal(17, export.total)
+      5.times do
+        card = create_gift_card(amount: 20)
+        create_gift_card_redemption(gift_card: card, amount: 10)
       end
-    end
 
-    def test_scroll
-      Workarea.with_config do |config|
-        config.bulk_action_per_page = 2
-
-        5.times do
-          card = create_gift_card(amount: 20)
-          create_gift_card_redemption(gift_card: card, amount: 10)
-        end
-
-        query = Search::AdminGiftCards.new
-        export = AdminRedemptionsExport.new(gift_cards_query_id: query.to_gid_param)
-        count = 0
-        passes = 0
-
-        export.scroll do |results|
-          count += results.size
-          passes += 1
-        end
-
-        assert_equal(5, count)
-        assert_equal(3, passes)
+      query = Search::AdminGiftCards.new
+      export = AdminRedemptionsExport.new(gift_cards_query_id: query.to_gid_param)
+      count = 0
+      passes = 0
+
+      export.scroll do |results|
+        count += results.size
+        passes += 1
       end
+
+      assert_equal(5, count)
+      assert_equal(3, passes)
     end
   end
 end

data/test/system/workarea/storefront/gift_cards_system_test.rb

@@ -9,7 +9,6 @@ module Workarea
         product = create_product(
           name: 'Gift Card',
           gift_card: true,
-          digital: true,
           template: 'gift_card',
           customizations: 'gift_card',
           variants: [
@@ -19,6 +18,10 @@ module Workarea
           ]
         )
 
+        create_fulfillment_sku(id: 'SKU1', policy: :create_gift_card)
+        create_fulfillment_sku(id: 'SKU2', policy: :create_gift_card)
+        create_fulfillment_sku(id: 'SKU3', policy: :create_gift_card)
+
         visit storefront.product_path(product)
 
         assert(page.has_content?('Gift Card'))
@@ -50,7 +53,6 @@ module Workarea
         product = create_product(
           name: 'Gift Card',
           gift_card: true,
-          digital: true,
           template: 'gift_card',
           customizations: 'gift_card',
           variants:  [
@@ -60,6 +62,10 @@ module Workarea
           ]
         )
 
+        create_fulfillment_sku(id: 'SKU1', policy: :create_gift_card)
+        create_fulfillment_sku(id: 'SKU2', policy: :create_gift_card)
+        create_fulfillment_sku(id: 'SKU3', policy: :create_gift_card)
+
         visit storefront.product_path(product)
 
         within '.product-details__add-to-cart-form' do

data/test/view_models/workarea/storefront/gift_card_order_pricing_test.rb

@@ -0,0 +1,113 @@
+require 'test_helper'
+
+module Workarea
+  module Storefront
+    class GiftCardOrderPricingTest < TestCase
+      class TestViewModel < ApplicationViewModel
+        include OrderPricing
+        include GiftCardOrderPricing
+
+        alias_method :order, :model
+
+        def payment
+          @payment ||= options[:payment]
+        end
+      end
+
+      setup :payment, :setup_gift_cards
+
+      def order
+        @order ||= create_order(total_price: 50.to_m)
+      end
+
+      def payment
+        @payment ||= create_payment(id: order.id)
+      end
+
+      def setup_gift_cards
+        Workarea.config.max_gift_cards_per_order = 5
+
+        create_gift_card(token: '123', amount: 10.to_m)
+        create_gift_card(token: '456', amount: 20.to_m)
+        create_gift_card(token: '789', amount: 30.to_m)
+      end
+
+      def view_model_instance
+        TestViewModel.new(order, payment: payment)
+      end
+
+      def test_gift_cards
+        assert(view_model_instance.gift_cards.blank?)
+
+        payment.gift_cards.build(number: '123')
+        assert(view_model_instance.gift_cards.blank?)
+
+        payment.reload
+        payment.add_gift_card(number: '123')
+        assert_equal(1, view_model_instance.gift_cards.count)
+        assert_equal('123', view_model_instance.gift_cards.first.number)
+      end
+
+      def test_gift_card?
+        refute(view_model_instance.gift_card?)
+
+        payment.add_gift_card(number: '123')
+        assert(view_model_instance.gift_card?)
+      end
+
+      def test_gift_card_amount
+        assert_equal(0.to_m, view_model_instance.gift_card_amount)
+
+        payment.add_gift_card(number: '123', amount: 10.to_m)
+        assert_equal(10.to_m, view_model_instance.gift_card_amount)
+
+        payment.add_gift_card(number: '456', amount: 5.to_m)
+        assert_equal(15.to_m, view_model_instance.gift_card_amount)
+      end
+
+      def test_gift_card_balance
+        assert_equal(0.to_m, view_model_instance.gift_card_balance)
+
+        payment.add_gift_card(number: '123')
+        assert_equal(10.to_m, view_model_instance.gift_card_balance)
+
+        payment.add_gift_card(number: '456')
+        assert_equal(30.to_m, view_model_instance.gift_card_balance)
+      end
+
+      def test_total_before_gift_cards
+        assert_equal(50.to_m, view_model_instance.total_before_gift_cards)
+
+        payment.add_gift_card(number: '123', amount: 10.to_m)
+        assert_equal(50.to_m, view_model_instance.total_before_gift_cards)
+
+        payment.add_gift_card(number: '456', amount: 20.to_m)
+        assert_equal(50.to_m, view_model_instance.total_before_gift_cards)
+      end
+
+      def test_advance_payment_amount
+        assert_equal(0.to_m, view_model_instance.advance_payment_amount)
+
+        payment.add_gift_card(number: '123', amount: 10.to_m)
+        assert_equal(10.to_m, view_model_instance.advance_payment_amount)
+
+        payment.add_gift_card(number: '456', amount: 20.to_m)
+        assert_equal(30.to_m, view_model_instance.advance_payment_amount)
+
+        payment.add_gift_card(number: '789', amount: 20.to_m)
+        assert_equal(50.to_m, view_model_instance.advance_payment_amount)
+      end
+
+      def test_failed_gift_card
+        assert_nil(view_model_instance.failed_gift_card)
+
+        payment.add_gift_card(number: '123')
+        assert_nil(view_model_instance.failed_gift_card)
+
+        Workarea.config.max_gift_cards_per_order = 1
+        payment.add_gift_card(number: '456')
+        assert_equal('456', view_model_instance.failed_gift_card.number)
+      end
+    end
+  end
+end

data/test/workers/workarea/log_gift_card_redemption_test.rb

@@ -7,7 +7,7 @@ module Workarea
 
       order = Order.create!(placed_at: Time.now)
       payment = Payment.create!(id: order.id)
-      payment.set_gift_card(number: '123456')
+      payment.add_gift_card(number: '123456')
 
       LogGiftCardRedemption.new.perform(order.id)
       LogGiftCardRedemption.new.perform(order.id)

data/workarea-gift_cards.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = 'workarea-gift_cards'
   s.version     = Workarea::GiftCards::VERSION
   s.authors     = ['bcrouse']
-  s.email       = ['bcrouse@weblinc.com']
+  s.email       = ['bcrouse@workarea.com']
   s.homepage    = 'https://github.com/workarea-commerce/workarea-gift-cards'
-  s.summary     = 'Gift Cards plugin for the Workarea commerce platform'
-  s.description = 'Adds built-in gift cards to the Workarea commerce platform.'
+  s.summary     = 'Gift Cards plugin for the Workarea Commerce Platform'
+  s.description = 'Adds built-in digital gift cards to the Workarea Commerce Platform.'
 
   s.files = `git ls-files`.split("\n")
 
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'workarea', '~> 3.3.0'
+  s.add_dependency 'workarea', '~> 3.x', '>= 3.5.x'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-gift_cards
 version: !ruby/object:Gem::Version
-  version: 3.4.10
+  version: 4.0.3
 platform: ruby
 authors:
 - bcrouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea
@@ -16,31 +16,36 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.x
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
-description: Adds built-in gift cards to the Workarea commerce platform.
+        version: 3.x
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.x
+description: Adds built-in digital gift cards to the Workarea Commerce Platform.
 email:
-- bcrouse@weblinc.com
+- bcrouse@workarea.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".eslintignore"
-- ".eslintrc"
+- ".eslintrc.json"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation-request.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".scss-lint.yml"
+- ".stylelintrc.json"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -53,20 +58,23 @@ files:
 - app/assets/images/workarea/storefront/payment_icons/gift_card.svg
 - app/controllers/workarea/admin/data_file_exports_controller.decorator
 - app/controllers/workarea/admin/payment_gift_cards_controller.rb
-- app/controllers/workarea/api/admin/payment_gift_cards_controller.rb
+- app/controllers/workarea/api/admin/gift_cards_controller.rb
 - app/controllers/workarea/api/storefront/checkouts_controller.decorator
 - app/controllers/workarea/api/storefront/gift_cards_controller.rb
-- app/controllers/workarea/storefront/checkouts_controller.decorator
+- app/controllers/workarea/storefront/checkout/gift_cards_controller.rb
 - app/controllers/workarea/storefront/gift_cards_controller.rb
 - app/mailers/workarea/storefront/gift_card_mailer.rb
 - app/models/workarea/catalog/customizations/gift_card.rb
 - app/models/workarea/catalog/product.decorator
+- app/models/workarea/checkout/steps/gift_card.rb
+- app/models/workarea/fulfillment/policies/create_gift_card.rb
 - app/models/workarea/order/item.decorator
 - app/models/workarea/payment.decorator
 - app/models/workarea/payment/authorize/gift_card.rb
 - app/models/workarea/payment/capture/gift_card.rb
 - app/models/workarea/payment/gift_card.rb
 - app/models/workarea/payment/gift_card/redemption.rb
+- app/models/workarea/payment/gift_card_operation.rb
 - app/models/workarea/payment/purchase/gift_card.rb
 - app/models/workarea/payment/refund/gift_card.rb
 - app/models/workarea/payment/tender/gift_card.rb
@@ -76,10 +84,7 @@ files:
 - app/queries/workarea/order_item_details.decorator
 - app/queries/workarea/search/admin_gift_cards.rb
 - app/seeds/workarea/gift_card_seeds.rb
-- app/services/workarea/checkout/steps/gift_card.rb
 - app/view_models/workarea/admin/payment_gift_card_view_model.rb
-- app/view_models/workarea/storefront/checkout/payment_view_model.decorator
-- app/view_models/workarea/storefront/checkout/summary_view_model.decorator
 - app/view_models/workarea/storefront/gift_card_order_pricing.rb
 - app/view_models/workarea/storefront/order_view_model.decorator
 - app/view_models/workarea/storefront/product_templates/gift_card_view_model.rb
@@ -109,17 +114,17 @@ files:
 - app/views/workarea/storefront/orders/_gift_card_summary.html.haml
 - app/views/workarea/storefront/orders/tenders/_gift_card.html.haml
 - app/views/workarea/storefront/products/templates/_gift_card.html.haml
-- app/workers/workarea/create_ordered_gift_cards.rb
 - app/workers/workarea/log_gift_card_redemption.rb
 - app/workers/workarea/send_gift_card_notifications.rb
 - bin/rails
 - config/initializers/append_points.rb
 - config/initializers/configuration.rb
-- config/initializers/jump_to_navigation.rb
+- config/initializers/fields.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/workarea/gift_cards.rb
 - lib/workarea/gift_cards/engine.rb
+- lib/workarea/gift_cards/gateway.rb
 - lib/workarea/gift_cards/version.rb
 - lib/workarea/mailer_previews/storefront/gift_card_mailer_preview.rb
 - test/documentation/workarea/api/admin/gift_cards_documentation_test.rb
@@ -179,22 +184,25 @@ files:
 - test/integration/workarea/admin/gift_card_integration_test.rb
 - test/integration/workarea/admin/gift_card_redemptions_export_integration_test.rb
 - test/integration/workarea/api/admin/gift_card_integration_test.rb
-- test/integration/workarea/api/storefront/balance_integration_test.rb
-- test/integration/workarea/api/storefront/checkout_integration_test.rb
-- test/integration/workarea/storefront/gift_card_integration_test.rb
+- test/integration/workarea/api/storefront/checkout_gift_cards_integration_test.rb
+- test/integration/workarea/api/storefront/gift_cards_integration_test.rb
+- test/integration/workarea/storefront/checkout_gift_cards_integration_test.rb
+- test/integration/workarea/storefront/gift_cards_integration_test.rb
+- test/integration/workarea/storefront/purchase_gift_cards_integration_test.rb
+- test/lib/workarea/gift_cards/gateway_test.rb
 - test/models/workarea/catalog/gift_card_product_test.rb
+- test/models/workarea/checkout/steps/gift_card_test.rb
+- test/models/workarea/fulfillment/policies/create_gift_card_test.rb
 - test/models/workarea/gift_card_payment_test.rb
 - test/models/workarea/payment/gift_card_test.rb
 - test/models/workarea/payment/purchase/gift_card_test.rb
 - test/models/workarea/payment/refund/gift_card_test.rb
 - test/queries/workarea/admin_redemptions_export_test.rb
 - test/queries/workarea/gift_card_order_item_details_test.rb
-- test/services/workarea/checkout/steps/gift_card_test.rb
 - test/system/workarea/admin/gift_cards_system_test.rb
 - test/system/workarea/storefront/gift_cards_system_test.rb
 - test/test_helper.rb
-- test/view_models/workarea/storefront/checkout/gift_card_payment_view_model_test.rb
-- test/workers/workarea/create_ordered_gift_cards_test.rb
+- test/view_models/workarea/storefront/gift_card_order_pricing_test.rb
 - test/workers/workarea/log_gift_card_redemption_test.rb
 - workarea-gift_cards.gemspec
 homepage: https://github.com/workarea-commerce/workarea-gift-cards
@@ -216,9 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Gift Cards plugin for the Workarea commerce platform
+summary: Gift Cards plugin for the Workarea Commerce Platform
 test_files: []

data/.eslintignore

@@ -1,2 +0,0 @@
-**/test/**/*.js
-testing/**/spec_helper.js

data/.scss-lint.yml

@@ -1,188 +0,0 @@
-# Extension of the default configuration:
-# https://github.com/causes/scss-lint/blob/master/config/default.yml
-
-linters:
-  Comment:
-    enabled: false
-
-  DeclarationOrder:
-    enabled: true
-
-  ElsePlacement:
-    enabled: true
-    style: new_line
-
-  EmptyRule:
-    enabled: false
-
-  HexLength:
-    enabled: true
-    style: long
-
-  Indentation:
-    enabled: true
-    allow_non_nested_indentation: true
-    character: space
-    width: 4
-
-  LeadingZero:
-    enabled: true
-    style: include_zero
-
-  MergeableSelector:
-    enabled: true
-    force_nesting: false
-
-  PropertySortOrder:
-    enabled: true
-    ignore_unspecified: false
-    separate_groups: false
-    order:
-      - display
-      -
-      - position
-      - top
-      - right
-      - bottom
-      - left
-      - z-index
-      -
-      - margin
-      - margin-top
-      - margin-right
-      - margin-bottom
-      - margin-left
-      -
-      - margin-collapse
-      - margin-top-collapse
-      - margin-right-collapse
-      - margin-bottom-collapse
-      - margin-left-collapse
-      -
-      - padding
-      - padding-top
-      - padding-right
-      - padding-bottom
-      - padding-left
-      -
-      - width
-      - height
-      - max-width
-      - max-height
-      - min-width
-      - min-height
-      -
-      - float
-      - clear
-      -
-      - color
-      -
-      - font
-      - font-size
-      - font-style
-      - font-family
-      - font-weight
-      - font-variant
-      - font-smoothing
-      -
-      - line-height
-      - letter-spacing
-      - word-spacing
-      -
-      - text-align
-      - text-indent
-      - text-shadow
-      - text-overflow
-      - text-rendering
-      - text-transform
-      - text-decoration
-      - text-size-adjust
-      -
-      - word-break
-      - word-wrap
-      -
-      - white-space
-      -
-      - background
-      - background-size
-      - background-color
-      - background-image
-      - background-repeat
-      - background-position
-      - background-attachment
-      -
-      - border
-      - border-top
-      - border-right
-      - border-bottom
-      - border-left
-      -
-      - border-image
-      - border-spacing
-      - border-collapse
-      -
-      - border-color
-      - border-top-color
-      - border-right-color
-      - border-bottom-color
-      - border-left-color
-      -
-      - border-style
-      - border-top-style
-      - border-right-style
-      - border-bottom-style
-      - border-left-style
-      -
-      - border-width
-      - border-top-width
-      - border-right-width
-      - border-bottom-width
-      - border-left-width
-      -
-      - border-radius
-      - border-top-right-radius
-      - border-bottom-right-radius
-      - border-bottom-left-radius
-      - border-top-left-radius
-      - border-radius-topright
-      - border-radius-bottomright
-      - border-radius-bottomleft
-      - border-radius-topleft
-      -
-      - box-shadow
-
-  SelectorFormat:
-    enabled: true
-    convention: hyphenated_BEM
-
-  SingleLinePerSelector:
-    enabled: false
-
-  SpaceAfterPropertyColon:
-    enabled: true
-    style: at_least_one_space
-
-  SpaceBeforeBrace:
-    enabled: true
-    style: space
-    allow_single_line_padding: true
-
-  VariableForProperty:
-    enabled: true
-    properties:
-      - color
-      - font-family
-      - background-color
-
-  # These default settings may be problematic to implementors. They are not
-  # ommitted so that they may be adjusted as needed during an implementation.
-  #
-  # For documentation:
-  # https://github.com/causes/scss-lint/blob/master/lib/scss_lint/linter/README.md
-
-  DuplicateProperty:
-    enabled: true
-
-  PropertySpelling:
-    enabled: true
-    extra_properties: [] # Add experimental CSS to this array, if needed