effective_orders 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9594a00af04e8a3fa775560e34d35e9181e70919
-  data.tar.gz: 78aca75f4a95e83b1d512c8537346bba1f41a78f
+  metadata.gz: f56436464dbe43fb2f2b12173b21c5b6905f8092
+  data.tar.gz: fffc2cb0fca162b283bd9c8363ef44ba3d8a85fe
 SHA512:
-  metadata.gz: c32c82987c9746f17821c14da0f8d83ede0a180290eb6ad9813f5cda5cc0cbf76ec900e581279e9355247146e1d0aca3f3314658240fe1c371028d21aa8edaf4
-  data.tar.gz: 5aebd22e4161a00b0db47c7b606055f884e29d4a9f9b1a800fa97aa23b7cfa5c7a789b9e89bf2148ebaf11980144e5be84debc74ab805cb6771f5b3480c1bc8f
+  metadata.gz: 1a9dac2ae8b2080f739b5c9a64503ded5bdc2725963c3179347fdd441cd389b2dcc4c28928665b3771225caae59d5d6f411a28db03ee30de354757933d9c2002
+  data.tar.gz: 875e6f55e84c991aa291ed034428bbf623c4c07e38c057dba462fff1bb0dcdfbcab5f7cf0c0e664f614ca0500d0dd01f759369eddba866dc36e6e3964eea128e

data/active_admin/effective_orders.rb

@@ -28,21 +28,38 @@ if defined?(ActiveAdmin)
     end
 
     index :download_links => false do
+      column :purchased_at
+
       column 'Order', :sortable => :id do |order|
         link_to "##{order.to_param}", effective_orders.order_path(order)
       end
 
-      column 'Buyer', :sortable => :user_id do |order|
+      column 'Buyer Email' do |order|
+        mail_to order.user.email
+      end
+
+      column 'Buyer Name', :sortable => :user_id do |order|
         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|
-        order_summary(order)
+      column 'Order Items' do |order|
+        content_tag(:ul) do
+          (order.order_items).map { |oi| content_tag(:li, oi) }.join.html_safe
+        end
       end
 
-      column :purchased_at
-      column :purchase_method
+      column 'Total' do |order|
+        price_to_currency(order.total)
+      end
+
+      column :payment_method do |order|
+        order.payment_method
+      end
+
+      column :payment_card_type do |order|
+        order.payment_card_type
+      end
 
       column do |order|
         link_to('View Receipt', effective_orders.order_path(order), class: 'member_link view_link') if order.purchased?

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

@@ -1,6 +1,8 @@
 .effective-order {
-  .table {
+  table {
     clear: both;
+    width: 600px;
+    margin-bottom: 25px;
 
     tfoot {
       > tr:first-child {
@@ -13,12 +15,16 @@
         padding-right: 65px;
       }
 
+      td {
+        text-align: right;
+      }
+
       .actions { border: none; }
     }
-
-    .price { text-align: right; }
   }
 
+  .price { text-align: right; }
+
   .effective-stripe-subscription {
     input {
       margin-top: 5px;
@@ -34,5 +40,10 @@
   > * {
     display: inline-block;
   }
+}
 
+@media print {
+  .effective-order-purchase-actions { display: none; }
+  .print-button { display: none; }
+  .resend-receipt-button { display: none; }
 }

data/app/helpers/effective_orders_helper.rb

@@ -15,7 +15,7 @@ module EffectiveOrdersHelper
             title[1..-1].each { |line| output << "<br>#{line}" }
           end.html_safe
         end
-      end.join().html_safe
+      end.join.html_safe
     end
   end
 
@@ -107,22 +107,28 @@ module EffectiveOrdersHelper
   # Used by the _payment_details partial
   def tableize_hash(hash, options = {class: 'table table-bordered'})
     if hash.present? && hash.kind_of?(Hash)
-      content_tag(:table, options[:class]) do
-        hash.map do |k, v|
-          content_tag(:tr) do
-            content_tag((options[:th] ? :th : :td), k) +
-            content_tag(:td) do
-              if v.kind_of?(Hash)
-                tableize_hash(v, options.merge({:class => 'table table-bordered', :th => (options.key?(:sub_th) ? options[:sub_th] : options[:th])}))
-              elsif v.kind_of?(Array)
-                '[' + v.join(', ') + ']'
-              else
-                v
+      content_tag(:table, class: options[:class]) do
+        title = options.delete(:title)
+
+        content = content_tag(:tbody) do
+          hash.map do |k, v|
+            content_tag(:tr) do
+              content_tag((options[:th] ? :th : :td), k) +
+              content_tag(:td) do
+                if v.kind_of?(Hash)
+                  tableize_hash(v, options.merge(th: (options.key?(:sub_th) ? options[:sub_th] : options[:th])))
+                elsif v.kind_of?(Array)
+                  '[' + v.join(', ') + ']'
+                else
+                  v
+                end
               end
             end
-          end
-        end.join('').html_safe
-      end.html_safe
+          end.join.html_safe
+        end
+
+        title.blank? ? content : (content_tag(:thead) { content_tag(:tr) { content_tag(:th, title, colspan: 2) } } + content)
+      end
     else
       hash.to_s.html_safe
     end

data/app/models/effective/order.rb

@@ -239,6 +239,8 @@ module Effective
     end
 
     def purchase_method
+      return 'None' unless purchased?
+
       if purchased?(:stripe_connect)
         'Stripe Connect'
       elsif purchased?(:stripe)
@@ -247,31 +249,47 @@ module Effective
         'Moneris'
       elsif purchased?(:paypal)
         'PayPal'
-      elsif purchased?
+      else
         'Online'
+      end
+    end
+    alias_method :payment_method, :purchase_method
+
+    def purchase_card_type
+      return 'None' unless purchased?
+
+      if purchased?(:stripe_connect)
+        ((payment[:charge] || payment['charge'])['card']['brand'] rescue 'Unknown')
+      elsif purchased?(:stripe)
+        ((payment[:charge] || payment['charge'])['card']['brand'] rescue 'Unknown')
+      elsif purchased?(:moneris)
+        payment[:card] || payment['card'] || 'Unknown'
+      elsif purchased?(:paypal)
+        payment[:payment_type] || payment['payment_type'] || 'Unknown'
       else
-        'None'
+        'Online'
       end
     end
+    alias_method :payment_card_type, :purchase_card_type
 
     def purchased?(provider = nil)
       return false if (purchase_state != EffectiveOrders::PURCHASED)
-      return true if provider == nil
-
-      begin
-        case provider
-        when :stripe_connect
-          payment.keys.first.kind_of?(Numeric) && payment[payment.keys.first].key?('object') && payment[payment.keys.first]['object'] == 'charge'
-        when :stripe
-          payment.key?('object') && payment['object'] == 'charge'
-        when :moneris
-          payment.key?('response_code') && payment.key?('transactionKey')
-        when :paypal
-        else
-          false
-        end
-      rescue => e
-        false
+      return true if provider == nil || payment.kind_of?(Hash) == false
+
+      case provider.to_sym
+      when :stripe_connect
+        charge = (payment[:charge] || payment['charge'])
+        charge['id'] && charge['customer'] && charge['application_fee'].present?
+      when :stripe
+        charge = (payment[:charge] || payment['charge'])
+        charge['id'] && charge['customer']
+      when :moneris
+        (payment[:response_code] || payment['response_code']) &&
+        (payment[:transactionKey] || payment['transactionKey'])
+      when :paypal
+        (payment[:payer_email] || payment['payer_email'])
+      else
+        raise "Unknown provider #{provider} passed to Effective::Order.purchased?"
       end
     end
 

data/app/models/effective/order_item.rb

@@ -28,6 +28,10 @@ module Effective
     scope :sold, -> { joins(:order).where(:orders => {:purchase_state => EffectiveOrders::PURCHASED}) }
     scope :sold_by, lambda { |user| sold().where(:seller_id => user.try(:id)) }
 
+    def to_s
+      (quantity || 0) > 1 ? "#{quantity}x #{title}" : title
+    end
+
     def subtotal
       price * quantity
     end

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

@@ -1,40 +1,48 @@
 - include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? rescue false }
 
 .effective-order
-  %table.table{:style => 'width: 600px;margin-bottom:25px;'}
-
+  %table.table
     %thead
       %tr
-        %th.quantity{:style => 'text-align: left;'} Qty
-        %th.item{:style => 'text-align: left;'} Item
+        %th.quantity Qty
+        %th.item= order.order_items.length > 1 ? 'Items' : 'Item'
         - if include_download_column
-          %th.download{:style => 'text-align: left;'} Download
-        %th.price{:style => 'text-align: right;'} Price
+          %th.download Download
+        %th.price Price
 
     %tbody
       - order.order_items.each do |item|
         %tr
-          %td.quantity{:style => 'text-align: left;'}= item.quantity
-          %td.item{:style => 'text-align: left;'}
+          %td.quantity= item.quantity
+          %td.item
             = item.title.html_safe
             - if order.new_record? && item.purchasable.kind_of?(Effective::Subscription)
               = render :partial => 'effective/orders/stripe/subscription_fields', :locals => {:form => form, :subscription => item.purchasable }
 
           - if include_download_column
-            %td.download{:style => 'text-align: left;'}
+            %td.download
               - if item.purchased? && (item.purchased_download_url rescue nil).present?
                 = link_to 'download', item.purchased_download_url
               - else
                 = '-'
-          %td.price{:style => 'text-align: right;'}= price_to_currency(item.subtotal)
+          %td.price= price_to_currency(item.subtotal)
 
     %tfoot
       %tr
-        %th{:style => 'text-align: right;', :colspan => (include_download_column ? 3 : 2)} Subtotal
-        %td.price{:style => 'text-align: right;'}= price_to_currency(order.subtotal)
+        %th.quantity
+        - if include_download_column
+          %th.download
+        %th.subtotal Subtotal
+        %td.price.subtotal-price= price_to_currency(order.subtotal)
       %tr
-        %th{:style => 'text-align: right;', :colspan => (include_download_column ? 3 : 2)} Tax
-        %td.price{:style => 'text-align: right;'}= price_to_currency(order.tax)
+        %th.quantity
+        - if include_download_column
+          %th.download
+        %th.tax Tax
+        %td.price.tax-price= price_to_currency(order.tax)
       %tr
-        %th{:style => 'text-align: right;', :colspan => (include_download_column ? 3 : 2)} Total Due
-        %td.price{:style => 'text-align: right;'}= price_to_currency(order.total)
+        %th.quantity
+        - if include_download_column
+          %th.download
+        %th.total Total Due
+        %td.price.total-price= price_to_currency(order.total)

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

@@ -1,10 +1,3 @@
 - if order.payment.present?
   .effective-order-payment-details
-    %h4 Payment Details
-
-    - if order.purchased?
-      %p This order was purchased with the following details:
-    - elsif order.declined?
-      %p This order was declined with the following details:
-
-    = tableize_hash(order.payment, class: 'table')
+    = tableize_hash(order.payment, {class: 'table', title: 'Payment Details'})

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

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

data/lib/effective_orders/engine.rb

@@ -35,7 +35,12 @@ module EffectiveOrders
     # Set up our Stripe API Key
     initializer "effective_orders.stripe_api_key", :after => :load_config_initializers do |app|
       if EffectiveOrders.stripe_enabled
-        require 'stripe'
+        begin
+          require 'stripe'
+        rescue Exception
+          raise "unable to load stripe.  Plese add gem 'stripe' to your Gemfile and then 'bundle install'"
+        end
+
         ::Stripe.api_key = EffectiveOrders.stripe[:secret_key]
       end
     end
@@ -43,7 +48,12 @@ module EffectiveOrders
     # Use ActiveAdmin (optional)
     initializer 'effective_orders.active_admin' do
       if EffectiveOrders.use_active_admin?
-        require 'activeadmin'
+        begin
+          require 'activeadmin'
+        rescue Exception
+          raise "unable to load activeadmin.  Plese add gem 'activeadmin' to your Gemfile and then 'bundle install'"
+        end
+
         ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
 
         Rails.application.config.to_prepare do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement