nimbleshop_authorizedotnet 0.0.7 → 0.0.8

data/README.md

@@ -34,4 +34,4 @@ Documentation is available at [http://nimbleshop.org/authorizedotnet.html](http:
 
 # License
 
-nimbleshop_authorizedotnet uses [MIT license](http://www.opensource.org/licenses/mit-license.php) .
+This gem uses [MIT license](http://www.opensource.org/licenses/mit-license.php) .

data/app/helpers/nimbleshop_authorizedotnet/exposed_helper.rb

@@ -11,7 +11,7 @@ module NimbleshopAuthorizedotnet
       image_tag 'engines/nimbleshop_authorizedotnet/authorizedotnet_small.png', alt: 'authorizedotnet icon'
     end
 
-    def nimbleshop_authorizedotnet_big_image
+    def nimbleshop_authorizedotnet_picture_on_admin_payment_methods
       image_tag 'engines/nimbleshop_authorizedotnet/authorizedotnet_big.png', alt: 'authorizedotnet logo'
     end
 
@@ -38,7 +38,7 @@ module NimbleshopAuthorizedotnet
 
     def nimbleshop_authorizedotnet_payment_form(order)
       return unless NimbleshopAuthorizedotnet::Authorizedotnet.first
-      render partial: '/nimbleshop_authorizedotnet/payments/new', locals: {order: order}
+      render partial: '/nimbleshop_authorizedotnet/payments/new', locals: { order: order }
     end
 
     def nimbleshop_authorizedotnet_crud_form

data/app/models/nimbleshop_authorizedotnet/authorizedotnet.rb

@@ -15,8 +15,9 @@ module NimbleshopAuthorizedotnet
       self.ssl == 'enabled'
     end
 
-    def kapture!(order)
-      processor = NimbleshopAuthorizedotnet::Processor.new(order)
+    def kapture!(order, processor_klass = nil)
+      processor_klass ||= NimbleshopAuthorizedotnet::Processor
+      processor = processor_klass.new(order: order, payment_method: self)
       processor.kapture
       order.kapture!
     end

data/app/views/nimbleshop_authorizedotnet/authorizedotnets/_edit.html.erb

@@ -10,12 +10,11 @@
       <% end %>
     </div>
 
-    <%= nimbleshop_authorizedotnet_big_image %>
+    <%= nimbleshop_authorizedotnet_picture_on_admin_payment_methods %>
 
     <div class='clear'></div>
   </div>
 
-
   <%= render partial: '/nimbleshop_authorizedotnet/authorizedotnets/form' %>
 </div>
 
@@ -23,9 +22,9 @@
   $(function(){
 
     $('#nimbleshop-authorizedotnet-payment-method-edit').toggle(function(){
-      $('#nimbleshop-authorizedotnet-form-well').show(); 
+      $('#nimbleshop-authorizedotnet-form-well').show();
     }, function(){
-      $('#nimbleshop-authorizedotnet-form-well').hide(); 
+      $('#nimbleshop-authorizedotnet-form-well').hide();
     });
 
   })

data/lib/nimbleshop_authorizedotnet.rb

@@ -3,5 +3,4 @@ require 'nimbleshop_authorizedotnet/engine'
 module NimbleshopAuthorizedotnet
   autoload :Processor, 'nimbleshop_authorizedotnet/processor'
   autoload :Gateway,   'nimbleshop_authorizedotnet/gateway'
-  autoload :Util,      'nimbleshop_authorizedotnet/util'
 end

data/lib/nimbleshop_authorizedotnet/processor.rb

@@ -36,7 +36,7 @@ module NimbleshopAuthorizedotnet
         return false
       end
 
-      response = gateway.authorize(order.total_amount_in_cents, creditcard, Util.am_options(order))
+      response = gateway.authorize(order.total_amount_in_cents, creditcard, ::Nimbleshop::PaymentUtil.activemerchant_options(order))
       record_transaction(response, 'authorized', card_number: creditcard.display_number, cardtype: creditcard.cardtype)
 
       if response.success?
@@ -95,7 +95,10 @@ module NimbleshopAuthorizedotnet
       tsx_id = options[:transaction_gid]
 
       response = gateway.capture(order.total_amount_in_cents, tsx_id, {})
-      record_transaction(response, 'captured')
+
+      pt = PaymentTransaction.find_by_transaction_gid! tsx_id
+      #record_transaction(response, 'captured')
+      record_transaction(response, 'captured', card_number: pt.metadata[:card_number], cardtype: pt.metadata[:cardtype])
 
       if response.success?
         order.kapture

data/test/unit/payment_method_test.rb

@@ -19,3 +19,19 @@ class PaymentMethodAuthorizeNetTest < ActiveSupport::TestCase
   end
 
 end
+
+
+class PaymentMethodAuthorizeNetKaptureTest < ActiveSupport::TestCase
+  setup do
+    class HackedProcessor < NimbleshopAuthorizedotnet::Processor
+      def kapture(*args); end
+    end
+  end
+
+  test '#kapture!' do
+    order = create :order_paid_using_authorizedotnet
+    adnt = NimbleshopAuthorizedotnet::Authorizedotnet.new(name: 'Authorize.net', description: 'this is description')
+    adnt.kapture!(order, HackedProcessor)
+    assert_equal 'purchased', order.payment_status
+  end
+end

data/test/unit/processor_test.rb

@@ -77,6 +77,8 @@ module Processor
       transaction = @order.payment_transactions.last
       assert_equal  'captured', transaction.operation
       assert_equal  true, transaction.success
+      assert_equal "XXXX-XXXX-XXXX-0027", transaction.metadata[:card_number]
+      assert_equal 'visa', transaction.metadata[:cardtype]
       assert        @order.purchased?
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbleshop_authorizedotnet
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -56,7 +56,6 @@ files:
 - lib/nimbleshop_authorizedotnet/engine.rb
 - lib/nimbleshop_authorizedotnet/gateway.rb
 - lib/nimbleshop_authorizedotnet/processor.rb
-- lib/nimbleshop_authorizedotnet/util.rb
 - lib/nimbleshop_authorizedotnet.rb
 - lib/tasks/nimbleshop_authorizedotnet_tasks.rake
 - README.md
@@ -88,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4027251246364974235
+      hash: 4574169439669715898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4027251246364974235
+      hash: 4574169439669715898
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/nimbleshop_authorizedotnet/util.rb

@@ -1,31 +0,0 @@
-module NimbleshopAuthorizedotnet
-  module Util
-    extend self
-
-    def billing_address(order)
-      { address1: order.real_billing_address.address1,
-        city: order.real_billing_address.city,
-        state: order.real_billing_address.state_name,
-        country: order.real_billing_address.country_name,
-        zip: order.real_billing_address.zipcode }
-    end
-
-    def shipping_address(order)
-      { first_name: order.shipping_address.first_name,
-        last_name: order.shipping_address.last_name,
-        address1: order.shipping_address.address1,
-        city: order.shipping_address.city,
-        state: order.shipping_address.state_name,
-        country: order.shipping_address.country_name,
-        zip: order.shipping_address.zipcode }
-    end
-
-    # In this method am stands for activemerchant
-    def am_options(order)
-      billing_address = { billing_address: billing_address(order) }
-      shipping_address = { shipping_address: shipping_address(order) }
-      misc = { order_id: order.number, email: order.email }
-      billing_address.merge(shipping_address).merge(misc)
-    end
-  end
-end