effective_orders 5.9.0 → 5.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a959b70b778d7a61499dcaec401c812b0fda1685fbbf9593fb75dd12aa21b6
-  data.tar.gz: 79f227bd79c340bfe03e37db465dc85addeecf36ab33c3b4977e85ad8bc46a53
+  metadata.gz: 460e5652f16e49b5751f29cecd6d1cd41f8b92c5d9cb10d36f8f7f863fad9ca5
+  data.tar.gz: d2f4c23a86b09022a38779718232ebe2b5226c5e1ca03b9286a6cf6a3504564e
 SHA512:
-  metadata.gz: 10f7edcd5aa36dfcc1a37802453c781e6e40818747818e14a09994ded71d53021fb4e0218dc5302c15ff952fe4f9272ae846d0b5dce5d897bba530c1e561e51a
-  data.tar.gz: 7450d630b12ae7755093f99239e759f88d0b3ff077bd04cf1a7eb9c9c740dd3d62c5d22db5649d6f594e6299d7162d7936ede470de24a3648008bf11bc9ecdd6
+  metadata.gz: cee63481230c23907ef97547657e402d566b09c0f030fb4bae984608f352ca9a7715beedf5ccc6b7cba9e0f3ef96c4f550dd55d9ca50d57d7051a3e173316143
+  data.tar.gz: fee709031224ca9818f454f73c7781dfb1259ec1bca86938b6f31450f3d1dddb2d71ae1521ad8fc7d026c405cac078fe5cb81ab1a6a18b7b1c309a241c2d0e2e

data/app/datatables/admin/effective_orders_datatable.rb

@@ -40,7 +40,7 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     end
 
     col :purchased_at do |order|
-      order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || 'not purchased'
+      order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || ("pending #{order.payment_provider}" if order.deferred?) || 'not purchased'
     end
 
     if attributes[:user_id].blank?
@@ -66,6 +66,7 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     end
 
     col :payment_method
+    col :payment_provider
 
     col :subtotal, as: :price, visible: false
     col :tax, as: :price, visible: false

data/app/models/concerns/acts_as_purchasable.rb

@@ -1,3 +1,15 @@
+# Acts as purchasable
+# Add to your model:
+# t.integer :purchased_order_id
+# t.integer :price
+# t.boolean :tax_exempt, default: false
+# t.string :qb_item_name
+# or
+# add_column :resources, :purchased_order_id, :integer
+# add_column :resources, :price, :integer
+# add_column :resources, :tax_exempt, :boolean, default: false
+# add_column :resources, :qb_item_name, :string
+
 module ActsAsPurchasable
   extend ActiveSupport::Concern
 

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

@@ -0,0 +1,2 @@
+.effective-orders
+  = yield

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

@@ -1,3 +1,4 @@
-%h1.effective-admin-heading= @page_title
+= render 'layout' do
+  %h1.effective-admin-heading= @page_title
 
-= render_checkout(@order, namespace: :admin, purchased_url: effective_orders.admin_order_path(@order), declined_url: effective_orders.admin_order_path(@order))
+  = render_checkout(@order, namespace: :admin, purchased_url: effective_orders.admin_order_path(@order), declined_url: effective_orders.admin_order_path(@order))

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

@@ -1,15 +1,16 @@
-%h1.effective-admin-heading= @page_title
+= render 'layout' do
+  %h1.effective-admin-heading= @page_title
 
-- if @order.custom_order? && @order.in_progress?
-  = render 'effective/orders/order_actions', order: @order
+  - 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
+    .mb-4
+      = collapse('show order') do
+        = render 'effective/orders/order', order: @order, no_order_actions: true
 
-  = render 'admin/orders/form', order: @order
+    = 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
+  - 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,6 +1,7 @@
-%h1.effective-admin-heading= @page_title
+= 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'
+  %p.text-right.effective-admin-actions
+    = link_to 'New Order', effective_orders.new_admin_order_path, class: 'btn btn-primary'
 
-= render_datatable @datatable
+  = render_datatable @datatable

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

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

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

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

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

@@ -0,0 +1,2 @@
+.effective-orders
+  = yield

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

@@ -1,10 +1,11 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-%p.effective-orders-page-content
-  - if current_cart.present?
-    Your #{link_to_current_cart(label: 'Cart')} items have been saved. Please try again.
-  - else
-    Please try again.
+  %p.effective-orders-page-content
+    - if current_cart.present?
+      Your #{link_to_current_cart(label: 'Cart')} items have been saved. Please try again.
+    - else
+      Please try again.
 
-%p.text-center
-  = link_to 'Continue', root_path, class: 'btn btn-primary'
+  %p.text-center
+    = link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -1,11 +1,12 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-%p.effective-orders-page-content
-  You have indicated that this order will be paid by #{@order.payment_provider}.
-  Your order will not be considered purchased until we receive your payment.
-  Please contact us at your earliest convenience.
+  %p.effective-orders-page-content
+    You have indicated that this order will be paid by #{@order.payment_provider}.
+    Your order will not be considered purchased until we receive your payment.
+    Please contact us at your earliest convenience.
 
-= render @order
+  = render @order
 
-%p.text-center
-  = link_to 'Continue', root_path, class: 'btn btn-primary'
+  %p.text-center
+    = link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -1,3 +1,4 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-= render_checkout_step1(@order)
+  = render_checkout_step1(@order)

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

@@ -1,3 +1,4 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-= render_datatable(@datatable)
+  = render_datatable(@datatable)

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

@@ -1,3 +1,4 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-= render_checkout_step1(@order)
+  = render_checkout_step1(@order)

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

@@ -1,9 +1,10 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-%p.effective-orders-page-content
-  You have successfully purchased the following:
+  %p.effective-orders-page-content
+    You have successfully purchased the following:
 
-= render @order
+  = render @order
 
-%p.text-center
-  = link_to 'Continue', root_path, class: 'btn btn-primary'
+  %p.text-center
+    = link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -1,9 +1,10 @@
-%h1.effective-heading= @page_title
+= render 'layout' do
+  %h1.effective-heading= @page_title
 
-- if !@order.purchased? && @order.user == current_user
-  = render_checkout(@order)
-- else
-  = render(@order)
+  - if !@order.purchased? && @order.user == current_user
+    = render_checkout(@order)
+  - else
+    = render(@order)
 
-  %p.text-center
-    = link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'
+    %p.text-center
+      = link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.9.0'.freeze
+  VERSION = '5.9.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.9.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -236,6 +236,7 @@ files:
 - 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/_layout.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
@@ -257,6 +258,7 @@ files:
 - app/views/effective/orders/_fields.html.haml
 - app/views/effective/orders/_fields_note.html.haml
 - app/views/effective/orders/_fields_terms.html.haml
+- app/views/effective/orders/_layout.html.haml
 - app/views/effective/orders/_order.html.haml
 - app/views/effective/orders/_order_actions.html.haml
 - app/views/effective/orders/_order_deferred.html.haml