piggybak 0.6.7 → 0.6.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.7)
+    piggybak (0.6.8)
       activemerchant
       countries
       devise

data/README.md

@@ -65,8 +65,6 @@ TODO
 
 * Ensure that changes in nested addresses are recorded on order notes.
 
-* Add admin side validation to limit 1 payment at a time
-
 * Add/check validation to ensure sufficient inventory
 
 * Add copy from billing above shipping address section button in admin

data/app/models/piggybak/order.rb

@@ -18,6 +18,7 @@ module Piggybak
     validates_presence_of :status, :email, :phone, :total, :total_due, :created_at, :ip_address, :user_agent
 
     after_initialize :initialize_defaults
+    validate :number_payments
     before_save :postprocess_order, :update_status, :set_new_record
     after_save :record_order_note
 
@@ -43,6 +44,16 @@ module Piggybak
       self.disable_order_notes = false
     end
 
+    def number_payments
+      number_payments = self.line_items.select { |li| li.new_record? && li.line_item_type == "payment" }.size
+      if number_payments > 1
+        self.errors.add(:base, "Only one payment may be created at a time.")
+        self.line_items.select { |li| li.new_record? && li.line_item_type == "payment" }.each do |li|
+          li.errors.add(:line_item_type, "Only one payment may be created at a time.")
+        end
+      end
+    end
+
     def initialize_user(user, on_post)
       if user
         self.user = user

data/db/migrate/20120627144001_add_price_to_line_item.rb

@@ -1,6 +1,10 @@
 class AddPriceToLineItem < ActiveRecord::Migration
   def up
     add_column :line_items, :price, :decimal, :null => false, :default => 0.0
+    
+    change_table(:line_items) do |t|
+      t.timestamps
+    end
 
     Piggybak::LineItem.all.each do |line_item|
       line_item.update_attribute(:price, line_item.total/line_item.quantity)

data/db/migrate/20121008175144_line_item_rearchitecture.rb

@@ -5,9 +5,6 @@ class LineItemRearchitecture < ActiveRecord::Migration
     rename_column :line_items, :total, :price
     change_column :line_items, :sellable_id, :integer, :null => true
     add_column :line_items, :sort, :integer, :null => false, :default => 0
-    change_table(:line_items) do |t|
-      t.timestamps
-    end
 
     add_column :shipments, :line_item_id, :integer
     add_column :payments, :line_item_id, :integer

data/lib/piggybak/cli.rb

@@ -6,19 +6,31 @@ module Piggybak
   
     desc "install", "install and configure piggybak"
     def install
-      inject_devise
-      inject_rails_admin
-      run('bundle install')
+      if already_installed?
+        update
+      else        
+        inject_devise
+        inject_rails_admin
+        run('bundle install')
+        run('rake piggybak_engine:install:migrations')
+        run('rake db:migrate')   
+        run('rails generate devise:install')
+        run('rails generate devise User') 
+        run('rake db:migrate')      
+        run('rails g rails_admin:install')
+        run('rake db:migrate')      
+        mount_piggybak_route
+        add_javascript_include_tag
+        say_welcome
+      end
+    end
+    
+    desc "update", "update piggybak"
+    def update
+      say "Piggybak install detected"
+      say "Updating current Piggybak install"
       run('rake piggybak_engine:install:migrations')
-      run('rake db:migrate')   
-      run('rails generate devise:install')
-      run('rails generate devise User') 
-      run('rake db:migrate')      
-      run('rails g rails_admin:install')
-      run('rake db:migrate')      
-      mount_piggybak_route
-      add_javascript_include_tag
-      welcome
+      say_upgraded
     end
 
     desc "inject_devise", "add devise"
@@ -34,9 +46,9 @@ module Piggybak
       insert_into_file "Gemfile", "gem 'rails_admin'\n", :after => "gem 'devise'\n"
     end
   
-    desc "mount_piggybak_route", "mount piggbak route"
+    desc "mount_piggybak_route", "mount piggybak route"
     def mount_piggybak_route
-      insert_into_file "config/routes.rb", "\n  mount Piggybak::Engine => '/checkout', :as => 'piggybak'\n", :after => "Village::Application.routes.draw do\n"
+      insert_into_file "config/routes.rb", "\n  mount Piggybak::Engine => '/checkout', :as => 'piggybak'\n", :after => "Application.routes.draw do\n"
     end
   
     desc "add_javascript_include_tag", "add javascript include tag to application layout"
@@ -71,5 +83,24 @@ module Piggybak
       say "  acts_as_sellable"
       say "end"
     end
+    
+    desc "say_upgraded", "piggybak upgraded"
+    def say_upgraded
+      say ""
+      say ""
+      say ""
+      say "******************************************************************"
+      say "******************************************************************"
+      say "Piggybak Successfully Upgraded!"
+      say "******************************************************************"
+    end
+    
+    private
+    
+    def already_installed?
+      open('config/routes.rb') { |f| f.grep(/Piggybak\:\:Engine/) }.any?
+    end
+    
+    
   end
 end

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,7 +96,8 @@ dependencies:
 description: Mountable Ruby on Rails Ecommerce.
 email:
 - piggybak@endpoint.com
-executables: []
+executables:
+- piggybak
 extensions: []
 extra_rdoc_files: []
 files:
@@ -210,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 849133339479137075
+      hash: 3697325078829363009
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 849133339479137075
+      hash: 3697325078829363009
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23