From ba2fc9d8c754752a2c9f75a0969eba54946f7586 Mon Sep 17 00:00:00 2001 From: Bounmy Stephane Date: Mon, 9 Apr 2012 02:19:00 +0200 Subject: [PATCH] untrack gemfile.lock + fix spree namespacing model --- .gitignore | 1 + Gemfile.lock | 280 ------------------ .../spree/checkout_controller_decorator.rb | 4 +- 3 files changed, 3 insertions(+), 282 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index b7b3ee6..a37eaae 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ spec/test_app spec/dummy .rvmrc .bundle +Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index a1db1ee..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,280 +0,0 @@ -PATH - remote: . - specs: - spree_paypal_express (1.1.0) - spree_core (>= 1.0.0) - -PATH - remote: ../spree - specs: - spree (1.1.0.beta) - spree_api (= 1.1.0.beta) - spree_auth (= 1.1.0.beta) - spree_cmd (= 1.1.0.beta) - spree_core (= 1.1.0.beta) - spree_dash (= 1.1.0.beta) - spree_promo (= 1.1.0.beta) - spree_sample (= 1.1.0.beta) - spree_api (1.1.0.beta) - spree_auth (= 1.1.0.beta) - spree_core (= 1.1.0.beta) - spree_auth (1.1.0.beta) - cancan (= 1.6.7) - devise (~> 2.0) - spree_core (= 1.1.0.beta) - spree_cmd (1.1.0.beta) - rails (>= 3.1.1, <= 3.2.1) - spree_core (1.1.0.beta) - activemerchant (= 1.20.1) - acts_as_list (= 0.1.4) - deface (>= 0.7.2) - ffaker (~> 1.12.0) - highline (= 1.6.8) - jquery-rails (>= 1.0.19, <= 2.0.0) - kaminari (>= 0.13.0) - meta_search (= 1.1.2) - nested_set (= 1.6.8) - paperclip (= 2.5.0) - rails (>= 3.1.1, <= 3.2.1) - state_machine (= 1.1.2) - stringex (~> 1.3.0) - spree_dash (1.1.0.beta) - spree_core (= 1.1.0.beta) - spree_promo (1.1.0.beta) - spree_auth (= 1.1.0.beta) - spree_core (= 1.1.0.beta) - spree_sample (1.1.0.beta) - spree_core (= 1.1.0.beta) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.1.3) - actionpack (= 3.1.3) - mail (~> 2.3.0) - actionpack (3.1.3) - activemodel (= 3.1.3) - activesupport (= 3.1.3) - builder (~> 3.0.0) - erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.5) - rack-cache (~> 1.1) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.3) - active_utils (1.0.3) - activesupport (>= 2.3.11) - i18n - activemerchant (1.20.1) - active_utils (>= 1.0.1) - activesupport (>= 2.3.11) - braintree (>= 2.0.0) - builder (>= 2.0.0) - i18n - json (>= 1.5.1) - money (<= 3.7.1) - activemodel (3.1.3) - activesupport (= 3.1.3) - builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.3) - activemodel (= 3.1.3) - activesupport (= 3.1.3) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) - activeresource (3.1.3) - activemodel (= 3.1.3) - activesupport (= 3.1.3) - activesupport (3.1.3) - multi_json (~> 1.0) - acts_as_list (0.1.4) - addressable (2.2.6) - arel (2.2.3) - awesome_print (1.0.2) - bcrypt-ruby (3.0.1) - braintree (2.15.0) - builder (>= 2.0.0) - builder (3.0.0) - cancan (1.6.7) - capybara (1.1.2) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - selenium-webdriver (~> 2.0) - xpath (~> 0.1.4) - childprocess (0.3.1) - ffi (~> 1.0.6) - cocaine (0.2.1) - columnize (0.3.6) - cucumber (1.1.4) - builder (>= 2.1.2) - diff-lcs (>= 1.1.2) - gherkin (~> 2.7.1) - json (>= 1.4.6) - term-ansicolor (>= 1.0.6) - cucumber-rails (1.2.1) - capybara (>= 1.1.2) - cucumber (>= 1.1.3) - nokogiri (>= 1.5.0) - database_cleaner (0.5.2) - debugger (1.1.0) - columnize (>= 0.3.1) - debugger-linecache (~> 1.1) - debugger-ruby_core_source (~> 1.1) - debugger-linecache (1.1.1) - debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.1.1) - deface (0.8.0) - nokogiri (~> 1.5.0) - rails (>= 3.0.9) - devise (2.0.4) - bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) - railties (~> 3.1) - warden (~> 1.1.1) - diff-lcs (1.1.3) - erubis (2.7.0) - factory_girl (2.2.0) - activesupport - factory_girl_rails (1.3.0) - factory_girl (~> 2.2.0) - railties (>= 3.0.0) - faker (1.0.1) - i18n (~> 0.4) - ffaker (1.12.1) - ffi (1.0.11) - gherkin (2.7.7) - json (>= 1.4.6) - highline (1.6.8) - hike (1.2.1) - i18n (0.6.0) - jquery-rails (1.0.19) - railties (~> 3.0) - thor (~> 0.14) - json (1.6.5) - kaminari (0.13.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - railties (>= 3.0.0) - launchy (2.0.5) - addressable (~> 2.2.6) - mail (2.3.3) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - meta_search (1.1.2) - actionpack (~> 3.1) - activerecord (~> 3.1) - activesupport (~> 3.1) - meta_search - polyamorous (~> 0.5.0) - mime-types (1.17.2) - money (3.7.1) - i18n (~> 0.4) - multi_json (1.0.4) - nested_set (1.6.8) - activerecord (>= 3.0.0) - railties (>= 3.0.0) - nokogiri (1.5.0) - orm_adapter (0.0.7) - paperclip (2.5.0) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) - cocaine (>= 0.0.2) - mime-types - polyamorous (0.5.0) - activerecord (~> 3.0) - polyglot (0.3.3) - rack (1.3.6) - rack-cache (1.1) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.1.3) - actionmailer (= 3.1.3) - actionpack (= 3.1.3) - activerecord (= 3.1.3) - activeresource (= 3.1.3) - activesupport (= 3.1.3) - bundler (~> 1.0) - railties (= 3.1.3) - railties (3.1.3) - actionpack (= 3.1.3) - activesupport (= 3.1.3) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - rspec (2.7.0) - rspec-core (~> 2.7.0) - rspec-expectations (~> 2.7.0) - rspec-mocks (~> 2.7.0) - rspec-core (2.7.1) - rspec-expectations (2.7.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.7.0) - rspec-rails (2.7.0) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - rspec (~> 2.7.0) - rubyzip (0.9.6.1) - selenium-webdriver (2.19.0) - childprocess (>= 0.2.5) - ffi (~> 1.0.9) - multi_json (~> 1.0.4) - rubyzip - shoulda (2.11.3) - simplecov (0.5.4) - multi_json (~> 1.0.3) - simplecov-html (~> 0.5.3) - simplecov-html (0.5.3) - sprockets (2.0.3) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) - sqlite3-ruby (1.3.3) - sqlite3 (>= 1.3.3) - state_machine (1.1.2) - stringex (1.3.2) - term-ansicolor (1.0.7) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.33) - warden (1.1.1) - rack (>= 1.0) - xpath (0.1.4) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - awesome_print - capybara - cucumber-rails - database_cleaner (~> 0.5.2) - debugger - factory_girl_rails (= 1.3.0) - faker - launchy - nokogiri - rspec-rails (= 2.7.0) - shoulda - simplecov - spree! - spree_paypal_express! - sqlite3-ruby diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb index 40e0275..b4046e9 100644 --- a/app/controllers/spree/checkout_controller_decorator.rb +++ b/app/controllers/spree/checkout_controller_decorator.rb @@ -257,8 +257,8 @@ module Spree :custom => order.number, :items => items, :subtotal => ((order.item_total * 100) + credits_total).to_i, - :tax => ((order.adjustments.map { |a| a.amount if ( a.source_type == 'Order' && a.label == 'Tax') }.compact.sum) * 100 ).to_i, - :shipping => ((order.adjustments.map { |a| a.amount if a.source_type == 'Shipment' }.compact.sum) * 100 ).to_i, + :tax => ((order.adjustments.map { |a| a.amount if ( a.source_type == 'Spree::Order' && a.label == 'Tax') }.compact.sum) * 100 ).to_i, + :shipping => ((order.adjustments.map { |a| a.amount if a.source_type == 'Spree::Shipment' }.compact.sum) * 100 ).to_i, :money => (order.total * 100 ).to_i } # add correct tax amount by subtracting subtotal and shipping otherwise tax = 0 -> need to check adjustments.map