tb_checkout 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb3fc1ae37d51e94af4338396c822e2d1392a17e
-  data.tar.gz: 99c1376aef1929a46b5164a870d3b2b84e560236
+  metadata.gz: c5d9b2cc2e634754b468bb4fd031d82d7f903332
+  data.tar.gz: 8e88348699acf8e4d8aa2ad27afb6f8f123969df
 SHA512:
-  metadata.gz: 6f7d66476d2a23b70f1a0feaa2671ce1f6c25138509da0eb54c0a4de9a8811353d58dfc3cdccabfc6463dbd901d345b94dfff94a5a18a744822b8c0abba2a628
-  data.tar.gz: 1cfe8609867ef781b1bb6894f4a476bba0991c828cffbce5208964a1f63b2a95b0e5ad46ec3294c15e8fff70776620d22cc6b46e66255dddba61b69a55520b10
+  metadata.gz: 9c776ebaa8d81fa3d82a1f13a58a1d2f1246442712ac55a59b527686bc3e6b1addf66dd519b78b312dfc515dea13b4cc4966886581bbf569169e5bfc9fc80966
+  data.tar.gz: cf4bb9f72a253f3430ac6ab3de8e7896dbee3591cab4743f44409882a836e4bb580708c5a6987cd78c7f5ab5bf6a1bdb06592abcb52f4a818cad4872ffbb95a5

data/app/controllers/tb_checkout/transactions_controller.rb

@@ -26,8 +26,9 @@ class TbCheckout::TransactionsController < TbCheckout::ApplicationController
   def create
     @transaction = @cart.transactions.new(transaction_params)
     @transaction.session_id = session.id
-    if @transaction.save() && @transaction.authorize!
-      redirect_to confirm_tb_checkout_transaction_path(@transaction)
+    if @transaction.save() && @transaction.capture!
+      flash[:notice] = 'Thanks! Your payment was collected successfully'
+      redirect_to tb_checkout_transaction_path(@transaction)
     else
       if @transaction.response
         flash.now[:error] = @transaction.response.message
@@ -39,31 +40,6 @@ class TbCheckout::TransactionsController < TbCheckout::ApplicationController
     end
   end
 
-  def confirm
-    @transaction = @cart.transactions.authorized.where(:id => params[:id]).first
-    if @transaction.blank?
-      redirect_to new_tb_checkout_transaction_path
-    else
-      render 'confirm'
-    end
-  end
-
-  def capture
-    @transaction = @cart.transactions.authorized.where(:id => params[:id]).first
-    if @transaction.blank?
-      redirect_to new_tb_checkout_transaction_path
-      return false
-    else
-      if @transaction.capture!
-        flash[:notice] = 'Thanks! Your payment was collected successfully'
-        redirect_to tb_checkout_transaction_path(@transaction)
-      else
-        flash.now[:error] = @transaction.response.message if @transaction.response
-        render 'confirm'
-      end
-    end
-  end
-
   def show
     @transaction = TbCheckout::Transaction.captured.find_by(:id => params[:id])
     if @transaction.present? && @transaction.belongs_to?(user_id:current_user_id, session_id:session.id)

data/app/models/tb_checkout/transaction.rb

@@ -48,20 +48,8 @@ module TbCheckout
     #
     # * The transaction must be in PENDING state in order ot take this action
     def authorize!
-      self.with_lock(true) do
-        if self.status != Status::PENDING
-          raise StandardError, 'Payment must be in Pending state before authorization'
-        end
-        @response = TbCheckout.gateway.authorize(amount_in_cents, build_credit_card(), build_purchase_options())
-        if @response.success?
-          self.update_columns(:status => Status::AUTHORIZED, :gateway_transaction_id => @response.params['transaction_id'], :response_text => @response.to_json)
-          return true
-        else
-          self.update_columns(:status => Status::FAIL, :response_text => @response.to_json)
-          logger.fatal @response.inspect
-          return false
-        end
-      end
+      ActiveSupport::Deprecation.warn 'TbCheckout::Transaction#authorize! is deprecated and will be removed. Call capture! instead.', caller
+      return true
     end
 
     # Capture the funds from an authorized transaction through the payment gateway
@@ -69,11 +57,11 @@ module TbCheckout
     # * The transaction must be in AUTHORIZED state in order ot take this action
     def capture!
       self.with_lock(true) do
-        if self.status != Status::AUTHORIZED
-          raise StandardError, 'Payment must be in Authorized state before capture'
+        if self.status != Status::PENDING
+          raise StandardError, 'Payment must be in Pending state before capture'
         end
-        @response = TbCheckout.gateway.capture(amount_in_cents, self.gateway_transaction_id.to_s)
-        if @response.success? || @response.params['action'] == 'PRIOR_AUTH_CAPTURE'
+        @response = TbCheckout.gateway.purchase(amount_in_cents, build_credit_card(), build_purchase_options())
+        if @response.success?
           self.update_columns(:status => Status::CAPTURED, :response_text => @response.to_json)
         else
           self.update_columns(:status => Status::FAIL, :response_text => @response.to_json)

data/app/views/tb_checkout/transactions/new.html.erb

@@ -80,7 +80,7 @@
 
   <div class="form-group form-actions">
     <div class="col-sm-offset-2 col-sm-10">
-      <%= f.submit 'Submit', :class => 'btn btn-primary' %>
+      <%= f.submit 'Submit', :class => 'btn btn-primary', :data => {:disable_with => 'Please wait...'} %>
       <%= link_to 'Back', tb_checkout_cart_path, :class => 'btn btn-default' %>
     </div>
   </div>

data/config/routes.rb

@@ -6,10 +6,7 @@ Rails.application.routes.draw do
     resources :cart_items, :only => [:create, :update, :destroy]
 
     resources :transactions, :path => 'orders', :only => [:index, :show]
-    resources :transactions, :path => 'checkout', :only => [:new, :create], :path_names => {:new => '/'} do
-      get :confirm, :on => :member
-      patch :capture, :on => :member
-    end
+    resources :transactions, :path => 'checkout', :only => [:new, :create], :path_names => {:new => '/'}
 
     namespace :admin do
       resources :carts, :only => [:index, :show]

data/lib/tb_checkout/version.rb

@@ -1,3 +1,3 @@
 module TbCheckout
-  VERSION = "1.0.7"
+  VERSION = "1.1.0"
 end

data/spec/controllers/tb_checkout/transactions_controller_spec.rb

@@ -72,20 +72,6 @@ RSpec.describe TbCheckout::TransactionsController, :type => :controller do
         post :create, :tb_checkout_transaction => FactoryGirl.attributes_for(:tb_checkout_transaction)
         transaction = TbCheckout::Transaction.last
         expect(transaction).to_not eq(nil)
-        expect(response).to redirect_to(confirm_tb_checkout_transaction_path(transaction))
-      end
-
-      it "should render the confirmation page" do
-        transaction = FactoryGirl.create(:tb_checkout_transaction, :authorized, :cart => controller.tb_checkout_current_cart)
-        get :confirm, :id => transaction.id
-        expect(response).to be_success
-      end
-
-      it "should capture the transaction and redirect to the detail page" do
-        transaction = FactoryGirl.create(:tb_checkout_transaction, :authorized, :cart => controller.tb_checkout_current_cart)
-        patch :capture, :id => transaction.id
-        transaction.reload()
-        expect(transaction.status).to eq(TbCheckout::Transaction::Status::CAPTURED)
         expect(response).to redirect_to(tb_checkout_transaction_path(transaction))
       end
     end

data/spec/dummy/db/migrate/20160523163605_add_requires_password_change_to_spud_users.tb_core.rb

@@ -0,0 +1,6 @@
+# This migration comes from tb_core (originally 20150610143438)
+class AddRequiresPasswordChangeToSpudUsers < ActiveRecord::Migration
+  def change
+    add_column :spud_users, :requires_password_change, :boolean, :default => false
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140915234534) do
+ActiveRecord::Schema.define(version: 20160523163605) do
 
   create_table "spud_permissions", force: :cascade do |t|
     t.string   "name",       limit: 255, null: false
@@ -47,27 +47,28 @@ ActiveRecord::Schema.define(version: 20140915234534) do
   end
 
   create_table "spud_users", force: :cascade do |t|
-    t.string   "first_name",          limit: 255
-    t.string   "last_name",           limit: 255
-    t.boolean  "super_admin",         limit: 1
-    t.string   "login",               limit: 255,             null: false
-    t.string   "email",               limit: 255,             null: false
-    t.string   "crypted_password",    limit: 255,             null: false
-    t.string   "password_salt",       limit: 255,             null: false
-    t.string   "persistence_token",   limit: 255,             null: false
-    t.string   "single_access_token", limit: 255,             null: false
-    t.string   "perishable_token",    limit: 255,             null: false
-    t.integer  "login_count",         limit: 4,   default: 0, null: false
-    t.integer  "failed_login_count",  limit: 4,   default: 0, null: false
+    t.string   "first_name",               limit: 255
+    t.string   "last_name",                limit: 255
+    t.boolean  "super_admin"
+    t.string   "login",                    limit: 255,                 null: false
+    t.string   "email",                    limit: 255,                 null: false
+    t.string   "crypted_password",         limit: 255,                 null: false
+    t.string   "password_salt",            limit: 255,                 null: false
+    t.string   "persistence_token",        limit: 255,                 null: false
+    t.string   "single_access_token",      limit: 255,                 null: false
+    t.string   "perishable_token",         limit: 255,                 null: false
+    t.integer  "login_count",              limit: 4,   default: 0,     null: false
+    t.integer  "failed_login_count",       limit: 4,   default: 0,     null: false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
-    t.string   "current_login_ip",    limit: 255
-    t.string   "last_login_ip",       limit: 255
+    t.string   "current_login_ip",         limit: 255
+    t.string   "last_login_ip",            limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "time_zone",           limit: 255
-    t.integer  "spud_role_id",        limit: 4
+    t.string   "time_zone",                limit: 255
+    t.integer  "spud_role_id",             limit: 4
+    t.boolean  "requires_password_change",             default: false
   end
 
   add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree
@@ -98,8 +99,8 @@ ActiveRecord::Schema.define(version: 20140915234534) do
   create_table "tb_checkout_carts", force: :cascade do |t|
     t.integer  "spud_user_id", limit: 4
     t.string   "session_id",   limit: 32
-    t.boolean  "is_completed", limit: 1,  default: false
-    t.boolean  "is_abandoned", limit: 1,  default: false
+    t.boolean  "is_completed",            default: false
+    t.boolean  "is_abandoned",            default: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/spec/factories/tb_checkout_transactions.rb

@@ -29,11 +29,8 @@ FactoryGirl.define do
     billing_state "IN"
     billing_postal 46032
 
-    trait :authorized do
-        after(:create) { |t| t.authorize! }
-    end
     trait :captured do
-        after(:create) { |t| t.authorize! && t.capture! }
+        after(:create) { |t| t.capture! }
     end
   end
 end

data/spec/models/tb_checkout/transaction_spec.rb

@@ -4,4 +4,38 @@ RSpec.describe TbCheckout::Transaction, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
 
   it_behaves_like 'belongs_to_spud_user_session', :tb_checkout_transaction
+
+  let(:transaction) {
+    FactoryGirl.create(:tb_checkout_transaction)
+  }
+
+  describe '#capture' do
+    context 'when successful' do
+      it 'makes a purchase' do
+        expect {
+          transaction.capture!
+        }.to change(transaction, :status).to('captured')
+      end
+      it 'updates the cart' do
+        transaction.capture!
+        expect(transaction.cart.is_completed).to eq(true)
+      end
+    end
+  end
+
+  describe '#build_credit_card' do
+    it 'returns a credit card' do
+      result = transaction.send(:build_credit_card)
+      expect(result).to be_a(ActiveMerchant::Billing::CreditCard)
+      expect(result.first_name).to eq(transaction.billing_first_name)
+    end
+  end
+
+  describe '#build_purchase_options' do
+    it 'returns some options' do
+      result = transaction.send(:build_purchase_options)
+      expect(result).to be_a(Hash)
+      expect(result[:email]).to eq(transaction.cart.spud_user.email)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_checkout
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tb_core
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
 description: TB Checkout is a shopping cart and payments system designed for use with
   Twice Baked and Active Merchant
 email:
-- greg@westlakedesign.com
+- greg.woods@moserit.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -161,7 +161,6 @@ files:
 - app/views/tb_checkout/carts/_cart.html.erb
 - app/views/tb_checkout/carts/show.html.erb
 - app/views/tb_checkout/transactions/_details.html.erb
-- app/views/tb_checkout/transactions/confirm.html.erb
 - app/views/tb_checkout/transactions/index.html.erb
 - app/views/tb_checkout/transactions/new.html.erb
 - app/views/tb_checkout/transactions/show.html.erb
@@ -224,6 +223,7 @@ files:
 - spec/dummy/db/migrate/20140915202270_create_tb_checkout_transactions.tb_checkout_engine.rb
 - spec/dummy/db/migrate/20140915202271_create_tb_checkout_basic_products.tb_checkout_engine.rb
 - spec/dummy/db/migrate/20140915234534_add_spud_user_and_session_id_to_transactions.tb_checkout_engine.rb
+- spec/dummy/db/migrate/20160523163605_add_requires_password_change_to_spud_users.tb_core.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -237,7 +237,7 @@ files:
 - spec/models/tb_checkout/transaction_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-homepage: http://bitbucket.org/westlakedesign/tb_checkout
+homepage: http://bitbucket.org/moser-inc/tb_checkout
 licenses:
 - MIT
 metadata: {}
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple shopping cart and checkout system for Twice Baked
@@ -306,6 +306,7 @@ test_files:
 - spec/dummy/db/migrate/20140915202270_create_tb_checkout_transactions.tb_checkout_engine.rb
 - spec/dummy/db/migrate/20140915202271_create_tb_checkout_basic_products.tb_checkout_engine.rb
 - spec/dummy/db/migrate/20140915234534_add_spud_user_and_session_id_to_transactions.tb_checkout_engine.rb
+- spec/dummy/db/migrate/20160523163605_add_requires_password_change_to_spud_users.tb_core.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

data/app/views/tb_checkout/transactions/confirm.html.erb

@@ -1,11 +0,0 @@
-<h1>Confirm Payment</h1>
-
-<p>Click "Confirm" below to finish your transaction.</p>
-
-<% cache [@transaction, 'details'] do %>
-  <%= render 'details' %>
-<% end %>
-
-<%= form_for [:capture, @transaction] do |f| %>
-  <%= f.submit 'Confirm', :class => 'btn btn-primary' %>
-<% end %>