effective_orders 6.3.0 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf799fd1e295b06b3e96d6083298bc3d56af80d2e5fc45aee9a3c45026e13bc
-  data.tar.gz: b03d84f686b369b97052b17f5b204b029d5ff79ab67bb8dd095e2b86a36af4be
+  metadata.gz: dcf54cb263731e52d92dde70fa2035f84ed936cdffedc4e4fb204812270f9ac6
+  data.tar.gz: 3c12854db2e85a59e269b9e804de2828973b95e361add948012863146a181359
 SHA512:
-  metadata.gz: d96a318e778addc0d4174320c64fb54a0cf2c1e79fb0e4ea2286f69b5330562b08bdce127d9a4e02faae31afee9ebe1a1f0e043586623b92416c0256ced24d45
-  data.tar.gz: 6750bfa2d3c93be7cf208b0f8cc84dc355f7aab77a02553451e78d6c6a0b7ce10289ca8e4ca40ed1b93bf80594f40bc37b51d4b215d2742036565ef75b499b44
+  metadata.gz: e627ddb5abcd86a77e66ad3ac4d880b83379fc7ed5d45188ffa662675d4fbdecbd6d1af05b4cae63a32334d529fea0a57ca7c14ef7aa9de7b59fa57bcb1de436
+  data.tar.gz: 32fe71842c0c28eb5c27e205fec73f065eaace30de1480f3ce7e07554306180522d35f02c5c7c08a6a3e63ae67cdb1b8c028f58af2a107fb4e12f8e3f982bbbc

data/app/datatables/admin/report_transactions_datatable.rb

@@ -19,6 +19,8 @@ module Admin
       col :purchased_at
       col :user
       col :order_items
+      col :payment_provider, search: EffectiveOrders.payment_providers
+      col :payment_method
 
       col :subtotal, as: :price
       col :tax, as: :price

data/app/models/concerns/acts_as_purchasable.rb

@@ -80,7 +80,7 @@ module ActsAsPurchasable
     elsif value.blank?
       super
     else
-      raise 'expected price to be an Integer representing the number of cents.'
+      raise "expected price to be an Integer representing the number of cents. Got: #{value}"
     end
   end
 

data/app/models/effective/order.rb

@@ -116,14 +116,11 @@ module Effective
 
     # Price validations
     validates :subtotal, presence: true
+    validates :total, presence: true, if: -> { EffectiveOrders.minimum_charge.to_i > 0 }
 
-    with_options(if: -> { EffectiveOrders.minimum_charge.to_i > 0 }) do
-      validates :total, presence: true
-
-      validate(unless: -> { (free? && EffectiveOrders.free?) || (refund? && EffectiveOrders.refund?) }) do
-        if total.present? && total < EffectiveOrders.minimum_charge
-          errors.add(:total, "must be $#{'%0.2f' % (EffectiveOrders.minimum_charge.to_i / 100.0)} or more. Please add additional items.")
-        end
+    validate(if: -> { total.present? && EffectiveOrders.minimum_charge.to_i > 0 }, unless: -> { purchased? || (free? && EffectiveOrders.free?) || (refund? && EffectiveOrders.refund?) }) do
+      if total < EffectiveOrders.minimum_charge
+        errors.add(:total, "must be $#{'%0.2f' % (EffectiveOrders.minimum_charge.to_i / 100.0)} or more. Please add additional items.")
       end
     end
 

data/app/models/effective/order_item.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Effective
+  # An Order Item
   class OrderItem < ActiveRecord::Base
     self.table_name = EffectiveOrders.order_items_table_name.to_s
 
@@ -9,9 +12,7 @@ module Effective
 
     log_changes(to: :order) if respond_to?(:log_changes)
 
-    if defined?(EffectiveQbSync)
-      has_one :qb_order_item
-    end
+    has_one :qb_order_item if defined?(EffectiveQbSync)
 
     effective_resource do
       name                  :string

data/app/views/admin/order_reports/index.html.haml

@@ -1,3 +1,4 @@
 %h1.effective-admin-heading= @page_title
 
-= render_datatable(@datatable)
+= card do
+  = render_datatable(@datatable)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.3.0'.freeze
+  VERSION = '6.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails