nimbleshop_authorizedotnet 0.0.10 → 0.0.11

data/app/controllers/nimbleshop_authorizedotnet/authorizedotnets_controller.rb

@@ -8,37 +8,23 @@ module NimbleshopAuthorizedotnet
     before_filter :load_payment_method
 
     def update
-      respond_to do |format|
-        if @payment_method.update_attributes(post_params[:authorizedotnet])
-          format.js  {
-            flash[:notice] = 'Authorize.net record was successfully updated'
-            render js: "window.location = '/admin/payment_methods'"
-          }
-        else
-          msg =  @payment_method.errors.full_messages.first
-          error =  %Q[alert("#{msg}")]
-          format.js { render js: error }
-        end
-      end
-    end
+      alert_msg = if @payment_method.update_attributes(post_params[:authorizedotnet])
+                    msg = "Record has been updated"
+                    %Q[alert("#{msg}")]
+                  else
+                    msg =  @payment_method.errors.full_messages.first
+                    %Q[alert("#{msg}")]
+                  end
 
-    def destroy
       respond_to do |format|
-        if @payment_method.destroy
-          format.js {
-            flash[:notice] = 'Authorize.net record was successfully deleted'
-            render js: "window.location = '/admin/payment_methods'"
-          }
-        else
-          format.js { render js: 'Authorize.net record could not be deleted. Please try again later.' }
-        end
+        format.js { render js: alert_msg }
       end
     end
 
     private
 
     def post_params
-      params.permit(authorizedotnet: [:mode, :ssl, :login_id, :transaction_key, :business_name])
+      params.permit(authorizedotnet: [:mode, :ssl, :api_login_id, :transaction_key, :business_name])
     end
 
     def load_payment_method

data/app/controllers/nimbleshop_authorizedotnet/payments_controller.rb

@@ -3,19 +3,19 @@ module NimbleshopAuthorizedotnet
   class PaymentsController < ::ActionController::Base
 
     def create
-      order             =  Order.find_by_id!(session[:order_id])
+      order             =  Order.find_by_id! session[:order_id]
 
       address_attrs     = order.final_billing_address.to_credit_card_attributes
-      creditcard_attrs  = params[:creditcard].merge(address_attrs)
-      creditcard        = Creditcard.new(creditcard_attrs)
+      creditcard_attrs  = creditcard_params.merge address_attrs
+      creditcard        = Creditcard.new creditcard_attrs
 
       payment_method    = NimbleshopAuthorizedotnet::Authorizedotnet.first
-      processor         = NimbleshopAuthorizedotnet::Processor.new({order: order, payment_method: payment_method})
+      processor         = NimbleshopAuthorizedotnet::Processor.new(order: order, payment_method: payment_method)
 
       default_action = Shop.current.default_creditcard_action
 
       if processor.send(default_action, creditcard: creditcard)
-        url = nimbleshop_simply.order_path(order)
+        url = nimbleshop_simply.order_path order
         @output = "window.location='#{url}'"
       else
         error = processor.errors.first
@@ -31,6 +31,10 @@ module NimbleshopAuthorizedotnet
 
     end
 
-  end
+    private
 
+    def creditcard_params
+      params.require(:creditcard).permit(:number, :"expires_on(3i)", :"expires_on(2i)", :"expires_on(1i)", :cvv)
+    end
+  end
 end

data/app/models/nimbleshop_authorizedotnet/authorizedotnet.rb

@@ -1,14 +1,15 @@
 module NimbleshopAuthorizedotnet
   class Authorizedotnet < PaymentMethod
 
-    store_accessor :metadata, :login_id, :transaction_key, :business_name, :mode, :ssl
+    store_accessor :metadata, :api_login_id, :transaction_key, :business_name, :mode, :ssl
 
     before_save :set_mode, :set_ssl
 
-    validates_presence_of :login_id, :transaction_key, :business_name
+    validates_presence_of :api_login_id, message: "^Api Login Id can't be blank"
+    validates_presence_of :transaction_key, :business_name
 
     def credentials
-      { login: login_id, password: transaction_key }
+      { login: api_login_id, password: transaction_key }
     end
 
     def use_ssl?
@@ -18,8 +19,8 @@ module NimbleshopAuthorizedotnet
     def kapture!(order, processor_klass = nil)
       processor_klass ||= NimbleshopAuthorizedotnet::Processor
       processor = processor_klass.new(order: order, payment_method: self)
-      processor.kapture
-      order.kapture!
+
+      processor.kapture transaction_gid: order.payment_transactions.last.transaction_gid
     end
 
     private

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

@@ -1,31 +1,66 @@
-<div class='payment-method-engine-well'>
-
-  <div>
-    <h2>Authorize.net</h2>
-    <div class="edit_link">
-      <%= link_to 'Edit', '#', class: 'nimbleshop-payment-method-edit', id: 'nimbleshop-authorizedotnet-payment-method-edit' %>
-      <%= link_to nimbleshop_authorizedotnet.authorizedotnet_path, class: 'nimbleshop-payment-method-delete',
-                                  confirm: 'Do you really want to delete Authorize.net payment method', method: :delete, remote: true do %>
-          <i class='icon-remove icon-white'></i>
-      <% end %>
-    </div>
+<% payment_method = NimbleshopAuthorizedotnet::Authorizedotnet.first %>
+
+<%= content_tag :div, style: 'display:none', data: { behavior: "payment-method-form-#{payment_method.permalink}" } do %>
+  <div style="width:200px;margin-left:60px;"> <%= nimbleshop_authorizedotnet_picture_on_admin_payment_methods %> </div>
+  <br />
+
+  <%= form_for payment_method,  url: '/nimbleshop_authorizedotnet/authorizedotnet',
+                                                      remote: true,
+                                                      html: { method: 'put',
+                                                              id: 'nimbleshop-authorizedotnet-form',
+                                                              class: 'nimbleshop-payment-method-form form-horizontal'} do |f| %>
 
-    <%= nimbleshop_authorizedotnet_picture_on_admin_payment_methods %>
+    <fieldset>
+      <div class='control-group'>
+        <%= f.label :api_login_id, 'Api Login Id', class: 'control-label' %>
+        <div class='controls'>
+          <%= f.text_field :api_login_id, class: 'span6' %>
+        </div>
+      </div>
 
-    <div class='clear'></div>
-  </div>
+      <div class='control-group'>
+        <%= f.label :transaction_key, nil, class: 'control-label' %>
+        <div class='controls'>
+          <%= f.text_field :transaction_key, class: 'span6' %>
+        </div>
+      </div>
 
-  <%= render partial: '/nimbleshop_authorizedotnet/authorizedotnets/form' %>
-</div>
+      <div class='control-group'>
+        <%= f.label :business_name, nil, class: 'control-label' %>
+        <%= link_to '?', '#', 'data-content' => 'Please enter the name of the company as it would appear in the credit card statement. If are not sure what name would appear in the credit card statements then consult your merchant account provider.',
+                          'data-original-title' => 'Business name' %>
+        <div class='controls'>
+          <%= f.text_field :business_name, class: 'span6' %>
+        </div>
+      </div>
 
-<script>
-  $(function(){
+      <div class='control-group'>
+        <div class='controls'>
+          <label class='checkbox'>
+            <%= f.check_box :mode, {}, 'test', 'production' %> Enable test mode
+            <%= link_to '?', '#', class: 'help', 'data-content' => 'In the test mode real credit card numbers are not accepted.',
+                              'data-original-title' => 'Test mode' %>
+          </label>
+        </div>
+      </div>
 
-    $('#nimbleshop-authorizedotnet-payment-method-edit').toggle(function(){
-      $('#nimbleshop-authorizedotnet-form-well').show();
-    }, function(){
-      $('#nimbleshop-authorizedotnet-form-well').hide();
-    });
+      <div class='control-group'>
+        <div class='controls'>
+          <label class='checkbox'>
+            <%= f.check_box :ssl, {}, 'enabled', 'disabled' %> Enable SSL requirement
+            <%= link_to '?', '#', class: 'help', 'data-content' => 'Enabling SSL requirement will force the payment page to be on SSL.',
+                              'data-original-title' => 'SSL requirement' %>
+          </label>
+        </div>
+      </div>
+
+    </fieldset>
+
+    <div class='form-actions'>
+      <%= f.submit('Submit', class: 'btn btn-primary') %>
+      &nbsp;
+      <%= link_to 'Disable', main_app.disable_admin_payment_method_path(payment_method), class: 'disable-payment-method-link', method: :put %>
+    </div>
 
-  })
-</script>
+  <% end %>
+<% end %>

data/app/views/nimbleshop_authorizedotnet/payments/_new.html.erb

@@ -48,10 +48,10 @@
         Expiration date
         </p>
         <div class='controls'>
-          <%= f.date_select :expires_on,  discard_day: true, 
-            start_year: Date.today.year, 
-            end_year: (Date.today.year + 10), 
-            add_month_numbers: true, 
+          <%= f.date_select :expires_on,  discard_day: true,
+            start_year: Date.today.year,
+            end_year: (Date.today.year + 10),
+            add_month_numbers: true,
             order: [:day, :month, :year] %>
         </div>
       </div>
@@ -87,5 +87,8 @@ $(document).ready(function(){
       var $btn = $('#authorizedotnet-payment-form').find('.btn-primary');
       $btn.attr('value', 'Submit').removeAttr('disabled');
     })
+    .bind("ajax:error", function(evt, xhr, status, error){
+      alert("Something has gone wrong")
+    })
 });
 </script>

data/lib/nimbleshop_authorizedotnet/gateway.rb

@@ -3,7 +3,7 @@ module NimbleshopAuthorizedotnet
     def self.instance(payment_method)
       ActiveMerchant::Billing::Gateway.logger = Rails.logger if payment_method.mode.to_s == 'test'
 
-      ActiveMerchant::Billing::AuthorizeNetGateway.new( payment_method.credentials )
+      ActiveMerchant::Billing::AuthorizeNetGateway.new payment_method.credentials
     end
   end
 end

data/lib/nimbleshop_authorizedotnet/processor.rb

@@ -4,10 +4,13 @@ module NimbleshopAuthorizedotnet
     attr_reader :order, :payment_method, :errors, :gateway
 
     def initialize(options)
+      options.symbolize_keys!
+      options.assert_valid_keys :order, :payment_method
+
       @errors = []
-      @order = options.fetch(:order)
-      @payment_method = options.fetch(:payment_method)
-      @gateway = ::NimbleshopAuthorizedotnet::Gateway.instance(payment_method)
+      @order = options.fetch :order
+      @payment_method = options.fetch :payment_method
+      @gateway = ::NimbleshopAuthorizedotnet::Gateway.instance payment_method
     end
 
     private
@@ -27,9 +30,9 @@ module NimbleshopAuthorizedotnet
     #
     def do_authorize(options = {})
       options.symbolize_keys!
-      options.assert_valid_keys(:creditcard)
+      options.assert_valid_keys :creditcard
 
-      creditcard = options[:creditcard]
+      creditcard = options.fetch :creditcard
 
       unless valid_card?(creditcard)
         @errors.push(*creditcard.errors.full_messages)
@@ -37,17 +40,24 @@ module NimbleshopAuthorizedotnet
       end
 
       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?
+        recorder = ::Nimbleshop::PaymentTransactionRecorder.new(order: order,
+                                                                response: response,
+                                                                operation: :authorized,
+                                                                transaction_gid: get_transaction_gid(response),
+                                                                metadata: { card_number: creditcard.display_number, cardtype: creditcard.cardtype})
+        recorder.record
         order.update_attributes(payment_method: payment_method)
         order.authorize
       else
         @errors << 'Credit card was declined. Please try again!'
-        return false
       end
+
+      response.success?
     end
 
+
     # Creates purchase for the order amount.
     #
     # === Options
@@ -59,9 +69,9 @@ module NimbleshopAuthorizedotnet
     #
     def do_purchase(options = {})
       options.symbolize_keys!
-      options.assert_valid_keys(:creditcard)
+      options.assert_valid_keys :creditcard
 
-      creditcard = options[:creditcard]
+      creditcard = options.fetch :creditcard
 
       unless valid_card?(creditcard)
         @errors.push(*creditcard.errors.full_messages)
@@ -69,15 +79,22 @@ module NimbleshopAuthorizedotnet
       end
 
       response = gateway.purchase(order.total_amount_in_cents, creditcard)
-      record_transaction(response, 'purchased', card_number: creditcard.display_number, cardtype: creditcard.cardtype)
 
       if response.success?
+        recorder = ::Nimbleshop::PaymentTransactionRecorder.new(order: order,
+                                                                response: response,
+                                                                operation: :purchased,
+                                                                transaction_gid: get_transaction_gid(response),
+                                                                metadata: { card_number: creditcard.display_number, cardtype: creditcard.cardtype})
+        recorder.record
+
         order.update_attributes(payment_method: payment_method)
         order.purchase
       else
         @errors << 'Credit card was declined. Please try again!'
-        return false
       end
+
+      response.success?
     end
 
     # Captures the previously authorized transaction.
@@ -91,21 +108,26 @@ module NimbleshopAuthorizedotnet
     #
     def do_kapture(options = {})
       options.symbolize_keys!
-      options.assert_valid_keys(:transaction_gid)
-      tsx_id = options[:transaction_gid]
+      options.assert_valid_keys :transaction_gid
+      transaction_gid = options.fetch :transaction_gid
+      payment_transaction = PaymentTransaction.find_by_transaction_gid! transaction_gid
 
-      response = gateway.capture(order.total_amount_in_cents, tsx_id, {})
-
-      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])
+      response = gateway.capture(order.total_amount_in_cents, transaction_gid, {})
 
       if response.success?
+        recorder = ::Nimbleshop::PaymentTransactionRecorder.new(order: order,
+                                                                response: response,
+                                                                operation: :captured,
+                                                                transaction_gid: get_transaction_gid(response),
+                                                                metadata: { card_number: payment_transaction.metadata[:card_number],
+                                                                            cardtype: payment_transaction.metadata[:cardtype]})
+        recorder.record
         order.kapture
       else
-        @errors << "Capture request failed"
-        false
+        @errors << "Capture operation failed"
       end
+
+      response.success?
     end
 
     # Voids the previously authorized transaction.
@@ -119,18 +141,23 @@ module NimbleshopAuthorizedotnet
     #
     def do_void(options = {})
       options.symbolize_keys!
-      options.assert_valid_keys(:transaction_gid)
-      transaction_gid = options[:transaction_gid]
+      options.assert_valid_keys :transaction_gid
+      transaction_gid = options.fetch :transaction_gid
 
       response = gateway.void(transaction_gid, {})
-      record_transaction(response, 'voided')
 
       if response.success?
+        recorder = ::Nimbleshop::PaymentTransactionRecorder.new(order: order,
+                                                                response: response,
+                                                                operation: :voided,
+                                                                transaction_gid: get_transaction_gid(response))
+        recorder.record
         order.void
       else
         @errors << "Void operation failed"
-        false
       end
+
+      response.success?
     end
 
     # Refunds the given transaction.
@@ -144,49 +171,39 @@ module NimbleshopAuthorizedotnet
     #
     def do_refund(options = {})
       options.symbolize_keys!
-      options.assert_valid_keys(:transaction_gid, :card_number)
+      options.assert_valid_keys :transaction_gid, :card_number
 
-      transaction_gid      = options[:transaction_gid]
-      card_number = options[:card_number]
+      transaction_gid      = options.fetch :transaction_gid
+      card_number = options.fetch :card_number
 
       response = gateway.refund(order.total_amount_in_cents, transaction_gid, card_number: card_number)
-      record_transaction(response, 'refunded')
 
       if response.success?
+        recorder = ::Nimbleshop::PaymentTransactionRecorder.new(order: order,
+                                                                response: response,
+                                                                operation: :refunded,
+                                                                transaction_gid: get_transaction_gid(response))
+        recorder.record
         order.refund
       else
         @errors << "Refund failed"
-        false
-      end
-
-    end
-
-    def record_transaction(response, operation, additional_options = {}) # :nodoc:
-      #
-      # Following code invokes response.authorization to get transaction id. Note that this method can be called
-      # after capture or refund. And it feels weird to call +authorization+ when the operation was +capture+.
-      # However this is how ActiveMerchant works. It sets transaction id in +authorization+ key.
-      #
-      # https://github.com/Shopify/active_merchant/blob/master/lib/active_merchant/billing/gateways/authorize_net.rb#L283
-      #
-      transaction_gid = response.authorization
-
-      options = { operation:          operation,
-                  params:             response.params,
-                  success:            response.success?,
-                  metadata:           additional_options,
-                  transaction_gid:    transaction_gid }
-
-      if response.success?
-        options.update(amount: order.total_amount_in_cents)
       end
 
-      order.payment_transactions.create(options)
+      response.success?
     end
 
     def valid_card?(creditcard) # :nodoc:
       creditcard && creditcard.valid?
     end
 
+    # Following code invokes response.authorization to get transaction id. Note that this method can be called
+    # after capture or refund. And it feels weird to call +authorization+ when the operation was +capture+.
+    # However this is how ActiveMerchant works. It sets transaction id in +authorization+ key.
+    #
+    # https://github.com/Shopify/active_merchant/blob/master/lib/active_merchant/billing/gateways/authorize_net.rb#L283
+    def get_transaction_gid(response)
+      response.authorization
+    end
+
   end
 end

data/lib/tasks/nimbleshop_authorizedotnet_tasks.rake

@@ -14,18 +14,18 @@ namespace :nimbleshop_authorizedotnet do
   task :load_record => :environment do
 
     if NimbleshopAuthorizedotnet::Authorizedotnet.find_by_permalink('authorizedotnet')
-      puts "Authorize.net record already exists"
+      Rails.logger.debug 'Authorize.net record already exists'
     else
       NimbleshopAuthorizedotnet::Authorizedotnet.create!(
         {
-          login_id: Nimbleshop.config.authorizedotnet.login_id,
+          api_login_id: Nimbleshop.config.authorizedotnet.api_login_id,
           transaction_key: Nimbleshop.config.authorizedotnet.transaction_key,
           business_name: 'Nimbleshop LLC',
           name: 'Authorize.net',
           permalink: 'authorizedotnet',
           description: %Q[<p> Authorize.Net is a payment gateway service provider allowing merchants to accept credit card and electronic checks paymentsn. Authorize.Net claims a user base of over 305,000 merchants, which would make them the Internet's largest payment gateway service provider.  </p> <p> It also provides an instant test account which you can use while your application is being processed.  </p>]
         })
-        puts "Authorize.net record was successfuly created"
+        Rails.logger.debug 'Authorize.net record was successfuly created'
     end
   end
 end

data/test/test_helper.rb

@@ -20,7 +20,9 @@ class ActiveSupport::TestCase
   self.use_transactional_fixtures = false
   setup do
     DatabaseCleaner.start
-    ActiveRecord::Fixtures.create_fixtures("#{File.dirname(__FILE__)}/../../../nimbleshop_core/test/fixtures", ['shops', 'link_groups', 'payment_methods'])
+    ActiveRecord::Fixtures.create_fixtures("#{File.dirname(__FILE__)}/../../../nimbleshop_core/test/fixtures", ['shops',
+                                                                                                                'link_groups',
+                                                                                                                'payment_methods'])
   end
   teardown do
     DatabaseCleaner.clean

data/test/unit/payment_method_test.rb

@@ -5,33 +5,28 @@ class PaymentMethodAuthorizeNetTest < ActiveSupport::TestCase
   test "validations" do
     pm = NimbleshopAuthorizedotnet::Authorizedotnet.new(name: 'Authorize.net', description: 'this is description')
     refute pm.valid?
-    expected = ["Business name can't be blank", "Login can't be blank", "Transaction key can't be blank"]
-    assert_equal expected, pm.errors.full_messages.sort
+    expected = ["Business name can't be blank", "Api Login Id can't be blank", "Transaction key can't be blank"]
+    assert_equal expected.sort, pm.errors.full_messages.sort
   end
 
   test "should save the record" do
     pm = NimbleshopAuthorizedotnet::Authorizedotnet.new(name: 'Authorize.net', description: 'this is description')
-    pm.login_id = 'FWERSDEED093d'
+    pm.api_login_id = 'FWERSDEED093d'
     pm.transaction_key = 'SDFSDFSFSF423433SDFSFSSFSFSF334'
     pm.business_name = 'BigBinary LLC'
     assert pm.save
     assert_match /authorize-net/, pm.permalink
   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)
+
+    playcasette('authorize.net/capture-success') do
+      NimbleshopAuthorizedotnet::Authorizedotnet.first.kapture!(order, NimbleshopAuthorizedotnet::Processor)
+    end
+
     assert_equal 'purchased', order.payment_status
   end
 end

data/test/unit/processor_test.rb

@@ -1,16 +1,18 @@
 require 'test_helper'
 
 module Processor
+
   class NimbleshopAuthorizeNetAuthorizeTest < ActiveRecord::TestCase
     setup do
       payment_method     = NimbleshopAuthorizedotnet::Authorizedotnet.first
-      @order = create(:order)
+      @order = create :order
       @order.stubs(:total_amount).returns(100.48)
       @processor = NimbleshopAuthorizedotnet::Processor.new(order: @order, payment_method: payment_method)
     end
 
     test 'when authorization succeeds' do
-      creditcard = build(:creditcard)
+      creditcard = build :creditcard
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/authorize-success') do
         assert_equal true, @processor.authorize(creditcard: creditcard)
@@ -20,13 +22,16 @@ module Processor
 
       transaction = @order.payment_transactions.last
       assert_equal 'authorized', transaction.operation
-      assert_equal true, transaction.success
       assert_equal NimbleshopAuthorizedotnet::Authorizedotnet.first, @order.payment_method
       assert       @order.authorized?
+      assert_equal 'visa', transaction.metadata[:cardtype]
+      assert_equal transactions_count + 1, @order.payment_transactions.count
     end
 
     test 'authorization fails when credit card number is not entered' do
       creditcard = build(:creditcard, number: nil)
+      transactions_count = @order.payment_transactions.count
+
       assert_equal false, @processor.authorize(creditcard: creditcard)
       assert_equal 'Please enter credit card number', @processor.errors.first
 
@@ -34,10 +39,12 @@ module Processor
 
       assert_nil    @order.payment_method
       assert        @order.abandoned?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
 
     test 'authorization fails with invalid credit card number' do
       creditcard = build(:creditcard, number: 2)
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/authorize-failure') do
         assert_equal false, @processor.authorize(creditcard: creditcard)
@@ -48,6 +55,7 @@ module Processor
 
       assert_nil    @order.payment_method
       assert        @order.abandoned?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
   end
 
@@ -57,7 +65,7 @@ module Processor
       @order     = create(:order, payment_method: payment_method)
       @order.stubs(:total_amount).returns(100.48)
       @processor = NimbleshopAuthorizedotnet::Processor.new(order: @order, payment_method: payment_method)
-      creditcard = build(:creditcard)
+      creditcard = build :creditcard
 
       playcasette('authorize.net/authorize-success') do
         @processor.authorize(creditcard: creditcard)
@@ -67,7 +75,8 @@ module Processor
     end
 
     test 'when capture succeeds' do
-      creditcard = build(:creditcard)
+      creditcard = build :creditcard
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/capture-success') do
         assert_equal true, @processor.kapture(transaction_gid: @tsx_id)
@@ -76,27 +85,25 @@ module Processor
       @order.reload
       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?
+      assert_equal transactions_count + 1, @order.payment_transactions.count
     end
 
     test 'when capture fails' do
       creditcard = build(:creditcard, number: 2)
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/capture-failure') do
         assert_equal false, @processor.kapture(transaction_gid: @tsx_id)
-        assert_equal 'Capture request failed', @processor.errors.first
+        assert_equal 'Capture operation failed', @processor.errors.first
       end
 
       @order.reload
 
-      transaction = @order.payment_transactions.last
-
-      assert_equal false, transaction.success
-      assert_equal 'captured', transaction.operation
       assert       @order.authorized?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
   end
 
@@ -118,6 +125,7 @@ module Processor
     end
 
     test 'when refund succeeds' do
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/refund-success') do
         assert_equal true, @processor.refund(transaction_gid:   @transaction.transaction_gid,
@@ -128,12 +136,13 @@ module Processor
       transaction = @order.payment_transactions.last
 
       assert_equal  'refunded', transaction.operation
-      assert_equal  true, transaction.success
       assert_equal  NimbleshopAuthorizedotnet::Authorizedotnet.first, @order.payment_method
       assert        @order.refunded?
+      assert_equal transactions_count + 1, @order.payment_transactions.count
     end
 
     test 'when refund fails' do
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/refund-failure') do
         assert_equal false, @processor.refund(transaction_gid: @transaction.transaction_gid, card_number: '1234')
@@ -141,20 +150,18 @@ module Processor
 
       @order.reload
 
-      transaction = @order.payment_transactions.last
-
-      assert_equal 'refunded', transaction.operation
-      assert_equal false, transaction.success
+      assert        @order.purchased?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
   end
 
   class AuthorizeNetVoidTest < ActiveRecord::TestCase
     setup do
       payment_method     = NimbleshopAuthorizedotnet::Authorizedotnet.first
-      @order = create(:order)
+      @order = create :order
       @order.stubs(:total_amount).returns(100.48)
       @processor = NimbleshopAuthorizedotnet::Processor.new(order: @order, payment_method: payment_method)
-      creditcard = build(:creditcard)
+      creditcard = build :creditcard
 
       playcasette('authorize.net/authorize-success') do
         assert_equal true, @processor.authorize(creditcard: creditcard)
@@ -163,7 +170,9 @@ module Processor
       @tsx_id = @order.payment_transactions.last.transaction_gid
     end
 
-    test 'when capture succeeds' do
+    test 'when void succeeds' do
+      transactions_count = @order.payment_transactions.count
+
       playcasette('authorize.net/void-success') do
         assert_equal true, @processor.void(transaction_gid: @tsx_id)
       end
@@ -172,35 +181,35 @@ module Processor
       transaction = @order.payment_transactions.last
 
       assert_equal  'voided', transaction.operation
-      assert_equal  true, transaction.success
       assert_equal  NimbleshopAuthorizedotnet::Authorizedotnet.first, @order.payment_method
       assert        @order.voided?
+      assert_equal transactions_count + 1, @order.payment_transactions.count
     end
 
-    test 'when capture fails' do
+    test 'when void fails' do
+      transactions_count = @order.payment_transactions.count
+
       playcasette('authorize.net/void-failure') do
         assert_equal false, @processor.void(transaction_gid: @tsx_id)
       end
 
       @order.reload
-
-      transaction = @order.payment_transactions.last
-
-      assert_equal 'voided', transaction.operation
-      assert_equal false, transaction.success
+      assert        @order.authorized?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
   end
 
   class AuthorizeNetPurchaseTest < ActiveRecord::TestCase
     setup do
       payment_method     = NimbleshopAuthorizedotnet::Authorizedotnet.first
-      @order = create(:order)
+      @order = create :order
       @order.stubs(:total_amount).returns(100.48)
       @processor = NimbleshopAuthorizedotnet::Processor.new(order: @order, payment_method: payment_method)
     end
 
     test 'when purchase succeeds' do
-      creditcard = build(:creditcard)
+      creditcard = build :creditcard
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/purchase-success') do
         assert_equal true, @processor.purchase(creditcard: creditcard)
@@ -210,12 +219,13 @@ module Processor
 
       transaction = @order.payment_transactions.last
       assert_equal  'purchased', transaction.operation
-      assert_equal  true, transaction.success
       assert        @order.purchased?
+      assert_equal transactions_count + 1, @order.payment_transactions.count
     end
 
     test 'purchase fails when credit card number is not entered ' do
       creditcard = build(:creditcard, number: nil)
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/purchase-failure') do
         assert_equal false, @processor.purchase(creditcard: creditcard)
@@ -223,21 +233,20 @@ module Processor
       end
 
       assert       @order.abandoned?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
 
     test 'purchase fails when invalid credit card number is entered' do
       creditcard = build(:creditcard, number: 2)
+      transactions_count = @order.payment_transactions.count
 
       playcasette('authorize.net/purchase-failure') do
         assert_equal false, @processor.purchase(creditcard: creditcard)
         assert_equal 'Credit card was declined. Please try again!', @processor.errors.first
       end
 
-      transaction = @order.payment_transactions.last
-
-      assert_equal false, transaction.success
-      assert_equal 'purchased', transaction.operation
       assert       @order.abandoned?
+      assert_equal transactions_count, @order.payment_transactions.count
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbleshop_authorizedotnet
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -46,7 +46,6 @@ files:
 - app/helpers/nimbleshop_authorizedotnet/exposed_helper.rb
 - app/models/nimbleshop_authorizedotnet/authorizedotnet.rb
 - app/views/nimbleshop_authorizedotnet/authorizedotnets/_edit.html.erb
-- app/views/nimbleshop_authorizedotnet/authorizedotnets/_form.html.erb
 - app/views/nimbleshop_authorizedotnet/payments/_authorize_net_instructions.html.erb
 - app/views/nimbleshop_authorizedotnet/payments/_new.html.erb
 - app/views/nimbleshop_authorizedotnet/payments/_order_show_extra_info.html.erb
@@ -87,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 232971459225839706
+      hash: -3279639122130010380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 232971459225839706
+      hash: -3279639122130010380
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

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

@@ -1,67 +0,0 @@
-<div class='well nimbleshop-payment-method-form-well' id='nimbleshop-authorizedotnet-form-well' style='display:none;'>
-
-  <%= form_for NimbleshopAuthorizedotnet::Authorizedotnet.first,  url: '/nimbleshop_authorizedotnet/authorizedotnet',
-                                                      remote: true,
-                                                      html: { method: 'put',
-                                                              id: 'nimbleshop-authorizedotnet-form',
-                                                              class: 'nimbleshop-payment-method-form form-horizontal'} do |f| %>
-
-    <fieldset>
-      <div class='control-group'>
-        <%= f.label :login_id, nil, class: 'control-label' %>
-        <div class='controls'>
-          <%= f.text_field :login_id, class: 'span6' %>
-        </div>
-      </div>
-      <div class='control-group'>
-        <%= f.label :transaction_key, nil, class: 'control-label' %>
-        <div class='controls'>
-          <%= f.text_field :transaction_key, class: 'span6' %>
-        </div>
-      </div>
-
-      <div class='control-group'>
-        <%= f.label :business_name, nil, class: 'control-label' %>
-        <%= link_to '?', '#', 'data-content' => 'Please enter the name of the company as it would appear in the credit card statement. If are not sure what name would appear in the credit card statements then consult your merchant account provider.',
-                          'data-original-title' => 'Business name' %>
-        <div class='controls'>
-          <%= f.text_field :business_name, class: 'span6' %>
-        </div>
-      </div>
-
-      <div class='control-group'>
-        <div class='controls'>
-          <label class='checkbox'>
-            <%= f.check_box :mode, {}, 'test', 'production' %> Enable test mode
-            <%= link_to '?', '#', class: 'help', 'data-content' => 'In the test mode real credit card numbers are not accepted.',
-                              'data-original-title' => 'Test mode' %>
-          </label>
-        </div>
-      </div>
-
-      <div class='control-group'>
-        <div class='controls'>
-          <label class='checkbox'>
-            <%= f.check_box :ssl, {}, 'enabled', 'disabled' %> Enable SSL requirement
-            <%= link_to '?', '#', class: 'help', 'data-content' => 'Enabling SSL requirement will force the payment page to be on SSL.',
-                              'data-original-title' => 'SSL requirement' %>
-          </label>
-        </div>
-      </div>
-
-    </fieldset>
-
-    <div class='form-actions'>
-      <%= f.submit('Submit', class: 'btn btn-primary') %>
-      &nbsp;
-      <%= link_to t(:cancel), nimbleshop_authorizedotnet.authorizedotnet_path, class: 'cancel btn' %>
-    </div>
-  <% end %>
-
-</div>
-
-<style>
-  .control-group a.help {
-    float: none;
-  }
-</style>