effective_orders 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68837d038f48f9503cb95b4975a88a85bf2bb5f4
-  data.tar.gz: dab5e51afb7ea037856bea992fea9ea0c9b8da73
+  metadata.gz: 1c08f993d24d281ba8e17af297fc43eda2d25425
+  data.tar.gz: 405e69619e74b45eeb3808dc31403e681666ed5d
 SHA512:
-  metadata.gz: 1edcf64fe4df807a613887574d172fc86a713c03448ce9bf75d4dd82c63bce49154c7b44c056977d916a39493d1b04076d4323bed4e400716b92f485392c7f59
-  data.tar.gz: 6038dfad385dd638b9419bda5d851cd39f497a16d661111d8c8829b53cc80f8e3c0f0ae2f3d8ddfbf465d6d8fe7bb9f2692c9879ffbffb6e8d9e43e00aef5293
+  metadata.gz: 456c396d95df8356f5db6a1985b0814955cda265c04162540ba9ac6dae48aa7b575183137ec00ae84445127d351b1673f7abc3441cd6cc0f3ebb4bd159a8bfd6
+  data.tar.gz: b1e31fdf1558cdf2160be96e1b289595e8f341fd2a244f35f4302061d88027d81ae2fa1828002384c89e285e9af65d4831c6ee3562b28a854f931990a8f21000

data/active_admin/effective_orders.rb

@@ -18,7 +18,7 @@ if defined?(ActiveAdmin)
       include EffectiveOrdersHelper
 
       def scoped_collection
-        end_of_association_chain.includes(:user).includes(:order_items => :purchasable)
+        end_of_association_chain.includes(:user).includes(order_items: :purchasable)
       end
     end
 
@@ -33,7 +33,8 @@ if defined?(ActiveAdmin)
       end
 
       column 'Buyer', :sortable => :user_id do |order|
-        link_to order.user, (admin_user_path(order.user) rescue '#')
+        user_path = [EffectiveOrders.active_admin_namespace.presence, 'user_path'].compact.join('_')
+        link_to order.user, (public_send(user_path, order.user) rescue '#')
       end
 
       column 'Summary' do |order|
@@ -41,51 +42,41 @@ if defined?(ActiveAdmin)
       end
 
       column :purchased_at
+      column :purchase_method
 
       column do |order|
-        links = link_to('View', effective_orders.order_path(order), class: 'member_link view_link')
-
-        if authorized?(:manage, Effective::Order) # This is the Admin level check
-          details_path = ['details', EffectiveOrders.active_admin_namespace.presence, 'order_path'].compact.join('_')
-          links += link_to('Details', public_send(details_path, order))
-        end
-
-        links
+        link_to('View Receipt', effective_orders.order_path(order), class: 'member_link view_link') if order.purchased?
       end
-    end
 
-    member_action :details do
-      @order = Effective::Order.find(params[:id])
-      @page_title = "Order ##{@order.to_param} Details"
-
-      render file: 'admin/orders/show'
     end
 
     collection_action :export_csv do
       @orders = Effective::Order.purchased.includes(:addresses)
 
       col_headers = []
-      col_headers << "Order ID"
+      col_headers << "Order"
+      col_headers << "Purchased at"
+      col_headers << "Email"
       col_headers << "Full Name"
-      col_headers << "Purchased"
       col_headers << "Subtotal"
       col_headers << "Tax"
       col_headers << "Total"
+      col_headers << 'Purchase method'
 
       csv_string = CSV.generate do |csv|
         csv << col_headers
 
         @orders.each do |order|
-          row = []
-
-          row << order.to_param
-          row << (order.billing_address.try(:full_name) || order.user.to_s)
-          row << order.purchased_at.strftime("%Y-%m-%d %H:%M:%S %z")
-          row << (order.subtotal / 100.0).round(2)
-          row << (order.tax / 100.0).round(2)
-          row << (order.total / 100.0).round(2)
-
-          csv << row
+          csv << [
+            order.to_param,
+            order.purchased_at.strftime("%Y-%m-%d %H:%M:%S %z"),
+            order.user.try(:email),
+            (order.billing_address.try(:full_name) || order.user.to_s),
+            (order.subtotal / 100.0).round(2),
+            (order.tax / 100.0).round(2),
+            (order.total / 100.0).round(2),
+            order.purchase_method
+          ]
         end
       end
 

data/app/controllers/effective/carts_controller.rb

@@ -1,7 +1,6 @@
 module Effective
   class CartsController < ApplicationController
     include EffectiveCartsHelper
-    acts_as_active_admin_controller('carts') if EffectiveOrders.use_active_admin?
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:carts] : EffectiveOrders.layout)
 

data/app/controllers/effective/orders_controller.rb

@@ -1,7 +1,6 @@
 module Effective
   class OrdersController < ApplicationController
     include EffectiveCartsHelper
-    acts_as_active_admin_controller('orders') if EffectiveOrders.use_active_admin?
 
     include Providers::Moneris if EffectiveOrders.moneris_enabled
     include Providers::Paypal if EffectiveOrders.paypal_enabled

data/app/models/concerns/acts_as_purchasable.rb

@@ -103,6 +103,10 @@ module ActsAsPurchasable
     orders.select { |order| order.purchased? }
   end
 
+  def purchased_order
+    purchased_orders.first
+  end
+
   def quantity_enabled?
     self.respond_to?(:quantity_enabled) ? quantity_enabled == true : false
   end

data/app/models/effective/order.rb

@@ -238,6 +238,22 @@ module Effective
       end
     end
 
+    def purchase_method
+      if purchased?(:stripe_connect)
+        'Stripe Connect'
+      elsif purchased?(:stripe)
+        'Stripe'
+      elsif purchased?(:moneris)
+        'Moneris'
+      elsif purchased?(:paypal)
+        'PayPal'
+      elsif purchased?
+        'Online'
+      else
+        'None'
+      end
+    end
+
     def purchased?(provider = nil)
       return false if (purchase_state != EffectiveOrders::PURCHASED)
       return true if provider == nil

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

@@ -1,4 +1,4 @@
-%h2 Customers
+%h2.effective-orders-page-title Customers
 
 %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,4 +1,4 @@
-%h2 Order Items
+%h2.effective-orders-page-title Order Items
 
 - if @datatable.nil?
   %p

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

@@ -1,4 +1,4 @@
-%h2 Orders
+%h2.effective-orders-page-title Orders
 
 - if @datatable.nil?
   %p

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

@@ -1,2 +1,3 @@
-= render :partial => 'effective/orders/order', :locals => {:order => @order}
-= render :partial => 'effective/orders/order_payment_details', :locals => {:order => @order}
+%h2.effective-orders-page-title= (@order.purchased? ? 'Receipt' : 'Order')
+
+= render @order

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

@@ -1,4 +1,4 @@
-%h2 Shopping Cart
+%h2.effective-orders-page-title Shopping Cart
 
 - if @cart.empty?
   %p Your cart is empty.

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

@@ -5,3 +5,6 @@
   = render partial: 'effective/orders/order_header', locals: {order: order}
   = render partial: 'effective/orders/order_shipping', locals: {order: order}
   = render partial: 'effective/orders/order_items', locals: {order: order}
+
+  - if (EffectiveOrders.authorized?(controller, :manage, Effective::Order) rescue false)
+    = render partial: 'effective/orders/order_payment_details', locals: {order: order}

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

@@ -1,4 +1,5 @@
 - if order.purchased?
-  %p.pull-right
-    = link_to 'Print', '#', :class => 'btn btn-default print-button', 'data-role' => 'print-button', :onClick => "window.print(); false;"
-    = 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?', 'disable_with' => 'Resending...'}, :class => 'btn btn-default'
+  .effective-order-actions.pull-right
+    %p
+      = link_to 'Print', '#', :class => 'btn btn-default print-button', 'data-role' => 'print-button', :onClick => "window.print(); false;"
+      = 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?', 'disable_with' => 'Resending...'}, :class => 'btn btn-default'

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

@@ -1,21 +1,22 @@
-%h3 Acme Industries Inc.
-.row
-  .col-sm-6
-    %p= mail_to EffectiveOrders.mailer[:admin_email] || 'info@acmeindustries.com'
-    %p
-      1234 Fake Street
-      %br
-      Edmonton, AB, T5H 4A5
-      %br
-      %small Customize me by overriding '/app/views/effective/orders/_order_header.html.haml'
+.effective-order-header
+  %h3 Acme Industries Inc.
+  .row
+    .col-sm-6
+      %p= mail_to EffectiveOrders.mailer[:admin_email] || 'info@acmeindustries.com'
+      %p
+        1234 Fake Street
+        %br
+        Edmonton, AB, T5H 4A5
+        %br
+        %small Customize me by overriding '/app/views/effective/orders/_order_header.html.haml'
 
-  .col-sm-6
-    - if order.purchased?
-      %p Receipt: ##{order.to_param}
-    - elsif order.persisted?
-      %p Order: ##{order.to_param}
+    .col-sm-6
+      - if order.purchased?
+        %p Receipt: ##{order.to_param}
+      - elsif order.persisted?
+        %p Order: ##{order.to_param}
 
-    - if order.purchased?
-      %p Purchased at: #{order.purchased_at.strftime("%Y-%m-%d %H:%M")}
-    - else
-      %p Date: #{Time.zone.now.strftime("%Y-%m-%d %H:%M")}
+      - if order.purchased?
+        %p Purchased at: #{order.purchased_at.strftime("%Y-%m-%d %H:%M")}
+      - else
+        %p Date: #{Time.zone.now.strftime("%Y-%m-%d %H:%M")}

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

@@ -1,12 +1,10 @@
-%h4 Payment Details
-
 - if order.payment.present?
-  - if order.purchased?
-    %p This order was purchased with the following details:
-  - elsif order.declined?
-    %p This order was declined with the following details:
+  .effective-order-payment-details
+    %h4 Payment Details
 
-  = tableize_hash(order.payment)
+    - if order.purchased?
+      %p This order was purchased with the following details:
+    - elsif order.declined?
+      %p This order was declined with the following details:
 
-- else
-  %p No payment details present
+    = tableize_hash(order.payment)

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

@@ -1,21 +1,22 @@
-%table.table{:style => 'width: 600px;margin-bottom:25px;'}
-  %thead
-    %tr
-      %th{:style => 'text-align: left;'}= "#{order.purchased? ? 'Sold to' : 'Bill to'}"
-      - if order.shipping_address.present? && !order.shipping_address.empty?
-        %th{:style => 'text-align: left;'} Ship to
+.effective-order-shipping
+  %table.table{:style => 'width: 600px;margin-bottom:25px;'}
+    %thead
+      %tr
+        %th{:style => 'text-align: left;'}= "#{order.purchased? ? 'Sold to' : 'Bill to'}"
+        - if order.shipping_address.present? && !order.shipping_address.empty?
+          %th{:style => 'text-align: left;'} Ship to
 
-  %tbody
-    %tr
-      %td{:style => 'text-align: left;'}
-        - if order.billing_address.present? && !order.billing_address.empty?
-          = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address, :email => order.user.email}
-        - else
-          = order.billing_name
-          %br
-          = mail_to(order.user.email)
-          %br
-
-      - if order.shipping_address.present? && !order.shipping_address.empty?
+    %tbody
+      %tr
         %td{:style => 'text-align: left;'}
-          = render :partial => 'effective/addresses/address', :locals => {:address => order.shipping_address}
+          - if order.billing_address.present? && !order.billing_address.empty?
+            = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address, :email => order.user.email}
+          - else
+            = order.billing_name
+            %br
+            = mail_to(order.user.email)
+            %br
+
+        - if order.shipping_address.present? && !order.shipping_address.empty?
+          %td{:style => 'text-align: left;'}
+            = render :partial => 'effective/addresses/address', :locals => {:address => order.shipping_address}

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

@@ -1,3 +1,3 @@
-%h2 Checkout
+%h2.effective-orders-page-title Checkout
 
 = render_checkout(@order)

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

@@ -1,4 +1,4 @@
-%h2 Payment Declined
+%h2.effective-orders-page-title Payment Declined
 
 %p Your #{link_to_current_cart(label: 'Shopping Cart')} items have been saved.  Please try again.
 

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

@@ -1,3 +1,3 @@
-%h2 Order History
+%h2.effective-orders-page-title Order History
 
 = render_order_history(@orders)

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

@@ -1,4 +1,4 @@
-%h2 My Sales
+%h2.effective-orders-page-title My Sales
 
 %table.table
   %thead

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

@@ -1,4 +1,4 @@
-%h2 Checkout
+%h2.effective-orders-page-title Checkout
 
 = render_checkout(@order)
 

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

@@ -1,4 +1,4 @@
-%h2 Thank You
+%h2.effective-orders-page-title Thank You
 
 %p You have successfully purchased the following:
 

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

@@ -1,5 +1,3 @@
-%h2= (@order.purchased? ? 'Receipt' : 'Order')
+%h2.effective-orders-page-title= (@order.purchased? ? 'Receipt' : 'Order')
 
 = render @order
-
-

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

@@ -1,4 +1,4 @@
-%h2 My Subscriptions
+%h2.effective-orders-page-title My Subscriptions
 
 - if @subscriptions.present?
   %p You have the following subscriptions:

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

@@ -1,4 +1,4 @@
-%h2 New Subscription
+%h2.effective-orders-page-title New Subscription
 
 - 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
+%h2.effective-orders-page-title
   = @plan.name
   Subscription
   details

data/lib/effective_orders/engine.rb

@@ -44,12 +44,16 @@ module EffectiveOrders
     initializer 'effective_orders.active_admin' do
       if EffectiveOrders.use_active_admin?
         require 'activeadmin'
+        ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
 
-        ActiveSupport.on_load :action_controller do
-          ApplicationController.extend(ActsAsActiveAdminController::ActionController)
+        Rails.application.config.to_prepare do
+          ActiveSupport.on_load :action_controller do
+            ApplicationController.extend(ActsAsActiveAdminController::ActionController)
+            Effective::OrdersController.send(:acts_as_active_admin_controller, 'orders')
+            Effective::CartsController.send(:acts_as_active_admin_controller, 'carts')
+          end
         end
 
-        ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
       end
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails