spree_invoice 1.1.1 → 1.1.2

data/README.md

@@ -8,7 +8,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_invoice', '~> 1.1.0'
+  gem 'spree_invoice', '~> 1.1.2'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

data/app/controllers/spree/invoice_controller.rb

@@ -1,11 +1,11 @@
 module Spree
   class InvoiceController < BaseController
-
+    
     def show
-      order_id = params[:order_id].to_i
-      @order = Order.find_by_id(order_id)
+      @order = Order.find_by_id(params[:order_id])
+      @order.create_invoice(:user => @order.user)
       @address = @order.bill_address
-      @invoice_print = current_user.has_role?(:admin) ? Spree::Invoice.find_or_create_by_order_id({:order_id => order_id, :user_id => @order ? @order.user_id : nil}) : current_user.invoices.find_or_create_by_order_id(order_id)
+      @invoice_print = current_user.has_role?(:admin) ? Spree::Invoice.find_or_create_by_order_id({:order_id => @order.id, :user_id => @order ? @order.user_id : nil}) : current_user.invoices.find_or_create_by_order_id(@order.id)
       if @invoice_print
         respond_to do |format|
           format.pdf  { send_data @invoice_print.generate_pdf, :filename => "#{@invoice_print.invoice_number}.pdf", :type => 'application/pdf' }

data/app/models/spree/order_decorator.rb

@@ -1,11 +1,11 @@
 Spree::Order.class_eval do
   has_one :invoice, :dependent => :destroy
-  after_update :add_invoice
+  #after_update :add_invoice
 
   private
-  def add_invoice
+  #def add_invoice
   	# Only create an invoice if the order is completed!
   	# And only create it if there is no invoice yet.
-    self.create_invoice(user: user) if self.completed? && self.invoice.blank?
-  end
+  #  self.create_invoice(:user => user) if self.completed? && self.invoice.blank?
+  #end
 end

data/db/migrate/20120207124038_create_invoices.rb

@@ -8,10 +8,10 @@ class CreateInvoices < ActiveRecord::Migration
       
       t.timestamps
     end
-    add_index :spree_invoice, :invoice_number
+    add_index :spree_invoices, :invoice_number
   end
   
   def down
-    drop_table :spree_invoice
+    drop_table :spree_invoices
   end
 end

data/lib/spree_invoice/version.rb

@@ -1,3 +1,3 @@
 module SpreeInvoice
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/spree_invoice.rb

@@ -1,4 +1,5 @@
 require 'spree_core'
+require 'wicked_pdf'
 require 'spree_invoice/engine'
 
 module SpreeInvoice

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_invoice
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -45,22 +45,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem provides invoice pdf generation from a html template via wkhtmltopdf.
 email:
 - damiano.giacomello@diginess.it