effective_resources 2.9.6 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39e741d139479e1a017d296ec0969dfdfb3538306eaed9c68bf6d1cd0989ea0a
-  data.tar.gz: ba6488be9829f625c38cef081721a1c2c446fc3bbe1f99afdcf95624e0364dc5
+  metadata.gz: 3f405113f520922715e551829d9059c36e923291a35a7ae254898dcbc609d96a
+  data.tar.gz: 67e9d68e3b45d9173e14d51da7a6f8d8c6c1fdf35b8e74bc204f1a8261b47f6c
 SHA512:
-  metadata.gz: 7cee67d34504f2ccfb3e211336b04c22247245f03893cf0f5ec832c87ee3c1d2d6fc0cb3628b5bc5f889245d81a872904d7cadc7c7116fd0aab787ba3e270885
-  data.tar.gz: '03317804a2b7867a4ae53016b82ff68a406e17333bccb413a9cb935d2c990ed242f6c64d1afd5bf74caf452c2e3dcc1545189f9dfeb0d8bad1be52134009ccf4'
+  metadata.gz: 6ba2e27b1ef6e7ff8bdf4e154ef08b4b70687d8c5cae8e7907e4456c698769816bd70e4e2c9dd956f9197abccd225ca76b646bac0932ff72b70a8a1a32d754be
+  data.tar.gz: 697c1a6e458c761faeca1d96c527aba93d3814edd17169478828d6a9a56065ed917e98ed85e5419e15fd554eafadd8944efa48ca67d453f12ac6fce846f9c41c

data/app/controllers/concerns/effective/crud_controller.rb

@@ -121,7 +121,7 @@ module Effective
       datatable_klass = effective_resource.datatable_klass
       return unless datatable_klass.present?
 
-      datatable = datatable_klass.new(resource_datatable_attributes)
+      datatable = EffectiveResources.best(datatable_klass.name).new(resource_datatable_attributes)
       datatable.effective_resource = effective_resource if datatable.respond_to?(:effective_resource=)
       datatable
     end

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -40,7 +40,7 @@ module ActsAsPurchasableWizard
   end
 
   def submit_order
-    orders.first
+    orders.last
   end
 
   def find_or_build_submit_fees
@@ -49,6 +49,8 @@ module ActsAsPurchasableWizard
 
   def find_or_build_submit_order
     order = submit_order || orders.build(user: owner) # This is polymorphic user, might be an organization
+    order = orders.build(user: owner) if order.declined? # Make a new order, if the previous one was declined
+
     fees = submit_fees().reject { |fee| fee.marked_for_destruction? }
 
     # Make sure all Fees are valid

data/app/models/effective/resources/relation.rb

@@ -356,12 +356,14 @@ module Effective
           when :lt then relation.where(attribute.lt(term))
           when :lteq then relation.where(attribute.lteq(term))
           when :days_ago_eq
-            date = (Time.zone.now - (term.to_i).days)
+            date = Time.zone.now.advance(days: -term.to_i)
             relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", date.beginning_of_day, date.end_of_day)
           when :days_ago_lteq # 30 days or less ago.
-            relation.where("#{sql_column} >= ?", Time.zone.now - (term.to_i).days)
+            date = Time.zone.now.advance(days: -term.to_i)
+            relation.where("#{sql_column} >= ?", date)
           when :days_ago_gteq # 30 days or more ago
-            relation.where("#{sql_column} <= ?", Time.zone.now - (term.to_i).days)
+            date = Time.zone.now.advance(days: -term.to_i)
+            relation.where("#{sql_column} <= ?", date)
           else raise("Unexpected operation: #{operation}")
         end
       end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.9.6'.freeze
+  VERSION = '2.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.10.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails