workarea-core 3.5.18 → 3.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d99f1dbf010e7d67b9dbc7785720bbed5cd17c22528dfe57e194dfbb660892
-  data.tar.gz: c5453a27cf96335ae9d35fe857ccc770a0412117579b37dc1cb84e9221cd6efe
+  metadata.gz: a59bf88202898e6d59be0edbdb90c7000fe606fa3ab522aee27079288708e262
+  data.tar.gz: 76cb3fbfaf8847f50b296cb1790bc6997f9b79f304af9131854442ba779c465d
 SHA512:
-  metadata.gz: 4605fd9a72741e6cac8ab7a32d2408ba1b8f2bfb79ac875875461ab59fe660ffd5254e3b0eb69d5534222217de0ec2fc3d60351bee5e7575d93d2393fb8d9221
-  data.tar.gz: e2946da1f9618bc92f65ceca4281c426747f4c75d162b33e68a6fe629008507c43e07dcde39e12f871b2f0011225f40bfd5d9ecdc8d7f563586b90900f43c447
+  metadata.gz: 88354b9cb2e04bca758bfa1f1d089a979684a1e18bdb37c54d523ed622e47c7131f2cf4c41d4baa71d1bb712a888c7fb6b40d1c34cc6b972d4dde8c5c8fbe892
+  data.tar.gz: d6008ffbfc3f803061e92a43d1b598b3179c51ed2205175b63213fe66525a25c71ee2d53e5b87761d0c70f703c325654dc58499a5e8aa3a07100642388039f02

data/app/controllers/workarea/current_tracking.rb

@@ -1,7 +1,6 @@
 module Workarea
   module CurrentTracking
     extend ActiveSupport::Concern
-    include HttpCaching
 
     included do
       before_action :ensure_current_metrics
@@ -27,7 +26,10 @@ module Workarea
       if email.blank?
         cookies.delete(:email)
       elsif email != cookies.signed[:email]
-        Metrics::User.find_or_initialize_by(id: email).merge!(current_visit&.metrics)
+        unless impersonating?
+          Metrics::User.find_or_initialize_by(id: email).merge!(current_visit&.metrics)
+        end
+
         cookies.permanent.signed[:email] = email
       end
 

data/app/controllers/workarea/impersonation.rb

@@ -15,10 +15,11 @@ module Workarea
       session[:user_id] = user.id.to_s
 
       user.mark_impersonated_by!(current_user)
-      @current_user = user
+      update_tracking!(email: user.email)
     end
 
     def stop_impersonation
+      update_tracking!(email: current_admin.email)
       session[:user_id] = current_admin.id.to_s
       session.delete(:admin_id)
     end

data/app/models/workarea/order/item.rb

@@ -33,17 +33,17 @@ module Workarea
     # To allow for custom policies defining their own methods here
     Workarea.config.fulfillment_policies.each do |class_name|
       define_method "#{class_name.demodulize.underscore}?" do
-        fulfillment == class_name.demodulize.underscore
+        fulfilled_by?(class_name.demodulize.underscore)
       end
     end
 
     # These methods exist for findability
     def shipping?
-      fulfillment == 'shipping'
+      fulfilled_by?('shipping')
     end
 
     def download?
-      fulfillment == 'download'
+      fulfilled_by?('download')
     end
 
     # Whether this order has any items that need to be fulfilled by a particular
@@ -53,7 +53,7 @@ module Workarea
     # @return [Boolean]
     #
     def fulfilled_by?(*types)
-      types.any? { |t| send("#{t}?") }
+      types.map(&:to_s).include?(fulfillment)
     end
 
     # Whether this item is a digital (not-shipped) type of item.

data/app/models/workarea/search/admin/inventory_sku.rb

@@ -11,7 +11,11 @@ module Workarea
         end
 
         def jump_to_text
-          "#{model.id} (#{model.available} available)"
+          I18n.t(
+            'workarea.inventory_sku.jump_to_text',
+            id: model.id,
+            count: model.available_to_sell
+          )
         end
 
         def jump_to_position

data/app/models/workarea/shipping/service.rb

@@ -37,15 +37,22 @@ module Workarea
       end
 
       def self.by_price(price)
-        cache.select do |method|
-          (method.subtotal_min.nil? || method.subtotal_min <= price) &&
-            (method.subtotal_max.nil? || method.subtotal_max >= price)
+        cache.select do |service|
+          (service.subtotal_min.nil? || service.subtotal_min <= price) &&
+            (service.subtotal_max.nil? || service.subtotal_max >= price)
         end
       end
 
       def self.find_tax_code(carrier, name)
-        method = find_by(carrier: carrier, name: name) rescue nil
-        method.try(:tax_code)
+        service = find_by(carrier: carrier, name: name) rescue nil
+        service.present? ? service.tax_code : default_tax_code(carrier, name)
+      end
+
+      def self.default_tax_code(carrier, name)
+        default = Workarea.config.default_shipping_service_tax_code
+        return default unless default.respond_to?(:call)
+
+        default.call(carrier, name)
       end
 
       def find_rate(price = 0.to_m)

data/config/initializers/00_configuration.rb

@@ -76,6 +76,17 @@ Workarea::Configuration.define_fields do
         zip: '19106'
       },
       description: 'Origin location for calculating shipping costs'
+
+    # This can be overwritten within the app to use a proc for more complex
+    # scenarios.
+    field 'Default Shipping Service Tax Code',
+      type: String,
+      allow_blank: true,
+      description: %(
+        Tax code assigned to shipping options when an existing service does
+        not exist. This is useful for third-party gateways to assign tax codes
+        to dynamically generated options.
+      ).squish
   end
 
   fieldset 'Payment', namespaced: false do

data/config/locales/en.yml

@@ -102,6 +102,7 @@ en:
       name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
+      jump_to_text: "%{id} (%{count} sellable)"
     inquiry:
       subjects: {}
     order:

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 18
+    PATCH = 19
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/lib/workarea/visit.rb

@@ -6,7 +6,6 @@ module Workarea
     attr_writer :override_segments
 
     delegate :postal_code, :city, :subdivision, :region, :country, to: :geolocation
-    delegate :admin?, to: :metrics
 
     def initialize(env)
       @env = env
@@ -25,6 +24,14 @@ module Workarea
       session[:user_id].present?
     end
 
+    def impersonating?
+      session[:admin_id].present?
+    end
+
+    def admin?
+      (logged_in? && impersonating?) || metrics.admin?
+    end
+
     def request
       @request ||= ActionDispatch::Request.new(env)
     end

data/test/integration/workarea/authentication_test.rb

@@ -3,8 +3,9 @@ require 'test_helper'
 module Workarea
   class AuthenticationTest < IntegrationTest
     class AuthenticationController < Workarea::ApplicationController
-      include Authentication
       include HttpCaching
+      include Authentication
+      include Impersonation
       include Storefront::CurrentCheckout
 
       before_action :cache_page, only: :cached

data/test/models/workarea/order/item_test.rb

@@ -55,6 +55,15 @@ module Workarea
         )
         assert(item.on_sale?)
       end
+
+      def test_fulfilled_by?
+        item.fulfillment = 'shipping'
+        assert(item.fulfilled_by?(:shipping))
+        assert(item.fulfilled_by?(:shipping, :download))
+        refute(item.fulfilled_by?(:download))
+        assert(item.shipping?)
+        refute(item.download?)
+      end
     end
   end
 end

data/test/models/workarea/shipping/service_test.rb

@@ -35,6 +35,32 @@ module Workarea
         assert_equal(3.to_m, shipping_service.find_rate(7.to_m).price)
         assert_equal(2.to_m, shipping_service.find_rate(10.to_m).price)
       end
+
+      def test_find_tax_code
+        create_shipping_service(name: 'Ground', carrier: 'UPS', tax_code: '001')
+        create_shipping_service(name: 'Express', carrier: 'UPS', tax_code: nil)
+        Workarea.config.default_shipping_service_tax_code = nil
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_nil(Service.find_tax_code('FedEx', 'Express'))
+
+        Workarea.config.default_shipping_service_tax_code = '101'
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+
+        Workarea.config.default_shipping_service_tax_code = -> (carrier, name) do
+          carrier == 'FedEx' ? '101' : '001'
+        end
+
+        assert_equal('001', Service.find_tax_code('UPS', 'Ground'))
+        assert_nil(Service.find_tax_code('UPS', 'Express'))
+        assert_equal('101', Service.find_tax_code('FedEx', 'Express'))
+        assert_equal('001', Service.find_tax_code('DHL', 'Overnight'))
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.18
+  version: 3.5.19
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler