effective_orders 6.9.2 → 6.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb7f14bfc42d84987d1d976c538855e0afedc96d645517d4e56fab622d99b96
-  data.tar.gz: cd087b17ba0a60521fdb1cc01b77f6a143d6b5eabda4b20a5b30e2d925fbe234
+  metadata.gz: 41a7cabd3ec382ec58b642aed68b6b90cb608fb089e438ed550262cbc569a63d
+  data.tar.gz: 9980165d58544c3f64774230e5c50cd26c95896df5d3f329c179d8f4daf8a3e0
 SHA512:
-  metadata.gz: ef42dda56e817ab503e886deb2001434859a15fb1b409be5cf83c03ae60e98fdb0ff67e7efd1a28194647a8ef222d8cfa668db1d5ec8c7e95f08e50e49b7d7dd
-  data.tar.gz: e3b9c7ac973aa14df168670a478140f75b67bf78a062bc667273efba120eba889370e8f4e339bb7c1543cffae82a433e5cf1a7b08a50d454dd4ad39d4b574733
+  metadata.gz: 9c949c47c769eefd302ad4a789583c8cdf0e443b74a43518c7164d88c4aa53c21891f4a1c0af6d05a48b65a528bc87f41e60d8431a29aac5e9d89cff29cc0bf4
+  data.tar.gz: 941e3ec2e9453e54057e82876c33094df40cbe1255a842e276d35087f3ae7e62db99a8f1497fcd44cb434e5db0b18cf362e2c461c7d0ed93ebeac04b95cd8cd8

data/app/controllers/admin/orders_controller.rb

@@ -21,7 +21,7 @@ module Admin
     }
 
     def create
-      @order = Effective::Order.new
+      @order = Effective::Order.deep.new
       @order.assign_attributes(permitted_params)
 
       authorize_effective_order!
@@ -38,7 +38,7 @@ module Admin
     # The show page posts to this action
     # See Effective::OrdersController checkout
     def checkout
-      @order = Effective::Order.was_not_purchased.find(params[:id])
+      @order = Effective::Order.deep.was_not_purchased.find(params[:id])
 
       authorize_effective_order!
 
@@ -61,7 +61,7 @@ module Admin
     end
 
     def destroy
-      @order = Effective::Order.all.was_not_purchased.find(params[:id])
+      @order = Effective::Order.deep.was_not_purchased.find(params[:id])
 
       authorize_effective_order!
 
@@ -75,7 +75,7 @@ module Admin
     end
 
     def send_payment_request
-      @order = Effective::Order.was_not_purchased.find(params[:id])
+      @order = Effective::Order.deep.was_not_purchased.find(params[:id])
       authorize_effective_order!
 
       if @order.send_payment_request_to_buyer!
@@ -88,7 +88,7 @@ module Admin
     end
 
     def bulk_send_payment_request
-      @orders = Effective::Order.was_not_purchased.where(id: params[:ids])
+      @orders = Effective::Order.deep.was_not_purchased.where(id: params[:ids])
 
       begin
         authorize_effective_order!

data/app/controllers/effective/carts_controller.rb

@@ -10,7 +10,7 @@ module Effective
 
     def show
       @cart = current_cart
-      @pending_orders = Effective::Order.was_not_purchased.where(user: current_user) if current_user.present?
+      @pending_orders = Effective::Order.deep.was_not_purchased.where(user: current_user) if current_user.present?
 
       @page_title ||= 'My Cart'
       EffectiveResources.authorize!(self, :show, @cart)

data/app/controllers/effective/customers_controller.rb

@@ -12,7 +12,7 @@ module Effective
     page_title 'Customer Settings'
 
     def resource
-      @customer = Effective::Customer.where(user: current_user).first!
+      @customer = Effective::Customer.deep.where(user: current_user).first!
       @subscripter ||= Effective::Subscripter.new(customer: @customer, current_user: current_user)
     end
 

data/app/controllers/effective/orders_controller.rb

@@ -29,7 +29,7 @@ module Effective
     # It displayes an order based on the cart
     # Always step1
     def new
-      @order ||= Effective::Order.new(view_context.current_cart)
+      @order ||= Effective::Order.deep.new(view_context.current_cart)
 
       EffectiveResources.authorize!(self, :new, @order)
 
@@ -42,7 +42,7 @@ module Effective
 
     # Confirms an order from the cart.
     def create
-      @order ||= Effective::Order.new(view_context.current_cart)
+      @order ||= Effective::Order.deep.new(view_context.current_cart)
       EffectiveResources.authorize!(self, :create, @order)
 
       @order.assign_attributes(checkout_params)
@@ -61,7 +61,7 @@ module Effective
     # This is the entry point for an existing order.
     # Might render step1 or step2
     def show
-      @order ||= Effective::Order.find(params[:id])
+      @order ||= Effective::Order.deep.find(params[:id])
       @page_title ||= view_context.order_page_title(@order)
 
       EffectiveResources.authorize!(self, :show, @order)
@@ -69,7 +69,7 @@ module Effective
 
     # Always step1
     def edit
-      @order ||= Effective::Order.was_not_purchased.find(params[:id])
+      @order ||= Effective::Order.deep.was_not_purchased.find(params[:id])
       @page_title ||= view_context.order_page_title(@order)
 
       EffectiveResources.authorize!(self, :edit, @order)
@@ -77,7 +77,7 @@ module Effective
 
     # Confirms the order from existing order
     def update
-      @order ||= Effective::Order.was_not_purchased.find(params[:id])
+      @order ||= Effective::Order.deep.was_not_purchased.find(params[:id])
       EffectiveResources.authorize!(self, :update, @order)
 
       @order.assign_attributes(checkout_params)
@@ -92,23 +92,23 @@ module Effective
 
     # Thank you for Purchasing this Order. This is where a successfully purchased order ends up
     def purchased # Thank You!
-      @order = Effective::Order.purchased.find(params[:id])
+      @order = Effective::Order.deep.purchased.find(params[:id])
       EffectiveResources.authorize!(self, :show, @order)
     end
 
     def deferred
-      @order = Effective::Order.deferred.find(params[:id])
+      @order = Effective::Order.deep.deferred.find(params[:id])
       EffectiveResources.authorize!(self, :show, @order)
     end
 
     def declined
-      @order = Effective::Order.declined.find(params[:id])
+      @order = Effective::Order.deep.declined.find(params[:id])
       EffectiveResources.authorize!(self, :show, @order)
     end
 
     # This is used by both the Admin and User
     def send_buyer_receipt
-      @order = Effective::Order.purchased.find(params[:id])
+      @order = Effective::Order.deep.purchased.find(params[:id])
 
       EffectiveResources.authorize!(self, :show, @order)
 
@@ -122,7 +122,7 @@ module Effective
     end
 
     def bulk_send_buyer_receipt
-      @orders = Effective::Order.purchased.where(id: params[:ids])
+      @orders = Effective::Order.deep.purchased.where(id: params[:ids])
 
       begin
         EffectiveResources.authorize!(self, :index, Effective::Order.new(user: current_user))

data/app/controllers/effective/providers/cheque.rb

@@ -6,7 +6,7 @@ module Effective
       def cheque
         raise('cheque provider is not available') unless EffectiveOrders.cheque?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/etransfer.rb

@@ -6,7 +6,7 @@ module Effective
       def etransfer
         raise('etransfer provider is not available') unless EffectiveOrders.etransfer?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/free.rb

@@ -6,7 +6,7 @@ module Effective
       def free
         raise('free provider is not available') unless EffectiveOrders.free?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/mark_as_paid.rb

@@ -6,7 +6,7 @@ module Effective
       def mark_as_paid
         raise('mark_as_paid provider is not available') unless EffectiveOrders.mark_as_paid?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
         EffectiveResources.authorize!(self, :admin, :effective_orders)

data/app/controllers/effective/providers/moneris.rb

@@ -12,7 +12,7 @@ module Effective
       def moneris_postback
         raise('moneris provider is not available') unless EffectiveOrders.moneris?
 
-        @order ||= Effective::Order.find(params[:response_order_id])
+        @order ||= Effective::Order.deep.find(params[:response_order_id])
 
         # We do this even if we're not authorized
         EffectiveResources.authorized?(self, :update, @order)

data/app/controllers/effective/providers/moneris_checkout.rb

@@ -6,7 +6,7 @@ module Effective
       def moneris_checkout
         raise('moneris_checkout provider is not available') unless EffectiveOrders.moneris_checkout?
 
-        @order = Order.find(params[:id])
+        @order = Order.deep.find(params[:id])
 
         # We do this even if we're not authorized.
         EffectiveResources.authorized?(self, :update, @order)

data/app/controllers/effective/providers/paypal.rb

@@ -12,7 +12,7 @@ module Effective
       def paypal_postback
         raise('paypal provider is not available') unless EffectiveOrders.paypal?
 
-        @order ||= Effective::Order.where(id: (params[:invoice].to_i rescue 0)).first
+        @order ||= Effective::Order.deep.where(id: (params[:invoice].to_i rescue 0)).first
 
         # We do this even if we're not authorized
         EffectiveResources.authorized?(self, :update, @order)

data/app/controllers/effective/providers/phone.rb

@@ -6,7 +6,7 @@ module Effective
       def phone
         raise('phone provider is not available') unless EffectiveOrders.phone?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/pretend.rb

@@ -6,7 +6,7 @@ module Effective
       def pretend
         raise('pretend provider is not available') unless EffectiveOrders.pretend?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/refund.rb

@@ -7,7 +7,7 @@ module Effective
         raise('refund provider is not available') unless EffectiveOrders.refund?
         raise('refund provider is not configured for buyer purchase') unless EffectiveOrders.buyer_purchases_refund?
 
-        @order ||= Order.find(params[:id])
+        @order ||= Order.deep.find(params[:id])
 
         EffectiveResources.authorize!(self, :update, @order)
 

data/app/controllers/effective/providers/stripe.rb

@@ -6,7 +6,7 @@ module Effective
       def stripe
         raise('stripe provider is not available') unless EffectiveOrders.stripe?
 
-        @order = Order.find(params[:id])
+        @order = Order.deep.find(params[:id])
         @customer = Effective::Customer.for_user(current_user)
 
         EffectiveResources.authorize!(self, :update, @order)

data/app/datatables/admin/report_transactions_datatable.rb

@@ -23,9 +23,9 @@ module Admin
         col :organization
       end
 
-      col :user
-      col :order_items
-      col :payment_provider, search: EffectiveOrders.payment_providers
+      col :user, visible: false
+      col :order_items, visible: false
+      col :payment_provider, search: EffectiveOrders.payment_providers, visible: false
       col :payment_method
 
       col :subtotal, as: :price

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -15,13 +15,13 @@ module Admin
       col :total, as: :price
 
       payment_providers.each do |provider|
-        col(provider, as: :price)
+        col("p - #{provider}", as: :price, visible: false)
       end
 
       col :orders_count
 
-      col :orders
-      col :users
+      col :orders, visible: false
+      col :users, visible: false
 
       col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -15,13 +15,13 @@ module Admin
       col :total, as: :price
 
       payment_providers.each do |provider|
-        col(provider, as: :price)
+        col("p - #{provider}", as: :price, visible: false)
       end
 
       col :orders_count
 
-      col :orders
-      col :users
+      col :orders, visible: false
+      col :users, visible: false
 
       col :start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')

data/app/models/effective/order.rb

@@ -103,7 +103,10 @@ module Effective
       serialize :payment, Hash
     end
 
-    scope :deep, -> { includes(:addresses, :user, :purchased_by, :organization, order_items: :purchasable) }
+    scope :deep, -> { 
+      includes(:addresses, :user, :parent, :purchased_by, :organization, order_items: :purchasable) 
+    }
+
     scope :sorted, -> { order(:id) }
 
     scope :purchased, -> { where(status: :purchased) }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.9.2'.freeze
+  VERSION = '6.9.5'.freeze
 end

metadata

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