workarea-core 3.5.15 → 3.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18e8846e0d53604a413bfebe9180793059f63eef7478a6efb5e3c0762e95112
-  data.tar.gz: 6bc004faf032a0172b6d6495ef3d666944cef5726f91a9d41fca8fc69ce03af3
+  metadata.gz: 569f33ae16d992354fca8761ef67ed5473a12755dda710cfff057ebd2d7aa2b4
+  data.tar.gz: 24b32513e4215b2aa1c67a5f1d930ae5f8a81ee098be08234eab95f69a6bc574
 SHA512:
-  metadata.gz: b367c165ee4ead94e2969e1ced60328c3fe0696bcac53df7a0a67f0eea1faad9e6b82c1eb6a4d1de2530460a7424326357ab6173c70fb7f0362e5c6435bb7f20
-  data.tar.gz: c7a378a34ebc05ee82b12bf92c85b89e22ca1035ed01a429986d4f82ad7cc664cc54ba411eef0419c9773848296dab6f5beae749e7206e33c5c88c9e032279ad
+  metadata.gz: 11b65e3f2de7268ec497fecb2019a10133e2a477cc5bf06cd64390976098baa97277a75a295633a4fd6e43b221d31453c6a4da99b1c05012534e19621a6c7d18
+  data.tar.gz: 614ed5b1d7970082ba8eb48b8448434737d194ed1fed7158537774b9e46dce862ab0cae2faafca35f40378a061e3a91c02b9ab4d36875201896ea33ff6b60991

data/app/models/workarea/checkout.rb

@@ -47,11 +47,7 @@ module Workarea
     def inventory
       @inventory ||= Inventory::Transaction.from_order(
         order.id,
-        order.items.inject({}) do |memo, item|
-          memo[item.sku] ||= 0
-          memo[item.sku] += item.quantity
-          memo
-        end
+        order.sku_quantities
       )
     end
 

data/app/models/workarea/inventory/sku.rb

@@ -142,11 +142,11 @@ module Workarea
       end
 
       def policy_class
-        "Workarea::Inventory::Policies::#{policy.classify}".constantize
+        "Workarea::Inventory::Policies::#{policy.camelize}".constantize
       rescue NameError
         raise(
           InvalidPolicy,
-          "Workarea::Inventory::Policies::#{policy.classify} must be a policy class"
+          "Workarea::Inventory::Policies::#{policy.camelize} must be a policy class"
         )
       end
 

data/app/models/workarea/metrics/user.rb

@@ -110,14 +110,28 @@ module Workarea
       end
 
       def merge!(other)
-        %w(orders revenue discounts cancellations refund).each do |field|
-          self.send("#{field}=", send(field) + other.send(field))
-        end
-
-        self.first_order_at = [first_order_at, other.first_order_at].compact.min
-        self.last_order_at = [last_order_at, other.last_order_at].compact.max
-        self.average_order_value = average_order_value
-        save!
+        # To recalculate average_order_value
+        self.orders += other.orders
+        self.revenue += other.revenue
+
+        update = {
+          '$set' => {
+            average_order_value: average_order_value,
+            updated_at: Time.current.utc
+          },
+          '$inc' => {
+            orders: other.orders,
+            revenue: other.revenue,
+            discounts: other.discounts,
+            cancellations: other.cancellations,
+            refund: other.refund
+          }
+        }
+
+        update['$min'] = { first_order_at: other.first_order_at.utc } if other.first_order_at.present?
+        update['$max'] = { last_order_at: other.last_order_at.utc } if other.last_order_at.present?
+
+        self.class.collection.update_one({ _id: id }, update, upsert: true)
 
         self.class.save_affinity(
           id: id,
@@ -133,6 +147,8 @@ module Workarea
           category_ids: other.purchased.category_ids,
           search_ids: other.purchased.search_ids
         )
+
+        reload
       end
     end
   end

data/app/models/workarea/order.rb

@@ -375,6 +375,16 @@ module Workarea
       )
     end
 
+    # A hash with the quantity of each SKU in the order
+    #
+    # @return [Hash]
+    #
+    def sku_quantities
+      items.each_with_object(Hash.new(0)) do |item, quantities|
+        quantities[item.sku] += item.quantity
+      end
+    end
+
     private
 
     def item_count_limit

data/app/models/workarea/payment.rb

@@ -80,12 +80,7 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        :month,
-        :year,
-        :saved_card_id,
-        :number,
-        :cvv,
-        :amount
+        *Workarea.config.credit_card_attributes
       )
       save
     end

data/lib/workarea/configuration.rb

@@ -1297,6 +1297,17 @@ module Workarea
 
       # The number of results that will show per-type in the admin jump to
       config.jump_to_results_per_type = 5
+
+      # Attributes that will be sliced out of params and persisted on
+      # the credit card tender during checkout.
+      config.credit_card_attributes = %i[
+        month
+        year
+        saved_card_id
+        number
+        cvv
+        amount
+      ]
     end
   end
 end

data/lib/workarea/configuration/administrable_options.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Configuration
     class AdministrableOptions < ActiveSupport::InheritableOptions
-      def method_missing(name, *args)
+      def [](name)
         static_config = super
         return static_config if static_config.present? || static_config.to_s == 'false'
         return static_config unless check_fieldsets?(name)
@@ -9,10 +9,6 @@ module Workarea
         Configuration::Admin.instance.send(name)
       end
 
-      def respond_to_missing?(name, include_private)
-        true
-      end
-
       private
 
       def check_fieldsets?(name)

data/lib/workarea/version.rb

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

metadata

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