effective_orders 6.2.1 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5eb2878e3fa8291b4ea432ca80a7e52e2961f52b9d63ff235350922cc4388e
-  data.tar.gz: 27a85cedfbdb24ca8d6de87fac7655127960d320d5f09da77818b20fe1d9e29e
+  metadata.gz: 6bf799fd1e295b06b3e96d6083298bc3d56af80d2e5fc45aee9a3c45026e13bc
+  data.tar.gz: b03d84f686b369b97052b17f5b204b029d5ff79ab67bb8dd095e2b86a36af4be
 SHA512:
-  metadata.gz: 8dcb53a3bcb13831db8830265278e922129e9386c58050f337fdee2aefdd39fd551400b77698923141c401157ec2cc8f0a5718ec6f93f522e296eae809c953c6
-  data.tar.gz: 5118ee092b13b7d4de8a19e78662607e798d0c5c819fe5795a1db30c130acc37e9891ccb74af027d5a5461c782f5b795603f522bb9deac5aa29061fa5e040a98
+  metadata.gz: d96a318e778addc0d4174320c64fb54a0cf2c1e79fb0e4ea2286f69b5330562b08bdce127d9a4e02faae31afee9ebe1a1f0e043586623b92416c0256ced24d45
+  data.tar.gz: 6750bfa2d3c93be7cf208b0f8cc84dc355f7aab77a02553451e78d6c6a0b7ce10289ca8e4ca40ed1b93bf80594f40bc37b51d4b215d2742036565ef75b499b44

data/app/assets/stylesheets/effective_orders/_order.scss

@@ -61,6 +61,7 @@ form.new_effective_order {
   .effective-order-actions { display: none; }
   .effective-order-purchase-actions { display: none; }
   .effective-order-admin-purchase-actions { display: none; }
+  .effective-order-admin-logs { display: none; }
 
   .effective-heading { display: none; }
   .effective-admin-heading { display: none; }

data/app/controllers/admin/orders_controller.rb

@@ -38,7 +38,7 @@ module Admin
     # The show page posts to this action
     # See Effective::OrdersController checkout
     def checkout
-      @order = Effective::Order.not_purchased.find(params[:id])
+      @order = Effective::Order.was_not_purchased.find(params[:id])
 
       authorize_effective_order!
 
@@ -62,7 +62,7 @@ module Admin
     end
 
     def destroy
-      @order = Effective::Order.all.not_purchased.find(params[:id])
+      @order = Effective::Order.all.was_not_purchased.find(params[:id])
 
       authorize_effective_order!
 
@@ -76,7 +76,7 @@ module Admin
     end
 
     def send_payment_request
-      @order = Effective::Order.not_purchased.find(params[:id])
+      @order = Effective::Order.was_not_purchased.find(params[:id])
       authorize_effective_order!
 
       if @order.send_payment_request_to_buyer!
@@ -95,7 +95,7 @@ module Admin
     end
 
     def bulk_send_payment_request
-      @orders = Effective::Order.not_purchased.where(id: params[:ids])
+      @orders = Effective::Order.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.not_purchased.where(user: current_user) if current_user.present?
+      @pending_orders = Effective::Order.was_not_purchased.where(user: current_user) if current_user.present?
 
       @page_title ||= 'My Cart'
       EffectiveResources.authorize!(self, :show, @cart)

data/app/controllers/effective/orders_controller.rb

@@ -69,13 +69,13 @@ module Effective
 
     # Always step1
     def edit
-      @order ||= Effective::Order.not_purchased.find(params[:id])
+      @order ||= Effective::Order.was_not_purchased.find(params[:id])
       EffectiveResources.authorize!(self, :edit, @order)
     end
 
     # Confirms the order from existing order
     def update
-      @order ||= Effective::Order.not_purchased.find(params[:id])
+      @order ||= Effective::Order.was_not_purchased.find(params[:id])
       EffectiveResources.authorize!(self, :update, @order)
 
       @order.assign_attributes(checkout_params)
@@ -88,12 +88,6 @@ module Effective
       end
     end
 
-    # My Orders History
-    def index
-      @datatable = EffectiveOrdersDatatable.new(user_id: current_user.id)
-      EffectiveResources.authorize!(self, :index, Effective::Order.new(user: current_user))
-    end
-
     # 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])
@@ -110,25 +104,6 @@ module Effective
       EffectiveResources.authorize!(self, :show, @order)
     end
 
-    def send_buyer_receipt
-      @order = Effective::Order.purchased.find(params[:id])
-      EffectiveResources.authorize!(self, :show, @order)
-
-      if @order.send_order_receipt_to_buyer!
-        flash[:success] = "A receipt has been sent to #{@order.emails_send_to}"
-      else
-        flash[:danger] = "Unable to send receipt."
-      end
-
-      if respond_to?(:redirect_back)
-        redirect_back(fallback_location: effective_orders.order_path(@order))
-      elsif request.referrer.present?
-        redirect_to :back
-      else
-        redirect_to effective_orders.order_path(@order)
-      end
-    end
-
     def bulk_send_buyer_receipt
       @orders = Effective::Order.purchased.where(id: params[:ids])
 

data/app/datatables/admin/effective_orders_datatable.rb

@@ -87,7 +87,7 @@ module Admin
       col :note_to_buyer, visible: false
       col :note_internal, visible: false
 
-      actions_col partial: 'admin/orders/datatable_actions', partial_as: :order
+      actions_col
 
       unless attributes[:total] == false
         aggregate :total

data/app/datatables/effective_orders_datatable.rb

@@ -1,4 +1,4 @@
-# This is a user specific EffectiveOrdersDatatable
+# Dashboard Orders
 
 class EffectiveOrdersDatatable < Effective::Datatable
   filters do
@@ -66,25 +66,12 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    user_klass = (attributes[:user_type].constantize if attributes[:user_type].present?)
-    user_klass ||= current_user.class
-
-    user = user_klass.find(attributes[:user_id])
-
-    scope = Effective::Order.all.deep.where(user: user)
+    scope = Effective::Order.all.deep.where(user: current_user)
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
-    if attributes[:not_purchased]
-      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

@@ -18,6 +18,7 @@ module Effective
 
     acts_as_addressable(billing: { singular: true }, shipping: { singular: true })
     acts_as_reportable if respond_to?(:acts_as_reportable)
+    log_changes if respond_to?(:log_changes)
 
     attr_accessor :terms_and_conditions # Yes, I agree to the terms and conditions
     attr_accessor :confirmed_checkout   # Set on the Checkout Step 1
@@ -75,7 +76,8 @@ module Effective
 
     scope :purchased, -> { where(state: EffectiveOrders::PURCHASED) }
     scope :purchased_by, lambda { |user| purchased.where(user: user) }
-    scope :not_purchased, -> { where.not(state: EffectiveOrders::PURCHASED) }
+    scope :not_purchased, -> { where.not(state: [EffectiveOrders::PURCHASED, EffectiveOrders::DEFERRED]) }
+    scope :was_not_purchased, -> { where.not(state: EffectiveOrders::PURCHASED) }
 
     scope :pending, -> { where(state: EffectiveOrders::PENDING) }
     scope :confirmed, -> { where(state: EffectiveOrders::CONFIRMED) }
@@ -696,6 +698,7 @@ module Effective
     def send_order_receipt_to_buyer!
       EffectiveOrders.send_email(:order_receipt_to_buyer, self) if purchased?
     end
+    alias_method :send_buyer_receipt!, :send_order_receipt_to_buyer!
 
     def send_payment_request_to_buyer!
       EffectiveOrders.send_email(:payment_request_to_buyer, self) unless purchased?

data/app/models/effective/order_item.rb

@@ -7,6 +7,8 @@ module Effective
     belongs_to :purchasable, polymorphic: true
     accepts_nested_attributes_for :purchasable, allow_destroy: false
 
+    log_changes(to: :order) if respond_to?(:log_changes)
+
     if defined?(EffectiveQbSync)
       has_one :qb_order_item
     end

data/app/models/effective/product.rb

@@ -3,8 +3,7 @@ module Effective
     self.table_name = EffectiveOrders.products_table_name.to_s
 
     acts_as_purchasable
-
-    has_many :order_items, as: :purchasable
+    log_changes if respond_to?(:log_changes)
 
     effective_resource do
       name          :string

data/app/views/admin/orders/_form.html.haml

@@ -1,35 +1,16 @@
-= effective_form_with(model: [:admin, order], engine: true) do |f|
-  = f.hidden_field :user_type, value: (f.object.user || current_user).class.name
-
-  - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
-
-  = f.select :user_id, current_user.class.all, label: 'Buyer', required: true,
-    ajax_url: ajax_url, hint: 'The user that should purchase this order.'
-
-  = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
-
-  - if f.object.new_record?
-    = f.check_box :send_payment_request_to_buyer,
-      label: 'Yes, send a payment request email to the buyer and any cc.',
-      value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.send_payment_request_to_buyer : f.object.send_payment_request_to_buyer?)
-
-  %hr
-
-  %h2 Order Items
-  = f.has_many :order_items, remove: true do |fc|
-    = render 'order_item_fields', f: fc
-
-  %hr
-
-  .row
-    .col-md-6.effective-order-note-to-buyer
-      %h2 Note to Buyer
-      = f.text_area :note_to_buyer, disabled: f.object.purchased?, label: false,
-        hint: (f.object.purchased? ? 'This message was displayed to the buyer during checkout and appears on the receipt.' : 'This message will be displayed to the buyer during checkout and will appear on the receipt.')
-
-    .col-md-6.effective-order-internal-note
-      %h2 Internal Note
-      = f.text_area :note_internal, label: false,
-        hint: 'For internal admin use only. This note will never be displayed to the buyer.'
-
-  = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }
+= tabs do
+  = tab(order) do
+    - if order.custom_order? && order.in_progress?
+      - if order.persisted?
+        = collapse('show order') do
+          = render 'effective/orders/order', order: order, no_order_actions: true
+
+      = render 'admin/orders/form_order', order: order
+    - else
+      - # Order was already purchased. Display same as show action.
+      = render 'effective/orders/order', order: order
+      = render 'admin/orders/form_note_internal', order: order
+
+  - if order.persisted? && order.respond_to?(:logs_datatable)
+    = tab 'Logs' do
+      .effective-order-admin-logs= render_inline_datatable(order.logs_datatable)

data/app/views/admin/orders/_form_order.html.haml

@@ -0,0 +1,35 @@
+= effective_form_with(model: [:admin, order], engine: true) do |f|
+  = f.hidden_field :user_type, value: (f.object.user || current_user).class.name
+
+  - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+
+  = f.select :user_id, current_user.class.all, label: 'Buyer', required: true,
+    ajax_url: ajax_url, hint: 'The user that should purchase this order.'
+
+  = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
+
+  - if f.object.new_record?
+    = f.check_box :send_payment_request_to_buyer,
+      label: 'Yes, send a payment request email to the buyer and any cc.',
+      value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.send_payment_request_to_buyer : f.object.send_payment_request_to_buyer?)
+
+  %hr
+
+  %h2 Order Items
+  = f.has_many :order_items, remove: true do |fc|
+    = render 'order_item_fields', f: fc
+
+  %hr
+
+  .row
+    .col-md-6.effective-order-note-to-buyer
+      %h2 Note to Buyer
+      = f.text_area :note_to_buyer, disabled: f.object.purchased?, label: false,
+        hint: (f.object.purchased? ? 'This message was displayed to the buyer during checkout and appears on the receipt.' : 'This message will be displayed to the buyer during checkout and will appear on the receipt.')
+
+    .col-md-6.effective-order-internal-note
+      %h2 Internal Note
+      = f.text_area :note_internal, label: false,
+        hint: 'For internal admin use only. This note will never be displayed to the buyer.'
+
+  = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }

data/app/views/admin/orders/_order.html.haml

@@ -0,0 +1,8 @@
+= tabs do
+  = tab(order) do
+    = render 'effective/orders/order', order: order
+    = render 'admin/orders/form_note_internal', order: order
+
+  - if order.persisted? && order.respond_to?(:logs_datatable)
+    = tab 'Logs' do
+      .effective-order-admin-logs= render_inline_datatable(order.logs_datatable)

data/app/views/admin/orders/checkout.html.haml

@@ -1,4 +1,9 @@
-= render 'layout' do
-  %h1.effective-admin-heading= @page_title
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name) if resource.name
 
-  = render_checkout(@order, namespace: :admin, purchased_url: effective_orders.admin_order_path(@order), declined_url: effective_orders.admin_order_path(@order))
+- if @resource
+  .resource-buttons
+    = render_resource_buttons(@resource, checkout: false)
+
+  = card do
+    = render_checkout(@order, namespace: :admin, purchased_url: effective_orders.admin_order_path(@order), declined_url: effective_orders.admin_order_path(@order))

data/app/views/effective/orders/_datatable_actions.html.haml

@@ -1,2 +1,6 @@
 = dropdown(variation: :dropleft) do
   = dropdown_link_to (order.purchased? ? 'View' : 'Checkout'), effective_orders.order_path(order)
+
+  - if EffectiveResources.authorized?(controller, :send_buyer_receipt, order)
+    = dropdown_link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
+      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }

data/app/views/effective/orders/_order_actions.html.haml

@@ -1,25 +1,3 @@
 .effective-order-actions
   - if order.persisted?
-    = link_to 'Print', '#', class: 'btn btn-primary print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
-
-  - if order.purchased?
-    = link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
-      class: 'btn btn-secondary',
-      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
-
-  - if controller_path.include?('admin/') && (EffectiveResources.authorized?(controller, :admin, :effective_orders) rescue false)
-    - if order.persisted? && order.in_progress?
-      - if params[:action] == 'show'
-        = link_to('Edit', effective_orders.edit_admin_order_path(order), class: 'btn btn-primary')
-
-      - if params[:action] == 'edit'
-        = link_to('Show', effective_orders.admin_order_path(order), class: 'btn btn-primary')
-
-      - unless order.refund?
-        = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
-          class: 'btn btn-secondary',
-          data: { method: :post, confirm: "Send request for payment to #{order.emails_send_to}?" }
-
-      = link_to 'Delete', effective_orders.admin_order_path(order),
-        class: 'btn btn-danger',
-        data: { method: :delete, confirm: "Really delete #{order}?" }
+    = link_to icon('printer') + ' Print', '#', class: 'btn btn-sm btn-outline-primary print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'

data/app/views/effective/orders/pretend/_form.html.haml

@@ -1,8 +1,12 @@
-= effective_form_with(scope: :pretend, url: effective_orders.pretend_order_path(order), method: :post) do |f|
-  = f.hidden_field :purchased_url, value: purchased_url
-  = f.hidden_field :declined_url, value: declined_url
+.card
+  .card-body
+    %h2 Pretend Checkout
 
-  - if EffectiveOrders.pretend_message.present?
-    %p.text-right= EffectiveOrders.pretend_message
+    = effective_form_with(scope: :pretend, url: effective_orders.pretend_order_path(order), method: :post) do |f|
+      = f.hidden_field :purchased_url, value: purchased_url
+      = f.hidden_field :declined_url, value: declined_url
 
-  = f.submit order_checkout_label(:pretend), border: false
+      - if EffectiveOrders.pretend_message.present?
+        %p= EffectiveOrders.pretend_message
+
+      = f.submit order_checkout_label(:pretend), border: false, center: true

data/config/locales/effective_orders.en.yml

@@ -3,6 +3,12 @@ en:
     name: 'Effective Orders'
     acronym: 'Finance'
 
+  activerecord:
+    actions:
+      effective/order:
+        send_buyer_receipt: 'E-mail receipt to buyer'
+        send_buyer_receipt_confirm: 'Send receipt to @resource.emails_send_to?'
+
   datatables:
     admin/report_transactions_datatable: 'Individual Transactions'
     admin/report_transactions_grouped_by_name_datatable: 'Transactions Grouped By Name'

data/config/routes.rb

@@ -49,10 +49,12 @@ EffectiveOrders::Engine.routes.draw do
     resources :orders do
       member do
         post :send_payment_request
+        post :send_buyer_receipt
 
-        get :checkout
+        # GET should be last here
         post :checkout
         patch :checkout
+        get :checkout
       end
 
       collection do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.2.1'.freeze
+  VERSION = '6.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -239,17 +239,14 @@ files:
 - app/views/admin/customers/show.html.haml
 - app/views/admin/order_items/index.html.haml
 - app/views/admin/order_reports/index.html.haml
-- app/views/admin/orders/_datatable_actions.html.haml
 - app/views/admin/orders/_form.html.haml
 - app/views/admin/orders/_form_note_internal.html.haml
+- app/views/admin/orders/_form_order.html.haml
 - app/views/admin/orders/_layout.html.haml
+- app/views/admin/orders/_order.html.haml
 - app/views/admin/orders/_order_actions.html.haml
 - app/views/admin/orders/_order_item_fields.html.haml
 - app/views/admin/orders/checkout.html.haml
-- app/views/admin/orders/edit.html.haml
-- app/views/admin/orders/index.html.haml
-- app/views/admin/orders/new.html.haml
-- app/views/admin/orders/show.html.haml
 - app/views/effective/carts/_cart.html.haml
 - app/views/effective/carts/_cart_actions.html.haml
 - app/views/effective/carts/show.html.haml

data/app/views/admin/orders/_datatable_actions.html.haml

@@ -1,18 +0,0 @@
-= dropdown(variation: :dropleft) do
-  = dropdown_link_to 'View', effective_orders.admin_order_path(order)
-
-  - if order.purchased? == false
-    = dropdown_link_to 'Edit', effective_orders.edit_admin_order_path(order)
-
-  - if order.purchased?
-    = dropdown_link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
-      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
-
-  - if (order.pending? || order.confirmed? || order.deferred?) && !order.refund?
-    = dropdown_link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
-      data: { method: :post, confirm: "Send request for payment to #{order.emails_send_to}?" }
-
-    = dropdown_link_to 'Admin: Checkout', effective_orders.checkout_admin_order_path(order)
-
-    = dropdown_link_to "Delete #{order}", effective_orders.admin_order_path(order),
-      data: { method: :delete, confirm: "Really delete #{order}?" }

data/app/views/admin/orders/edit.html.haml

@@ -1,16 +0,0 @@
-= render 'layout' do
-  %h1.effective-admin-heading= @page_title
-
-  - if @order.custom_order? && @order.in_progress?
-    = render 'effective/orders/order_actions', order: @order
-
-    .mb-4
-      = collapse('show order') do
-        = render 'effective/orders/order', order: @order, no_order_actions: true
-
-    = render 'admin/orders/form', order: @order
-
-  - else
-    - # Same as the show action
-    = render 'effective/orders/order', order: @order
-    = render 'admin/orders/form_note_internal', order: @order

data/app/views/admin/orders/index.html.haml

@@ -1,7 +0,0 @@
-= render 'layout' do
-  %h1.effective-admin-heading= @page_title
-
-  %p.text-right.effective-admin-actions
-    = link_to 'New Order', effective_orders.new_admin_order_path, class: 'btn btn-primary'
-
-  = render_datatable @datatable

data/app/views/admin/orders/new.html.haml

@@ -1,4 +0,0 @@
-= render 'layout' do
-  %h1.effective-admin-heading= @page_title
-
-  = render 'admin/orders/form', order: @order

data/app/views/admin/orders/show.html.haml

@@ -1,5 +0,0 @@
-= render 'layout' do
-  %h1.effective-admin-heading= @page_title
-
-  = render 'effective/orders/order', order: @order
-  = render 'admin/orders/form_note_internal', order: @order