effective_orders 1.2.13 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101d33deb56c39e2cb0805f69c46cdae7b11df2f
-  data.tar.gz: 164d3ac6fcef01e5c36fecafa3758df40791cf7b
+  metadata.gz: d9d3799addd53c68bed28726c22a3b9d45be94f1
+  data.tar.gz: 1af44c4052ea662a756483459449b16b08ff9e13
 SHA512:
-  metadata.gz: 8b53c1a55398129ef3d432b424735c368950f470984423cf1da2ff2201d2e64585c4d172105e726fc52fa10d65332a9604c0a82bd1d213b94b603e519baa25f0
-  data.tar.gz: 44699ee1eb34067dc7b3ace224c31ded9faa93351e1f96a19faf073af2c2eab36890d72c460861a3f57a4e8df382c5737eaf127ad3730454973da476b963aae6
+  metadata.gz: d029f7d0bfc198f91f8acd375bccf1b461451ac50250e4964d53dfe8fecae78631325b3cb774d003bed6d699901aedec82a5eb3acd7247284815231ea78ac495
+  data.tar.gz: 70a36698cc25ed54f732525e2d5d1e12be127b2aede2e8fa450aab84159032d462967d3a96cce9b5efdef24dc85b04ad24b6e42e81c54226be20cc7dc3f57199

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

@@ -26,5 +26,13 @@
       min-width: 200px;
     }
   }
+}
+
+.effective-order-purchase-actions {
+  text-align: right;
+
+  > * {
+    display: inline-block;
+  }
 
 }

data/app/controllers/admin/order_items_controller.rb

@@ -0,0 +1,14 @@
+module Admin
+  class OrderItemsController < ApplicationController
+    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+
+    layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_orders] : EffectiveOrders.layout)
+
+    def index
+      @datatable = Effective::Datatables::OrderItems.new() if defined?(EffectiveDatatables)
+      @page_title = 'Order Items'
+
+      EffectiveOrders.authorized?(self, :index, Effective::OrderItem)
+    end
+  end
+end

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

@@ -0,0 +1,93 @@
+if defined?(EffectiveDatatables)
+  module Effective
+    module Datatables
+      class OrderItems < Effective::Datatable
+        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
+
+        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
+
+        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
+
+        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 :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 :title do |order_item|
+          order_item.quantity == 1 ? order_item.title : "#{order_item.title} (#{order_item.quantity} purchased)"
+        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 :created_at, :visible => false
+        table_column :updated_at, :visible => false
+
+        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')
+
+          if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
+            addresses_tbl = EffectiveAddresses.addresses_table_name
+
+            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
+
+          attributes[:user_id].present? ? collection.where("#{EffectiveOrders.orders_table_name.to_s}.user_id = ?", attributes[:user_id]) : collection
+        end
+
+        def query_subtotal
+          'SUM(price * quantity)'
+        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
+end

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

@@ -4,7 +4,7 @@ if defined?(EffectiveDatatables)
       class Orders < Effective::Datatable
         default_order :purchased_at, :desc
 
-        table_column(:purchased_at) { |order| order.purchased_at.try(:strftime, '%Y-%m-%d %H:%M') }
+        table_column :purchased_at
         table_column :id
 
         table_column :email, column: 'users.email', label: 'Buyer Email', if: proc { attributes[:user_id].blank? } do |order|
@@ -27,9 +27,12 @@ if defined?(EffectiveDatatables)
           end
         end
 
+        table_column(:subtotal) { |order| price_to_currency(order[:subtotal].to_i) }
+        table_column(:tax) { |order| price_to_currency(order[:tax].to_i) }
         table_column(:total) { |order| price_to_currency(order[:total].to_i) }
-        table_column(:created_at, visible: false) { |order| order.updated_at.strftime('%Y-%m-%d %H:%M') }
-        table_column(:updated_at, visible: false) { |order| order.updated_at.strftime('%Y-%m-%d %H:%M') }
+
+        table_column :created_at, :visible => false
+        table_column :updated_at, :visible => false
 
         table_column :actions, sortable: false, filter: false do |order|
           link_to('View', (datatables_admin_path? ? effective_orders.admin_order_path(order) : effective_orders.order_path(order)))
@@ -37,30 +40,42 @@ if defined?(EffectiveDatatables)
 
         def collection
           collection = Effective::Order.unscoped
-                       .joins(:user, :order_items)
-                       .group('users.email, orders.id')
-                       .select('orders.*, users.email AS email')
-                       .select("#{query_total} AS total")
-                       .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
+            .joins(:user, :order_items)
+            .group('users.email, orders.id')
+            .select('orders.*, users.email AS email')
+            .select("#{query_subtotal} AS subtotal, #{query_tax} AS tax, #{query_total} AS total")
+            .select("string_agg(order_items.title, '!!SEP!!') AS order_items")
 
           if EffectiveOrders.require_billing_address && defined?(EffectiveAddresses)
             addresses_tbl = EffectiveAddresses.addresses_table_name
 
             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")
+              .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
 
           attributes[:user_id].present? ? collection.where(user_id: attributes[:user_id]) : collection
         end
 
+        def query_subtotal
+          'SUM(order_items.price * order_items.quantity)'
+        end
+
+        def query_tax
+          'SUM(CASE order_items.tax_exempt WHEN true THEN 0 ELSE ((order_items.price * order_items.quantity) * order_items.tax_rate) END)'
+        end
+
         def query_total
           'SUM((order_items.price * order_items.quantity) + (CASE order_items.tax_exempt WHEN true THEN 0 ELSE ((order_items.price * order_items.quantity) * order_items.tax_rate) END))'
         end
 
         def search_column(collection, table_column, search_term)
-          if table_column[:name] == 'total'
+          if 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)
           elsif table_column[:name] == 'purchase_state' && search_term == 'abandoned'
             collection.where(purchase_state: nil)

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

@@ -0,0 +1,7 @@
+%h2 Order Items
+
+- unless @datatable.collection.length > 0
+  %p
+    There are no order items
+- else
+  = render_datatable @datatable

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

@@ -34,10 +34,10 @@
 
               = f.input :shipping_address_same_as_billing, :as => :boolean, :label => 'My Shipping address is the same as my Billing address'
 
-    %hr
     = link_to_current_cart :label => 'Change Items', :class => 'btn btn-default'
 
-    - if order.total == 0 && EffectiveOrders.allow_free_orders
-      = f.submit 'Checkout', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
-    - else
-      = f.submit 'Continue to Checkout Confirmation', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
+    .text-right
+      - if order.total == 0 && EffectiveOrders.allow_free_orders
+        = f.submit 'Checkout', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
+      - else
+        = f.submit 'Continue to Checkout Confirmation', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'

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

@@ -1,17 +1,18 @@
 = render order
 
-- if EffectiveOrders.moneris_enabled
-  = render :partial => '/effective/orders/moneris/form', :locals => {:order => order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url}
+.effective-order.effective-order-purchase-actions
+  - if EffectiveOrders.moneris_enabled
+    = render :partial => '/effective/orders/moneris/form', :locals => {:order => order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url}
 
-- if EffectiveOrders.paypal_enabled
-  = render :partial => '/effective/orders/paypal/form', :locals => {:order => order}
+  - if EffectiveOrders.paypal_enabled
+    = render :partial => '/effective/orders/paypal/form', :locals => {:order => order}
 
-- if EffectiveOrders.stripe_enabled
-  = render :partial => '/effective/orders/stripe/form', :locals => {:order => order}
+  - if EffectiveOrders.stripe_enabled
+    = render :partial => '/effective/orders/stripe/form', :locals => {:order => order}
 
-- if EffectiveOrders.allow_pretend_purchase_in_production
-  = link_to 'Process Order', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
-  %p= EffectiveOrders.allow_pretend_purchase_in_production_message
-- elsif Rails.env.development?
-  = link_to 'Process Order (development only)', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
+  - if EffectiveOrders.allow_pretend_purchase_in_production
+    = link_to 'Process Order', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
+    %p= EffectiveOrders.allow_pretend_purchase_in_production_message
+  - elsif Rails.env.development?
+    = link_to 'Process Order (development only)', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
 

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

@@ -34,4 +34,4 @@
     = hidden_field_tag(:bill_postal_code, address.postal_code)
     = hidden_field_tag(:bill_country, address.country)
 
-  %p= submit_tag 'Checkout with Moneris', :class => 'btn btn-primary'
+  = submit_tag 'Checkout with Moneris', :class => 'btn btn-primary'

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

@@ -2,4 +2,4 @@
   = hidden_field_tag :cmd, '_s-xclick'
   = hidden_field_tag :encrypted, paypal_encrypted_payload(order)
 
-  %p= submit_tag 'Checkout with PayPal', :class => 'btn btn-primary'
+  = submit_tag 'Checkout with PayPal', :class => 'btn btn-primary'

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

@@ -4,14 +4,13 @@
   %h2 Order
 %hr
 
-%a.btn.btn-default.pull-right{'data-role' => 'print-button', :class => 'print-button', :onClick => "window.print(); false;"} Print
+%p.pull-right
+  %a.btn.btn-default{'data-role' => 'print-button', :class => 'print-button', :onClick => "window.print(); false;"} Print
+  - if @order.purchased?
+    = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), 'data-confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', :class => 'btn btn-default'
 
 = render @order
 
-%hr
 = link_to 'Back', :back, :class => 'btn btn-primary'
-- if @order.purchased?
-  = '-'
-  = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), 'data-confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', :class => 'btn btn-default'
 
 

data/config/routes.rb

@@ -52,6 +52,7 @@ EffectiveOrders::Engine.routes.draw do
     namespace :admin do
       resources :customers, :only => [:index]
       resources :orders, :only => [:index, :show]
+      resources :order_items, :only => [:index]
     end
   end
 end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.13'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/spec/controllers/orders_controller_spec.rb

@@ -232,7 +232,6 @@ describe Effective::OrdersController do
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq false
-      assigns(:order).errors[:addresses].present?.should eq true
       assigns(:order).errors[:shipping_address].present?.should eq true
 
       response.should render_template(:new)

data/spec/dummy/log/test.log

@@ -170,3 +170,6 @@
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.4ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -323,6 +323,7 @@ files:
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_order.scss
 - app/controllers/admin/customers_controller.rb
+- app/controllers/admin/order_items_controller.rb
 - app/controllers/admin/orders_controller.rb
 - app/controllers/effective/carts_controller.rb
 - app/controllers/effective/orders_controller.rb
@@ -343,6 +344,7 @@ files:
 - app/models/effective/cart_item.rb
 - app/models/effective/customer.rb
 - app/models/effective/datatables/customers.rb
+- app/models/effective/datatables/order_items.rb
 - app/models/effective/datatables/orders.rb
 - app/models/effective/order.rb
 - app/models/effective/order_item.rb
@@ -357,6 +359,7 @@ files:
 - app/views/active_admin/effective_orders/orders/_show.html.haml
 - app/views/admin/customers/_actions.html.haml
 - app/views/admin/customers/index.html.haml
+- app/views/admin/order_items/index.html.haml
 - app/views/admin/orders/index.html.haml
 - app/views/admin/orders/show.html.haml
 - app/views/effective/carts/_cart.html.haml