trado_stripe_module 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7394040126766250f5afd5203b7c7826f8f9cd1
-  data.tar.gz: 90b7644260815e746956668bd6abd70497ecaf87
+  metadata.gz: 62c4d987e7e0737f13f7dc18b4600703ea506c00
+  data.tar.gz: 832ed68faf6ba7eb336cd8ca2577ea001e7b6236
 SHA512:
-  metadata.gz: d5f4d8e9843616abe18435eefa36740ead06cc0cbd4639dd86802ef046b0c28b8cabc71ec0567f861ed69a0c1b514ec9a59451196ed522ee6c11b0fedf44c724
-  data.tar.gz: 5768d77ac791f78de59f0b39b48abe59979cb97050ce7f38ff3447543e3319994d3809c585717d9a7780526a677009c2a5478a69d6df2180900b0c7f2bbcc914
+  metadata.gz: 00304ee97898eabc4beb2dcfe95d9c9dabf7cea25c0f51e919d17cc3fe02c64e194b150c757bc2c87d23228c707e6e832cddc0a5d6c0e83f135a47a558f5c4e8
+  data.tar.gz: e121198dbb800092f1468cc148a6c9bf18d5194be08d52e471b29966b3b3b804db88c25ff479e6680354456a09b12146191760595dbd39df8892b29ccfe79676

data/app/controllers/trado_stripe_module/stripe_controller.rb

@@ -13,18 +13,18 @@ class TradoStripeModule::StripeController < ApplicationController
                 begin
                     if @order.save
                         set_order_id_session
+                        @order.calculate(current_cart, Store.tax_rate)
                         @order.remove_redundant_stripe_cards
                         @order.create_stripe_card
-                        @order.calculate(current_cart, Store.tax_rate)
                         redirect_to confirm_order_url(@order)
                     else
                         flash_message :error, 'An error ocurred with your order. Please try again.'
                         render theme_presenter.page_template_path('carts/checkout'), layout: theme_presenter.layout_template_path
                     end
-                rescue Stripe::InvalidRequestError, Stripe::APIConnectionError => e
-                    flash_message :error, 'An error ocurred with your order. Please try again.'  
+                rescue Stripe::InvalidRequestError, Stripe::APIConnectionError, Stripe::CardError, NoMethodError => e
+                    flash_message :error, 'An error ocurred with your order, please confirm your card details and try again.'  
                     Rails.logger.error "Stripe Error: #{e} ? #{@order.email} | #{@order.id}"
-                    redirect_to checkout_carts_url
+                    render theme_presenter.page_template_path('carts/checkout'), layout: theme_presenter.layout_template_path
                 end
             end
 

data/lib/trado_stripe_module/active_record.rb

@@ -19,7 +19,7 @@ module TradoStripeModule
                 end
 
                 define_method("stripe_cards") do
-                    stripe_customer.sources.all(:object => "card")['data']
+                    stripe_customer.sources.all(object: "card")['data']
                 end
 
                 define_method("default_card") do

data/lib/trado_stripe_module/striper.rb

@@ -1,3 +1,4 @@
+require 'money'
 require_dependency 'lib/payatron_4000'
 
 module TradoStripeModule
@@ -17,7 +18,8 @@ module TradoStripeModule
                 customer: order.stripe_customer_id,
                 description: "Order ID ##{order.id} | #{order.billing_address.full_name} | #{order.email}",
                 metadata: Hash[ *order.order_items.collect { |item| [ "order_item_#{item.id}", "#{item.product.name} - #{item.sku.full_sku}" ] }.flatten ],
-                statement_descriptor: Store.settings.stripe_statement_descriptor
+                statement_descriptor: Store.settings.stripe_statement_descriptor,
+                expand: ['balance_transaction']
             )
             if charge.paid
                 TradoStripeModule::Striper.successful(charge, order)
@@ -41,7 +43,7 @@ module TradoStripeModule
         # @param charge [Object]
         # @param order [Object]
         def self.successful charge, order
-            Transaction.new(  :fee                      => charge.application_fee,  
+            Transaction.new(  :fee                      => TradoStripeModule::Striper.format_currency(charge),  
                               :order_id                 => order.id, 
                               :payment_status           => 'completed', 
                               :transaction_type         => 'Credit', 
@@ -75,5 +77,9 @@ module TradoStripeModule
             ).save(validate: false)
             Payatron4000.increment_product_order_count(order.products)
         end
+
+        def self.format_currency charge
+          Money.new(charge.balance_transaction.fee, charge.currency.upcase)
+        end
     end
 end

data/lib/trado_stripe_module/version.rb

@@ -1,3 +1,3 @@
 module TradoStripeModule
-    VERSION = "0.1.1"
+    VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trado_stripe_module
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Tom Dallimore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.7'
 description: Module for Stripe payment functionality in the Trado Ecommerce platform.
 email:
 - me@tomdallimore.com