effective_orders 4.5.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad3df094c171d191535ace76083767eb81ca14c43d88e029707224047b10ac5
-  data.tar.gz: 2313c2501be2b4a5f125e8d62b447d313ec1c060fc1fdece8ffad46b63a701d8
+  metadata.gz: 36b254eb8e99a4c04b3b63135b2b1caa15f5a8d7803bcad0fff8323b0aab957a
+  data.tar.gz: 699ccd522afef972528e9dcee5b5eae8abad124cf11e0002f84e5c7a06bf0e8b
 SHA512:
-  metadata.gz: a4da4f9348ad2c421aa4f5da78f3b2701a7df832f9c9c0508fd340a62d65e95f94f02f4b4e55e4efc3f0a985cf88d7e7f1db49166cfebc68e5f1722d01ca709b
-  data.tar.gz: 23359059a3fb55c3995bd368bd391f0f49156ceadd88b03db55cd22bf7138a7258cc007862d4b31f928e3467217554128b14616076800349918364a8b7f49c6a
+  metadata.gz: 784ec95030d906ab226f26d7f50651062979a3e50fdf286135fc81e3907d6bc23a93c77e1504433012ea59e49bcb4613702723b69a9fe58b858fd36a15ae1590
+  data.tar.gz: 7f1cf4534c235f84a025a040b2988fcfa8664046d7026de8665f4c14b139afdbd570a4491ffb46ade0d5ba40f80bd6403064f6de6aa5fa4e3ace5e1032331f83

data/app/datatables/admin/effective_orders_datatable.rb

@@ -14,11 +14,13 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   filters do
-    scope :purchased, default: true
-    scope :deferred
-    scope :refunds
-    scope :not_purchased
-    scope :all
+    if attributes[:user_id].blank? && attributes[:parent_id].blank?
+      scope :purchased, default: true
+      scope :deferred
+      scope :refunds
+      scope :not_purchased
+      scope :all
+    end
   end
 
   datatable do
@@ -43,6 +45,8 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
       col :email, visible: false
     end
 
+    col :parent, visible: false, search: :string
+
     col :cc, visible: false
 
     if EffectiveOrders.billing_address
@@ -90,6 +94,10 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
       scope = scope.where(user: user)
     end
 
+    if attributes[:parent_id].present? && attributes[:parent_type].present?
+      scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
+    end
+
     scope
   end
 

data/app/datatables/effective_orders_datatable.rb

@@ -21,6 +21,8 @@ class EffectiveOrdersDatatable < Effective::Datatable
       '#' + order.to_param
     end
 
+    col :parent, visible: false, search: :string
+
     unless attributes[:not_purchased]
       col :purchased_at do |order|
         order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
@@ -69,6 +71,10 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope = scope.not_purchased
     end
 
+    if attributes[:parent_id].present? && attributes[:parent_type].present?
+      scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
+    end
+
     scope
   end
 

data/app/models/effective/order.rb

@@ -225,6 +225,24 @@ module Effective
       retval.size == 1 ? retval.first : retval
     end
 
+
+    def update_prices!
+      raise('already purchased') if purchased?
+      raise('must be pending') unless pending?
+
+      order_items.each do |item|
+        purchasable = item.purchasable
+
+        if purchasable.blank? || purchasable.marked_for_destruction?
+          item.mark_for_destruction 
+        else
+          item.price = purchasable.price
+        end
+      end
+
+      save!
+    end
+
     def to_s
       if refund?
         "Refund ##{to_param}"

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.5.1'.freeze
+  VERSION = '4.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails