volume pricing added paypal fix

.gitignore

@@ -15,3 +15,5 @@
 /tmp
 
 /config/database.yml
+
+public/spree/*

Gemfile

@@ -48,10 +48,10 @@ gem 'i18n'
 gem 'spree'
 gem 'spree_auth'
 gem "spree_social" , :git => "git://github.com/spree/spree_social.git"
-gem "spree_paypal_express", :git => "git://github.com/spree/spree_paypal_express.git"
+gem "spree_paypal_express", :github => "erikkallen/spree_paypal_express", branch: "patch-1"
 #gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise"
 #gem 'spree_usa_epay'
 #gem 'spree_skrill'
 gem "spree_address_book", :github => "erikkallen/spree_address_book"
-#gem "spree_volume_pricing", :github => "spree/spree_volume_pricing"
+gem "spree_volume_pricing", :github => "erikkallen/spree_volume_pricing", branch: "patch-1"
 #gem "spree_address_book", :path => "vendor/spree_address_book"

Gemfile.lock

@@ -7,13 +7,22 @@ GIT
       spree_core (~> 1.0)
 
 GIT
-  remote: git://github.com/spree/spree_paypal_express.git
-  revision: b06a083c55c8e52a0dd3d9bbce384559a65c3af3
+  remote: git://github.com/erikkallen/spree_paypal_express.git
+  revision: ff84f0b9281cdb2fe942f5b7c02aa479b96b087d
+  branch: patch-1
   specs:
     spree_paypal_express (1.1.0)
       spree_auth (>= 1.0.0)
       spree_core (>= 1.0.0)
 
+GIT
+  remote: git://github.com/erikkallen/spree_volume_pricing.git
+  revision: a32577218f92022e790844d7f7605a83d97b9d8b
+  branch: patch-1
+  specs:
+    spree_volume_pricing (3.2.0)
+      spree_core (~> 1.1)
+
 GIT
   remote: git://github.com/spree/spree_social.git
   revision: 0bce4d6fc377307ac455add98901a07065140f97
@@ -284,6 +293,7 @@ DEPENDENCIES
   spree_auth
   spree_paypal_express!
   spree_social!
+  spree_volume_pricing!
   sqlite3
   uglifier (>= 1.0.3)
   unicorn

app/overrides/product_show_override.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path  => "spree/products/show",
+                     :insert_before => "div#product-description",
+                     :partial          => "shared/volume_pricing",
+                     :name          => "volume_pricing")

app/views/shared/_volume_pricing.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'spree/products/volume_pricing', :locals => { :product => @product } %>

db/migrate/20120815205141_create_volume_prices.spree_volume_pricing.rb

@@ -0,0 +1,17 @@
+# This migration comes from spree_volume_pricing (originally 20081119145604)
+class CreateVolumePrices < ActiveRecord::Migration
+  def self.up
+    create_table :volume_prices do |t|
+      t.references :variant
+      t.string :display
+      t.string :range
+      t.decimal :amount, :precision => 8, :scale => 2
+      t.integer :position
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :volume_prices
+  end
+end

db/migrate/20120815205142_change_display_name_for_volume_prices.spree_volume_pricing.rb

@@ -0,0 +1,10 @@
+# This migration comes from spree_volume_pricing (originally 20110203174010)
+class ChangeDisplayNameForVolumePrices < ActiveRecord::Migration
+  def self.up
+    rename_column :volume_prices, :display, :name
+  end
+
+  def self.down
+    rename_column :volume_prices, :name, :display
+  end
+end

db/migrate/20120815205143_prefix_table_names.spree_volume_pricing.rb

@@ -0,0 +1,7 @@
+# This migration comes from spree_volume_pricing (originally 20111206173307)
+class PrefixTableNames < ActiveRecord::Migration
+  def change
+    rename_table :volume_prices, :spree_volume_prices
+  end
+end
+

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120815180246) do
+ActiveRecord::Schema.define(:version => 20120815205143) do
 
   create_table "coupons", :force => true do |t|
     t.string   "code"
@@ -583,6 +583,16 @@
 
   add_index "spree_variants", ["product_id"], :name => "index_variants_on_product_id"
 
+  create_table "spree_volume_prices", :force => true do |t|
+    t.integer  "variant_id"
+    t.string   "name"
+    t.string   "range"
+    t.decimal  "amount",     :precision => 8, :scale => 2
+    t.integer  "position"
+    t.datetime "created_at",                               :null => false
+    t.datetime "updated_at",                               :null => false
+  end
+
   create_table "spree_zone_members", :force => true do |t|
     t.integer  "zoneable_id"
     t.string   "zoneable_type"