effective_orders 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a7fe7dc66dd81db05828a4dc7fcc67211ad1956d3271b60a998f7a69c1da1c
-  data.tar.gz: 73c4bada545b7698e54434976dff5f308d3cfc27ac849857dd1a9b4b9e9392eb
+  metadata.gz: cbc56753acb82a9f43d3c6cd058e4351cf54ee58d4df9fad0f266bb88d40af19
+  data.tar.gz: 4537fe9ccd27a6aeb1d659bedbe620e8e85d17f78f76609396c5fb05a4e79dc8
 SHA512:
-  metadata.gz: 4da869ec7f1ddec5dc4537a94fe3e110715d3a2de6665e03d2d994be76dc1661fe7e21f71cd1f47d57140e712ebbc5917eba7963c0f976aa1be9a34a809852ef
-  data.tar.gz: 5514e1b253e652fa2657d60c6afc0abf0dce6dce777a0605a20b732aee8e5856ce09cfafece85c5228c9d873bd3016c22e322a04021204340364e0f7bd2b549e
+  metadata.gz: 46733ccd15b8de247c865c88df956deb0e66234ca614aab1db0b79e60fade92c7b18c98b06ab508e6776d55cbf83c9dae6c7bf17b6598747f8739d019b17e382
+  data.tar.gz: bb9b03c81ed435ffd7dfe7320c975f0d76d86e45ec6e149b0667e6094107505cb0e9abcbefaa9cb8e2af3707e77aa29b1a2b1466dfc65dbc8fc5cc1ade3f8f81

data/app/controllers/admin/orders_controller.rb

@@ -4,10 +4,6 @@ module Admin
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_orders] : EffectiveOrders.layout)
 
-    # def effective_resource
-    #   @_effective_resource ||= Effective::Resource.new('effective/order', namespace: :admin)
-    # end
-
     def new
       @order = Effective::Order.new
 

data/app/datatables/effective_orders_datatable.rb

@@ -89,7 +89,11 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
-    attributes[:user_id].present? ? scope.where(user_id: attributes[:user_id]) : scope
+    if attributes[:user_id].present?
+      scope = scope.where(user_id: attributes[:user_id])
+    end
+
+    scope
   end
 
 end

data/app/models/effective/order.rb

@@ -29,7 +29,7 @@ module Effective
     attr_accessor :skip_buyer_validations # Set by Admin::Orders#create
 
     belongs_to :user, validate: false  # This is the buyer/user of the order. We validate it below.
-    has_many :order_items, -> { order(:id) }, inverse_of: :order, class_name: 'Effective::OrderItem'
+    has_many :order_items, -> { order(:id) }, inverse_of: :order, class_name: 'Effective::OrderItem', dependent: :delete_all
 
     accepts_nested_attributes_for :order_items, allow_destroy: false, reject_if: :all_blank
     accepts_nested_attributes_for :user, allow_destroy: false, update_only: true

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.3.1'.freeze
+  VERSION = '4.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails