effective_orders 2.1.17 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cb8772c01ec2ba2e8c05602baf9bde31edc56c3
-  data.tar.gz: 51689a4cb46017b65093206a00af973951eb7bdf
+  metadata.gz: 19e07ec1d07242e5f32deffbf1781c2b5581892f
+  data.tar.gz: 6d3288fbd94d0a03062cce8c590a89aff3e7bdb8
 SHA512:
-  metadata.gz: 2fa6b69a7b6136ef1a4e73375d88c7129312c12585c744f3f1f6609209a023bf97cba4f6b8a918b6f0e16cf5fafc20a19e9e9137753b7b93ca1ecd5e625b83f4
-  data.tar.gz: d4e2eff6b5909da09d95cb5452a6db1df130d92ca6a26782b83cf4ab4fbe99ef937f05fa55e3833c07e43a25b89d0a3ce838c47f0f0caa963af8c76dae6b8e68
+  metadata.gz: 9a6e170de89d924e91182974aab8c24927803eb5ab11600d5ecbf2c31a447ed41b52863abfed0db5a923a439ff593b3df5997338bdfa6959e7b9635e949e4b8d
+  data.tar.gz: 8ee0b8ad9be88093640859e682bf1ece228e291192ff3607cb0df8e12a6f3653474f6c021558b239967f02096da5f5e4aba485eafb436784c96b248bfd308d68

data/README.md

@@ -1114,9 +1114,6 @@ end
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
-Code and Effect is the product arm of [AgileStyle](http://www.agilestyle.com/), an Edmonton-based shop that specializes in building custom web applications with Ruby on Rails.
-
-
 ## Testing
 
 Run tests by:

data/app/controllers/admin/customers_controller.rb

@@ -5,7 +5,7 @@ module Admin
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_customers] : EffectiveOrders.layout)
 
     def index
-      @datatable = Effective::Datatables::Customers.new() if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::Customers.new()
       @page_title = 'Customers'
 
       EffectiveOrders.authorized?(self, :admin, :effective_orders)

data/app/controllers/admin/order_items_controller.rb

@@ -5,7 +5,7 @@ module Admin
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_orders] : EffectiveOrders.layout)
 
     def index
-      @datatable = Effective::Datatables::OrderItems.new() if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::OrderItems.new()
       @page_title = 'Order Items'
 
       EffectiveOrders.authorized?(self, :admin, :effective_orders)

data/app/controllers/admin/orders_controller.rb

@@ -5,7 +5,7 @@ module Admin
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_orders] : EffectiveOrders.layout)
 
     def index
-      @datatable = Effective::Datatables::Orders.new() if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::Orders.new()
       @page_title = 'Orders'
 
       authorize_effective_order!

data/app/models/effective/datatables/customers.rb

@@ -1,39 +1,37 @@
-if defined?(EffectiveDatatables)
-  module Effective
-    module Datatables
-      class Customers < Effective::Datatable
-        datatable do
-          default_order :email, :asc
+module Effective
+  module Datatables
+    class Customers < Effective::Datatable
+      datatable do
+        default_order :email, :asc
 
-          table_column :id, visible: false
-          table_column(:email, column: 'users.email') { |user| mail_to user.email, user.email }
+        table_column :id, visible: false
+        table_column(:email, column: 'users.email') { |user| mail_to user.email, user.email }
 
-          if EffectiveOrders.stripe_enabled
-            table_column :stripe_customer_id
-            table_column :stripe_active_card
-          end
+        if EffectiveOrders.stripe_enabled
+          table_column :stripe_customer_id
+          table_column :stripe_active_card
+        end
 
-          if EffectiveOrders.stripe_connect_enabled
-            table_column :stripe_connect_access_token
-          end
+        if EffectiveOrders.stripe_connect_enabled
+          table_column :stripe_connect_access_token
+        end
 
-          table_column :subscription_types, column: 'subscription_types'
+        table_column :subscription_types, column: 'subscription_types'
 
-          actions_column partial: 'admin/customers/actions'
-        end
+        actions_column partial: 'admin/customers/actions'
+      end
 
-        def collection
-          Effective::Customer.customers.uniq
-            .joins(:user, :subscriptions)
-            .select('customers.*, users.email AS email')
-            .select("array_to_string(array(#{Effective::Subscription.purchased.select('subscriptions.stripe_plan_id').where('subscriptions.customer_id = customers.id').to_sql}), ' ,') AS subscription_types")
-            .group('customers.id, subscriptions.stripe_plan_id, users.email')
-        end
+      def collection
+        Effective::Customer.customers.uniq
+          .joins(:user, :subscriptions)
+          .select('customers.*, users.email AS email')
+          .select("array_to_string(array(#{Effective::Subscription.purchased.select('subscriptions.stripe_plan_id').where('subscriptions.customer_id = customers.id').to_sql}), ' ,') AS subscription_types")
+          .group('customers.id, subscriptions.stripe_plan_id, users.email')
+      end
 
-        def search_column(collection, table_column, search_term)
-          return collection.where('subscriptions.stripe_plan_id ILIKE ?', "%#{search_term}%") if table_column[:name] == 'subscription_types'
-          super
-        end
+      def search_column(collection, table_column, search_term)
+        return collection.where('subscriptions.stripe_plan_id ILIKE ?', "%#{search_term}%") if table_column[:name] == 'subscription_types'
+        super
       end
     end
   end

data/app/models/effective/datatables/order_items.rb

@@ -1,101 +1,99 @@
-if defined?(EffectiveDatatables)
-  module Effective
-    module Datatables
-      class OrderItems < Effective::Datatable
-        datatable do
-          default_order :purchased_at, :desc
-
-          table_column(:purchased_at, type: :datetime, column: 'orders.purchased_at') do |order_item|
-            Time.at(order_item[:purchased_at]).in_time_zone if order_item[:purchased_at].present?
-          end
+module Effective
+  module Datatables
+    class OrderItems < Effective::Datatable
+      datatable do
+        default_order :purchased_at, :desc
+
+        table_column(:purchased_at, type: :datetime, column: 'orders.purchased_at') do |order_item|
+          Time.at(order_item[:purchased_at]).in_time_zone if order_item[:purchased_at].present?
+        end
 
-          table_column :id, visible: false
-
-          if EffectiveOrders.obfuscate_order_ids
-            table_column(:order, type: :obfuscated_id, sortable: false) do |order_item|
-              obfuscated_id = Effective::Order.obfuscate(order_item[:order_id])
-              link_to(obfuscated_id, (datatables_admin_path? ? effective_orders.admin_order_path(obfuscated_id) : effective_orders.order_path(obfuscated_id)))
-            end
-          else
-            table_column(:order, sortable: false) do |order_item|
-              link_to(order_item.to_param, (datatables_admin_path? ? effective_orders.admin_order_path(order_item.to_param) : effective_orders.order_path(order_item.to_param)))
-            end
-          end
+        table_column :id, visible: false
 
-          table_column :email, column: 'users.email', label: 'Buyer Email', if: proc { attributes[:user_id].blank? } do |order_item|
-            link_to order_item[:email], (edit_admin_user_path(order_item[:user_id]) rescue admin_user_path(order_item[:user_id]) rescue '#')
+        if EffectiveOrders.obfuscate_order_ids
+          table_column(:order, type: :obfuscated_id, sortable: false) do |order_item|
+            obfuscated_id = Effective::Order.obfuscate(order_item[:order_id])
+            link_to(obfuscated_id, (datatables_admin_path? ? effective_orders.admin_order_path(obfuscated_id) : effective_orders.order_path(obfuscated_id)))
           end
-
-          if EffectiveOrders.require_billing_address
-            table_column :buyer_name, sortable: false, label: 'Buyer Name', if: proc { attributes[:user_id].blank? } do |order_item|
-              (order_item[:buyer_name] || '').split('!!SEP!!').find(&:present?)
-            end
+        else
+          table_column(:order, sortable: false) do |order_item|
+            link_to(order_item.to_param, (datatables_admin_path? ? effective_orders.admin_order_path(order_item.to_param) : effective_orders.order_path(order_item.to_param)))
           end
+        end
 
-          table_column :purchase_state, column: 'orders.purchase_state', filter: { type: :select, values: [%w(abandoned abandoned), [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED], [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED]], selected: EffectiveOrders::PURCHASED } do |order_item|
-            order_item[:purchase_state] || 'abandoned'
-          end
+        table_column :email, column: 'users.email', label: 'Buyer Email', if: proc { attributes[:user_id].blank? } do |order_item|
+          link_to order_item[:email], (edit_admin_user_path(order_item[:user_id]) rescue admin_user_path(order_item[:user_id]) rescue '#')
+        end
 
-          table_column :title do |order_item|
-            order_item.quantity == 1 ? order_item.title : "#{order_item.title} (#{order_item.quantity} purchased)"
+        if EffectiveOrders.require_billing_address
+          table_column :buyer_name, sortable: false, label: 'Buyer Name', if: proc { attributes[:user_id].blank? } do |order_item|
+            (order_item[:buyer_name] || '').split('!!SEP!!').find(&:present?)
           end
+        end
 
-          table_column(:subtotal) { |order_item| price_to_currency(order_item[:subtotal].to_i) }
-          table_column(:tax) { |order_item| price_to_currency(order_item[:tax].to_i) }
-          table_column(:total) { |order_item| price_to_currency(order_item[:total].to_i) }
+        table_column :purchase_state, column: 'orders.purchase_state', filter: { type: :select, values: [%w(abandoned abandoned), [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED], [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED]], selected: EffectiveOrders::PURCHASED } do |order_item|
+          order_item[:purchase_state] || 'abandoned'
+        end
 
-          table_column :created_at, visible: false
-          table_column :updated_at, visible: false
+        table_column :title do |order_item|
+          order_item.quantity == 1 ? order_item.title : "#{order_item.title} (#{order_item.quantity} purchased)"
         end
 
-        def collection
-          collection = Effective::OrderItem.unscoped
-            .joins(order: :user)
-            .select('order_items.*, orders.*, users.email AS email')
-            .select("#{query_subtotal} AS subtotal, #{query_tax} AS tax, #{query_total} AS total")
-            .group('order_items.id, orders.id, users.email')
+        table_column(:subtotal) { |order_item| price_to_currency(order_item[:subtotal].to_i) }
+        table_column(:tax) { |order_item| price_to_currency(order_item[:tax].to_i) }
+        table_column(:total) { |order_item| price_to_currency(order_item[:total].to_i) }
 
-          if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
-            addresses_tbl = EffectiveAddresses.addresses_table_name
+        table_column :created_at, visible: false
+        table_column :updated_at, visible: false
+      end
 
-            collection = collection
-              .joins("LEFT JOIN (SELECT addressable_id, string_agg(#{addresses_tbl}.full_name, '!!SEP!!') AS buyer_name FROM #{addresses_tbl} WHERE #{addresses_tbl}.category = 'billing' AND #{addresses_tbl}.addressable_type = 'Effective::Order' GROUP BY #{addresses_tbl}.addressable_id) #{addresses_tbl} ON orders.id = #{addresses_tbl}.addressable_id")
-              .group("#{addresses_tbl}.buyer_name")
-              .select("#{addresses_tbl}.buyer_name AS buyer_name")
-          end
+      def collection
+        collection = Effective::OrderItem.unscoped
+          .joins(order: :user)
+          .select('order_items.*, orders.*, users.email AS email')
+          .select("#{query_subtotal} AS subtotal, #{query_tax} AS tax, #{query_total} AS total")
+          .group('order_items.id, orders.id, users.email')
 
-          attributes[:user_id].present? ? collection.where("#{EffectiveOrders.orders_table_name.to_s}.user_id = ?", attributes[:user_id]) : collection
-        end
+        if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
+          addresses_tbl = EffectiveAddresses.addresses_table_name
 
-        def query_subtotal
-          'SUM(price * quantity)'
+          collection = collection
+            .joins("LEFT JOIN (SELECT addressable_id, string_agg(#{addresses_tbl}.full_name, '!!SEP!!') AS buyer_name FROM #{addresses_tbl} WHERE #{addresses_tbl}.category = 'billing' AND #{addresses_tbl}.addressable_type = 'Effective::Order' GROUP BY #{addresses_tbl}.addressable_id) #{addresses_tbl} ON orders.id = #{addresses_tbl}.addressable_id")
+            .group("#{addresses_tbl}.buyer_name")
+            .select("#{addresses_tbl}.buyer_name AS buyer_name")
         end
 
-        def query_total
-          'SUM((price * quantity) + (CASE tax_exempt WHEN true THEN 0 ELSE ((price * quantity) * tax_rate) END))'
-        end
+        attributes[:user_id].present? ? collection.where("#{EffectiveOrders.orders_table_name.to_s}.user_id = ?", attributes[:user_id]) : collection
+      end
 
-        def query_tax
-          '(CASE tax_exempt WHEN true THEN 0 ELSE ((price * quantity) * tax_rate) END)'
-        end
+      def query_subtotal
+        'SUM(price * quantity)'
+      end
 
-        def search_column(collection, table_column, search_term)
-          if table_column[:name] == 'order'
-            collection.where("#{EffectiveOrders.order_items_table_name.to_s}.order_id = ?", Effective::Order.deobfuscate(search_term))
-          elsif table_column[:name] == 'purchase_state' && search_term == 'abandoned'
-            collection.where("#{EffectiveOrders.orders_table_name.to_s}.purchase_state IS NULL")
-          elsif table_column[:name] == 'subtotal'
-            collection.having("#{query_subtotal} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-          elsif table_column[:name] == 'tax'
-            collection.having("#{query_tax} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-          elsif table_column[:name] == 'total'
-            collection.having("#{query_total} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-          else
-            super
-          end
-        end
+      def query_total
+        'SUM((price * quantity) + (CASE tax_exempt WHEN true THEN 0 ELSE ((price * quantity) * tax_rate) END))'
+      end
 
+      def query_tax
+        '(CASE tax_exempt WHEN true THEN 0 ELSE ((price * quantity) * tax_rate) END)'
       end
+
+      def search_column(collection, table_column, search_term)
+        if table_column[:name] == 'order'
+          collection.where("#{EffectiveOrders.order_items_table_name.to_s}.order_id = ?", Effective::Order.deobfuscate(search_term))
+        elsif table_column[:name] == 'purchase_state' && search_term == 'abandoned'
+          collection.where("#{EffectiveOrders.orders_table_name.to_s}.purchase_state IS NULL")
+        elsif table_column[:name] == 'subtotal'
+          collection.having("#{query_subtotal} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
+        elsif table_column[:name] == 'tax'
+          collection.having("#{query_tax} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
+        elsif table_column[:name] == 'total'
+          collection.having("#{query_total} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
+        else
+          super
+        end
+      end
+
     end
   end
 end

data/app/models/effective/datatables/orders.rb

@@ -1,92 +1,90 @@
-if defined?(EffectiveDatatables)
-  module Effective
-    module Datatables
-      class Orders < Effective::Datatable
-        datatable do
-          default_order :created_at, :desc
+module Effective
+  module Datatables
+    class Orders < Effective::Datatable
+      datatable do
+        default_order :created_at, :desc
 
-          table_column :purchased_at
+        table_column :purchased_at
 
-          table_column :id, label: 'ID' do |order|
-            link_to order.to_param, effective_orders.admin_order_path(order)
+        table_column :id, label: 'ID' do |order|
+          link_to order.to_param, effective_orders.admin_order_path(order)
+        end
+
+        # Don't display email or buyer_name column if this is for a specific user
+        if attributes[:user_id].blank?
+          table_column :email, column: 'users.email', label: 'Buyer Email' do |order|
+            link_to order.user.email, (edit_admin_user_path(order.user) rescue admin_user_path(order.user) rescue '#')
           end
 
-          # Don't display email or buyer_name column if this is for a specific user
-          if attributes[:user_id].blank?
-            table_column :email, column: 'users.email', label: 'Buyer Email' do |order|
-              link_to order.user.email, (edit_admin_user_path(order.user) rescue admin_user_path(order.user) rescue '#')
+          if EffectiveOrders.use_address_full_name
+            table_column :buyer_name, column: 'addresses.full_name' do |order|
+              order.billing_address.try(:full_name)
             end
 
-            if EffectiveOrders.use_address_full_name
-              table_column :buyer_name, column: 'addresses.full_name' do |order|
-                order.billing_address.try(:full_name)
-              end
-
-            elsif # Not using address full name
-              table_column :buyer_name, column: 'users.*' do |order|
-                order.user.to_s
-              end
+          elsif # Not using address full name
+            table_column :buyer_name, column: 'users.*' do |order|
+              order.user.to_s
             end
           end
+        end
 
-          if EffectiveOrders.require_billing_address
-            table_column :billing_address
-          end
-
-          if EffectiveOrders.require_shipping_address
-            table_column :shipping_address
-          end
+        if EffectiveOrders.require_billing_address
+          table_column :billing_address
+        end
 
-          table_column :purchase_state, label: 'State', filter: { values: purchase_state_filter_values } do |order|
-            order.purchase_state || 'abandoned'
-          end
+        if EffectiveOrders.require_shipping_address
+          table_column :shipping_address
+        end
 
-          table_column :order_items, column: 'order_items.title', filter: :string
+        table_column :purchase_state, label: 'State', filter: { values: purchase_state_filter_values } do |order|
+          order.purchase_state || 'abandoned'
+        end
 
-          table_column :subtotal, as: :price
-          table_column :tax, as: :price
+        table_column :order_items, column: 'order_items.title', filter: :string
 
-          table_column :tax_rate, visible: false do |order|
-            tax_rate_to_percentage(order.tax_rate)
-          end
+        table_column :subtotal, as: :price
+        table_column :tax, as: :price
 
-          table_column :total, as: :price
+        table_column :tax_rate, visible: false do |order|
+          tax_rate_to_percentage(order.tax_rate)
+        end
 
-          table_column :payment_provider, label: 'Provider', visible: false, filter: { values: ['nil'] + (EffectiveOrders.payment_providers + EffectiveOrders.other_payment_providers).sort }
-          table_column :payment_card, label: 'Card'
+        table_column :total, as: :price
 
-          table_column :note, visible: false
-          table_column :note_to_buyer, visible: false
-          table_column :note_internal, visible: false
+        table_column :payment_provider, label: 'Provider', visible: false, filter: { values: ['nil'] + (EffectiveOrders.payment_providers + EffectiveOrders.other_payment_providers).sort }
+        table_column :payment_card, label: 'Card'
 
-          table_column :created_at, visible: false
-          table_column :updated_at, visible: false
+        table_column :note, visible: false
+        table_column :note_to_buyer, visible: false
+        table_column :note_internal, visible: false
 
-          actions_column partial: 'admin/orders/actions'
-        end
+        table_column :created_at, visible: false
+        table_column :updated_at, visible: false
 
-        def collection
-          collection = Effective::Order.unscoped
-            .joins(:user)
-            .includes(:addresses)
-            .includes(:user)
-            .includes(:order_items)
+        actions_column partial: 'admin/orders/actions'
+      end
 
-          if EffectiveOrders.orders_collection_scope.respond_to?(:call)
-            collection = EffectiveOrders.orders_collection_scope.call(collection)
-          end
+      def collection
+        collection = Effective::Order.unscoped
+          .joins(:user)
+          .includes(:addresses)
+          .includes(:user)
+          .includes(:order_items)
 
-          attributes[:user_id].present? ? collection.where(user_id: attributes[:user_id]) : collection
+        if EffectiveOrders.orders_collection_scope.respond_to?(:call)
+          collection = EffectiveOrders.orders_collection_scope.call(collection)
         end
 
-        def purchase_state_filter_values
-          [
-            %w(abandoned nil),
-            [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED],
-            [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED],
-            [EffectiveOrders::PENDING, EffectiveOrders::PENDING]
-          ]
-        end
+        attributes[:user_id].present? ? collection.where(user_id: attributes[:user_id]) : collection
+      end
+
+      def purchase_state_filter_values
+        [
+          %w(abandoned nil),
+          [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED],
+          [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED],
+          [EffectiveOrders::PENDING, EffectiveOrders::PENDING]
+        ]
       end
     end
   end

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

@@ -1,12 +1,9 @@
-%h2.effective-orders-page-title= (@page_title || 'Customers')
+%h1.effective-admin-heading= @page_title
 
-%p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
+%p.text-right.effective-admin-actions
+  = link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
 
-- if @datatable.nil?
-  %p Please install #{link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'} to see this page.
-- elsif @datatable.present?
+- if @datatable.present?
   = render_datatable @datatable
 - else
   %p There are no customers present
-
-%p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'

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

@@ -1,8 +1,6 @@
-%h2.effective-orders-page-title= (@page_title || 'Order Items')
+%h1.effective-admin-heading= @page_title
 
-- if @datatable.nil?
-  %p Please install #{link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'} to see this page.
-- elsif @datatable.present?
+- if @datatable.present?
   = render_datatable @datatable
 - else
   %p There are no order items present

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

@@ -8,7 +8,7 @@
       as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
       collection: @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s }
 
-    %h3 Order Items
+    %h2 Order Items
     .order_items
       - f.object.order_items.build unless f.object.order_items.present?
       = f.simple_fields_for :order_items do |order_item|
@@ -23,7 +23,7 @@
       value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.mailer[:send_payment_request_to_buyer] : f.object.send_payment_request_to_buyer?)
 
     .effective-order-internal-note
-      %h3 Internal Note
+      %h2 Internal Note
       = f.input :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/_form_mark_as_paid.html.haml

@@ -1,5 +1,5 @@
 = simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_orders.mark_as_paid_admin_order_path(order), method: :post) do |f|
-  %h3 Payment Details
+  %h2 Payment Details
 
   - if order.purchased?
     .alert.alert-warning Warning: This order has already been purchased
@@ -26,7 +26,7 @@
     value: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.mailer[:send_order_receipts_when_mark_as_paid_by_admin] : f.object.send_mark_as_paid_email_to_buyer?)
 
   .effective-order-note-to-buyer
-    %h3 Note to Buyer
+    %h2 Note to Buyer
     = f.input :note_to_buyer, label: false, hint: 'This is displayed to the buyer on all order receipts.'
 
   = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }

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

@@ -1,5 +1,5 @@
 .effective-order-internal-note-form
-  %h3 Internal Note
+  %h2 Internal Note
 
   = simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_orders.admin_order_path(order)) do |f|
     = f.input :note_internal, label: false, hint: 'For internal admin use only.  This note will never be displayed to the buyer.'

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

@@ -1,5 +1,5 @@
 - if order.payment.present?
   .effective-order-payment-details
-    %h3 Payment Provider Details
+    %h2 Payment Provider Details
     = tableize_order_payment(order.payment[:details] || order.payment, class: 'table')
 

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

@@ -1,15 +1,9 @@
-%h2.effective-orders-page-title= (@page_title || 'Orders')
+%h1.effective-admin-heading= @page_title
 
-%p.text-right.effective-orders-page-action= 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'
 
-- if @datatable.nil?
-  %p Please install #{link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'} to see this page.
-- elsif @datatable.present?
+- if @datatable.present?
   = render_datatable @datatable
 - else
   %p There are no orders present
-
-- if @datatable.present?
-  %p.text-right= link_to 'New Order', effective_orders.new_admin_order_path, :class => 'btn btn-primary'
-
-

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@page_title || 'Mark as Paid')
+%h1.effective-admin-heading= @page_title
 
 %p Mark the following order as paid:
 

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title= (@page_title || 'New Order')
+%h1.effective-admin-heading= @page_title
 
 = render partial: 'form', locals: { order: @order }

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@order.purchased? ? 'Receipt' : 'Order')
+%h1.effective-admin-heading= (@order.purchased? ? 'Receipt' : 'Order')
 
 = render partial: 'effective/orders/order', locals: {order: @order}
 

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@page_title || 'My Cart')
+%h1.effective-heading= @page_title
 
 - if @cart.empty?
   %p Your cart is empty.
@@ -10,7 +10,7 @@
   = render partial: '/effective/carts/cart_actions', locals: { cart: @cart }
 
 - if @pending_orders.present?
-  %h3 Pending Orders
+  %h2 Pending Orders
   = render_orders(@pending_orders)
 
 - if EffectiveOrders.show_order_history_button

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

@@ -17,14 +17,14 @@
       .row
         - if EffectiveOrders.require_billing_address
           %div{class: "col-sm-#{12 / num_addresses}"}
-            %h3 Billing Address
+            %h2 Billing Address
             = effective_address_fields(f, :billing_address)
             - if f.object.user.respond_to?(:billing_address=)
               = f.input :save_billing_address, as: :boolean, label: 'Save as my default billing address', required: false
 
         - if EffectiveOrders.require_shipping_address
           %div{class: "col-sm-#{12 / num_addresses}"}
-            %h3 Shipping Address
+            %h2 Shipping Address
             = effective_address_fields(f, :shipping_address)
             - if f.object.user.respond_to?(:shipping_address=)
               = f.input :save_shipping_address, as: :boolean, label: 'Save as my default shipping address', required: false

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

@@ -1,4 +1,4 @@
-%h3 Note
+%h2 Note
 - if EffectiveOrders.collect_note_message.present?
   %p= EffectiveOrders.collect_note_message.html_safe
 

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

@@ -1,6 +1,6 @@
 - if order.purchased?
   .effective-order-payment-details
-    %h3 Payment Details
+    %h2 Payment Details
     %table.table
       %tbody
         %tr

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

@@ -1,4 +1,4 @@
-%h3 Terms and Conditions
+%h2 Terms and Conditions
 
 - terms = EffectiveOrders.terms_and_conditions_label
 

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

@@ -1,4 +1,4 @@
-%h3 User Information
+%h2 User Information
 = form.simple_fields_for :user, user do |fa|
   - if (EffectiveOrders.collect_user_fields || []).include?(:salutation) && fa.object.respond_to?(:salutation)
     - if defined?(fa.object.class::SALUTATIONS)

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title= (@page_title || 'Checkout')
+%h1.effective-heading= @page_title
 
 = render_checkout_step1(@order)

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title= (@page_title || 'Checkout')
+%h1.effective-heading= @page_title
 
 = render_checkout_step2(@order)

data/app/views/effective/orders/cheque/pay_by_cheque.html.haml

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@page_title || 'Payment Required')
+%h1.effective-heading= @page_title
 
 - if EffectiveOrders.cheque[:success_message].present?
   %p.effective-orders-page-content

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@page_title || 'Payment Declined')
+%h1.effective-heading= @page_title
 
 %p= flash[:danger]
 

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

@@ -1,12 +1,12 @@
-%h2.effective-orders-page-title= (@page_title || 'Orders')
+%h1.effective-heading= @page_title
 
-%h3 Pending Orders
+%h2 Pending Orders
 - if @pending_orders.present?
   = render_orders(@pending_orders)
 - else
   %p You have no pending orders.
 
-%h3 Purchased Orders
+%h2 Purchased Orders
 - if @orders.present?
   = render_orders(@orders)
 - else

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title= (@page_title || 'Order History')
+%h1.effective-heading= @page_title
 
 = render_order_history(@orders)

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@page_title || 'Sales History')
+%h1.effective-heading= @page_title
 
 %table.table
   %thead

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title= (@page_title || 'Thank You')
+%h1.effective-heading= @page_title
 
 %p.effective-orders-page-content
   You have successfully purchased the following:

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title= (@page_title || 'Order')
+%h1.effective-heading= @page_title
 
 = render @order

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

@@ -1,4 +1,7 @@
-%h2.effective-orders-page-title My Subscriptions
+%h1.effective-heading= @page_title
+
+%p.text-right.effective-actions
+  = link_to 'New Subscription', effective_orders.new_subscription_path, class: 'btn btn-primary'
 
 - if @subscriptions.present?
   %p You have the following subscriptions:
@@ -17,5 +20,3 @@
 
 - else
   %p You have no subscriptions
-
-%p.text-right= link_to 'New Subscription', effective_orders.new_subscription_path

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title New Subscription
+%h1.effective-heading= @page_title
 
 - if @plans.present?
   = simple_form_for(@subscription, (EffectiveOrders.simple_form_options || {}).merge(:url => effective_orders.subscriptions_path, :method => :post)) do |f|

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title
+%h1.effective-heading
   = @plan.name
   Subscription
   details
@@ -24,7 +24,7 @@
       %th Current Period End
       %td= Time.zone.at(@stripe_subscription.current_period_end).strftime("%d-%b-%Y")
 
-%h3= "#{@plan.interval.chomp('ly')}ly Invoices"
+%h2= "#{@plan.interval.chomp('ly')}ly Invoices"
 
 %table.table
   %thead
@@ -44,6 +44,6 @@
           = Time.zone.at(invoice.lines.first.period.end).strftime("%d-%b-%Y")
         %td= price_to_currency(invoice.total)
 
-%h3 Cancel Subscription
+%h2 Cancel Subscription
 
 = link_to 'Unsubscribe', effective_orders.subscription_path(@plan.id), :data => {:method => :delete, :confirm => 'This will cancel your subscription. Are you sure? This cannot be undone.', :disable_with => 'Unsubscribing...'}

data/config/effective_orders.rb

@@ -30,7 +30,7 @@ EffectiveOrders.setup do |config|
   #
   # Or disable the check completely:
   # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| true }
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
   # Skip automatically mounting the EffectiveOrders engine
   config.skip_mount_engine = false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.17'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/lib/generators/effective_orders/install_generator.rb

@@ -3,7 +3,7 @@ module EffectiveOrders
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Creates an EffectiveOrders initializer in your application."
+      desc 'Creates an EffectiveOrders initializer in your application.'
 
       source_root File.expand_path('../../templates', __FILE__)
 
@@ -16,7 +16,7 @@ module EffectiveOrders
       end
 
       def install_effective_addresses
-        run "rails generate effective_addresses:install"
+        run 'rails generate effective_addresses:install'
       end
 
       def copy_initializer

data/lib/generators/effective_orders/upgrade_from03x_generator.rb

@@ -24,11 +24,7 @@ module EffectiveOrders
         @subscriptions_table_name = ':' + EffectiveOrders.subscriptions_table_name.to_s
         @products_table_name = ':' + EffectiveOrders.products_table_name.to_s
 
-        migration_template '../../../db/upgrade/02_upgrade_effective_orders_from03x.rb.erb', 'db/migrate/upgrade_effective_orders_from03x.rb'
-      end
-
-      def show_readme
-        readme "README" if behavior == :invoke
+        migration_template ('../' * 3) + 'db/upgrade/02_upgrade_effective_orders_from03x.rb.erb', 'db/migrate/upgrade_effective_orders_from03x.rb'
       end
     end
   end

data/lib/generators/effective_orders/upgrade_from1x_generator.rb

@@ -20,11 +20,7 @@ module EffectiveOrders
         @subscriptions_table_name = ':' + EffectiveOrders.subscriptions_table_name.to_s
         @products_table_name = ':' + EffectiveOrders.products_table_name.to_s
 
-        migration_template '../../../db/upgrade/03_upgrade_effective_orders_from1x.rb.erb', 'db/migrate/upgrade_effective_orders_from1x.rb'
-      end
-
-      def show_readme
-        readme 'README' if behavior == :invoke
+        migration_template ('../' * 3) + 'db/upgrade/03_upgrade_effective_orders_from1x.rb.erb', 'db/migrate/upgrade_effective_orders_from1x.rb'
       end
     end
   end

data/lib/generators/effective_orders/upgrade_price_column_generator.rb

@@ -23,11 +23,7 @@ module EffectiveOrders
         @table = table.to_s.downcase
         @column = column.to_s.downcase
 
-        migration_template '../../../db/upgrade/upgrade_price_column_on_table.rb.erb', "db/migrate/upgrade_price_column_on_#{table}.rb"
-      end
-
-      def show_readme
-        readme "README" if behavior == :invoke
+        migration_template ('../' * 3) + 'db/upgrade/upgrade_price_column_on_table.rb.erb', "db/migrate/upgrade_price_column_on_#{table}.rb"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.17
+  version: 2.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: effective_datatables
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: stripe-ruby-mock
   requirement: !ruby/object:Gem::Requirement