effective_orders 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79e445447643f3b8f6dc4d1580016faeb8fa2a55ec8c0ebe902b92b9e83861e7
-  data.tar.gz: eeb3097f18e106737fa428099e1e20d26e4ac630dc0dafa3bac74640196d5ef8
+  metadata.gz: b6a326d583bd61702bc628143d2410df18b718a2664d0a890b770a080ac8b774
+  data.tar.gz: 3db513a6b48f22781475e64004d4505e67276d7fdbb2e4c31e14e72db6a73038
 SHA512:
-  metadata.gz: d33e07601346e3dadc7edef24182911b23631a4b1d7ffd45c1c782f4060d2c45e50c6502dae447158649c23ec32fad30dfc19dcbabd5eb5bc123276acf5db81e
-  data.tar.gz: 8c0b0a04fd6b39c111f09a998fe495b4e7ce2001d185b3eadca02700000f370027f682e189d1c2f0a8131fdb20081a99d8266904710bdf2a79b9827b2c6d0c48
+  metadata.gz: 03c9a070559a2cdd72f5fb035acaebfeaeffa453bdf05d45ef8fb0835babf72797304414cd0ea951ea16d209b16d2fd5432c85ff802ab7a1b209d9c3848021a7
+  data.tar.gz: 0f46f551e66b659cf52deb9ddaa6d6f3eaeba4a37691b10001e01eefae4a3f120c949c3a4ed1818e70d058ea5d812ac6eda3b03af8df8bdf65f16f3f2dd54e6b

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

@@ -31,6 +31,9 @@ module ActsAsPurchasable
     has_many :purchased_orders, -> { where(state: EffectiveOrders::PURCHASED).order(:purchased_at) },
       through: :order_items, class_name: 'Effective::Order', source: :order
 
+    has_many :deferred_orders, -> { where(state: EffectiveOrders::DEFERRED).order(:created_at) },
+      through: :order_items, class_name: 'Effective::Order', source: :order
+
     # Database max integer value is 2147483647.  So let's round that down and use a max/min of $20 million (2000000000)
     validates :price, presence: true
     validates :price, numericality: { less_than_or_equal_to: 2000000000, message: 'maximum price is $20,000,000' }
@@ -96,6 +99,10 @@ module ActsAsPurchasable
     purchased_order_id.present?
   end
 
+  def deferred?
+    deferred_orders.any? { |order| order.deferred? }
+  end
+
   def purchased_at
     purchased_order.try(:purchased_at)
   end

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.1'.freeze
+  VERSION = '6.4.0'.freeze
 end

metadata

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