effective_orders 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56436464dbe43fb2f2b12173b21c5b6905f8092
-  data.tar.gz: fffc2cb0fca162b283bd9c8363ef44ba3d8a85fe
+  metadata.gz: 93008369c9c4018e92a6605bde7b37c1d1952992
+  data.tar.gz: b9ec1fdfc02964bd077a3c1b8a1eccaab7d6b112
 SHA512:
-  metadata.gz: 1a9dac2ae8b2080f739b5c9a64503ded5bdc2725963c3179347fdd441cd389b2dcc4c28928665b3771225caae59d5d6f411a28db03ee30de354757933d9c2002
-  data.tar.gz: 875e6f55e84c991aa291ed034428bbf623c4c07e38c057dba462fff1bb0dcdfbcab5f7cf0c0e664f614ca0500d0dd01f759369eddba866dc36e6e3964eea128e
+  metadata.gz: e2bab85ac8f6749f4b081b44198c6476323a082e9768001a4b3ee4ff81718a48f0fd9dafb7240e69f4f6b4a8fe5ee29452b2f6c3878868f771417c85293037db
+  data.tar.gz: f1edea1ec59980aee87fac9cf2652a41f50de0cb78f29d69cac937bda0c98f57605fca429d5c5fae3a0ddfd03faf38b3a4441282c924b3e9f079864918e1bc09

data/app/controllers/effective/orders_controller.rb

@@ -141,17 +141,18 @@ 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
-        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
+      #  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
     end
 
     def order_declined(details = nil, redirect_url = nil)

data/app/helpers/effective_orders_helper.rb

@@ -105,7 +105,7 @@ module EffectiveOrdersHelper
   alias_method :render_my_purchases, :render_order_history
 
   # Used by the _payment_details partial
-  def tableize_hash(hash, options = {class: 'table table-bordered'})
+  def tableize_order_payment(hash, options = {class: 'table table-bordered'})
     if hash.present? && hash.kind_of?(Hash)
       content_tag(:table, class: options[:class]) do
         title = options.delete(:title)

data/app/models/effective/order.rb

@@ -278,10 +278,10 @@ module Effective
 
       case provider.to_sym
       when :stripe_connect
-        charge = (payment[:charge] || payment['charge'])
+        charge = (payment[:charge] || payment['charge'] || {})
         charge['id'] && charge['customer'] && charge['application_fee'].present?
       when :stripe
-        charge = (payment[:charge] || payment['charge'])
+        charge = (payment[:charge] || payment['charge'] || {})
         charge['id'] && charge['customer']
       when :moneris
         (payment[:response_code] || payment['response_code']) &&

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

@@ -1,3 +1,3 @@
 - if order.payment.present?
   .effective-order-payment-details
-    = tableize_hash(order.payment, {class: 'table', title: 'Payment Details'})
+    = tableize_order_payment(order.payment, {class: 'table', title: 'Payment Details'})

data/lib/effective_orders/version.rb

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

metadata

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