effective_orders 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93008369c9c4018e92a6605bde7b37c1d1952992
-  data.tar.gz: b9ec1fdfc02964bd077a3c1b8a1eccaab7d6b112
+  metadata.gz: 34511876560d7a99a31838f447cbfadc4a30c70c
+  data.tar.gz: a5d30c4367be050345e227f33790c39a82b04729
 SHA512:
-  metadata.gz: e2bab85ac8f6749f4b081b44198c6476323a082e9768001a4b3ee4ff81718a48f0fd9dafb7240e69f4f6b4a8fe5ee29452b2f6c3878868f771417c85293037db
-  data.tar.gz: f1edea1ec59980aee87fac9cf2652a41f50de0cb78f29d69cac937bda0c98f57605fca429d5c5fae3a0ddfd03faf38b3a4441282c924b3e9f079864918e1bc09
+  metadata.gz: 9509286115a6fdcb802c962b777aab0d4a6d8950c34620b11b48b7c0ec138e2e87892ffdddb07efb89de171c2a07565e7d1ac40c3b2bcdc456bfaa86c7ccbd42
+  data.tar.gz: 2dfca854a6115611fdfceb10629780a1128adc2f3a022cb4f49e44c96715f2f1bf171cfcc83ba1770d84f1c85f39d20b10e84691fee1a4a4e37033614a569fa2

data/active_admin/effective_orders.rb

@@ -18,7 +18,9 @@ if defined?(ActiveAdmin)
       include EffectiveOrdersHelper
 
       def scoped_collection
-        end_of_association_chain.includes(:user).includes(order_items: :purchasable)
+        scoped = end_of_association_chain.includes(:user).includes(order_items: :purchasable)
+        scoped = scoped.where(user: current_user) if !authorized?(:admin, :effective_orders)
+        scoped
       end
     end
 
@@ -45,7 +47,7 @@ if defined?(ActiveAdmin)
 
       column 'Order Items' do |order|
         content_tag(:ul) do
-          (order.order_items).map { |oi| content_tag(:li, oi) }.join.html_safe
+          (order.order_items).map { |oi| content_tag(:li, oi.to_s.html_safe) }.join.html_safe
         end
       end
 
@@ -79,6 +81,7 @@ if defined?(ActiveAdmin)
       col_headers << "Tax"
       col_headers << "Total"
       col_headers << 'Purchase method'
+      col_headers << 'Card Type'
 
       csv_string = CSV.generate do |csv|
         csv << col_headers
@@ -92,7 +95,8 @@ if defined?(ActiveAdmin)
             (order.subtotal / 100.0).round(2),
             (order.tax / 100.0).round(2),
             (order.total / 100.0).round(2),
-            order.purchase_method
+            order.payment_method,
+            order.payment_card_type
           ]
         end
       end

data/app/controllers/effective/orders_controller.rb

@@ -141,18 +141,17 @@ module Effective
     protected
 
     def order_purchased(details = nil, redirect_url = nil, declined_redirect_url = nil)
-      #begin
+      begin
         @order.purchase!(details)
         current_cart.try(:destroy)
 
         flash[:success] = "Successfully purchased order"
 
         redirect_to (redirect_url.presence || effective_orders.order_purchased_path(':id')).gsub(':id', @order.to_param.to_s)
-      #rescue => e
-      #  binding.pry
-      #  flash[:danger] = "Unable to process your order.  Your card has not been charged.  Your Cart items have been restored.  Please try again.  Error Message: #{e.message}"
-      #  redirect_to (declined_redirect_url.presence || effective_orders.cart_path).gsub(':id', @order.to_param.to_s)
-      #end
+      rescue => e
+        flash[:danger] = "Unable to process your order.  Your card has not been charged.  Your Cart items have been restored.  Please try again.  Error Message: #{e.message}"
+        redirect_to (declined_redirect_url.presence || effective_orders.cart_path).gsub(':id', @order.to_param.to_s)
+      end
     end
 
     def order_declined(details = nil, redirect_url = nil)

data/app/models/concerns/acts_as_purchasable.rb

@@ -15,7 +15,9 @@ module ActsAsPurchasable
 
     validates_with Effective::SoldOutValidator, :on => :create
 
-    validates :price, :presence => true, :numericality => true
+    # Database max integer value is 2147483647.  So let's round that down and use a max/min of $20 million (2000000000)
+    validates :price, :presence => true, :numericality => { less_than_or_equal_to: 2000000000, message: 'maximum price is $20,000,000' }
+
     validates :tax_exempt, :inclusion => {:in => [true, false]}
 
     # These are breaking on the check for quanitty_enabled?.  More research is due

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

@@ -24,7 +24,7 @@ if defined?(EffectiveDatatables)
 
           table_column :items, label: 'Order Items', sortable: false, column: query_items_list do |order|
             content_tag(:ul) do
-              (order[:items] || '').split('!!SEP!!').map { |oi| content_tag(:li, oi) }.join.html_safe
+              (order[:items] || '').split('!!SEP!!').map { |oi| content_tag(:li, oi.to_s.html_safe) }.join.html_safe
             end
           end
 

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

@@ -28,18 +28,19 @@
           %td.price= price_to_currency(item.subtotal)
 
     %tfoot
-      %tr
-        %th.quantity
-        - if include_download_column
-          %th.download
-        %th.subtotal Subtotal
-        %td.price.subtotal-price= price_to_currency(order.subtotal)
-      %tr
-        %th.quantity
-        - if include_download_column
-          %th.download
-        %th.tax Tax
-        %td.price.tax-price= price_to_currency(order.tax)
+      - if order.tax > 0
+        %tr
+          %th.quantity
+          - if include_download_column
+            %th.download
+          %th.subtotal Subtotal
+          %td.price.subtotal-price= price_to_currency(order.subtotal)
+        %tr
+          %th.quantity
+          - if include_download_column
+            %th.download
+          %th.tax Tax
+          %td.price.tax-price= price_to_currency(order.tax)
       %tr
         %th.quantity
         - if include_download_column

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.6.3'.freeze
+  VERSION = '1.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ 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