spree_invoice 1.1.3 → 1.1.10

data/README.md

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

data/app/controllers/spree/invoice_controller.rb

@@ -1,15 +1,15 @@
 module Spree
   class InvoiceController < BaseController
-    
+
     def show
-      @order = Order.find_by_id(params[:order_id])
-      #@order.create_invoice(:user => @order.user)
+      order_id = params[:order_id].to_i
+      @order = Order.find_by_id(order_id)
       @address = @order.bill_address
-      @invoice_print = current_user.has_role?(:admin) ? Spree::Invoice.find_or_create_by_order_id_and_user_id(@order.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' }
-          format.html { render :file => Spree::Config[:invoice_template_path].to_s, :layout => false }
+          format.html { render :file => SpreeInvoice.invoice_template_path.to_s, :layout => false }
         end
       else
         if current_user.has_role?(:admin)

data/app/mailers/spree/order_mailer_decorator.rb

@@ -1,17 +1,18 @@
-Spree::OrderMailer.class_eval do
-  
-  def confirm_email(order, resend = false)
-    if Spree::Config[:on_confirm_email]
-      inv_print = Spree::Invoice.find_or_create_by_oser_id_and_user_id(order.id, order.user_id)
-      attachments["#{inv_print.invoice_number}.pdf"] = {
-        :content => inv_print.generate_pdf,
-        :mime_type => 'application/pdf'
-      } if inv_print
+module Spree
+  OrderMailer.class_eval do
+    
+    def confirm_email(order, resend = false)
+      if SpreeInvoice.on_confirm_email && !SpreeInvoice.except_payment.include?(order.payment_method.type)
+        inv_print = Spree::Invoice.find_or_create_by_order_id({:order_id => order.id, :user_id => order.user_id})
+        attachments["#{inv_print.invoice_number}.pdf"] = {
+          :content => inv_print.generate_pdf,
+          :mime_type => 'application/pdf'
+        } if inv_print
+      end
+      @order = order
+      subject = (resend ? "[#{t(:resend).upcase}] " : "")
+      subject += "#{Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
+      mail(:to => order.email, :subject => subject)
     end
-    @order = order
-    subject = (resend ? "[#{t(:resend).upcase}] " : '')
-    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{order.number}"
-    mail(:to => order.email,
-         :subject => subject)
   end
 end

data/app/models/spree/invoice.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :user
     belongs_to :order
     
-    before_validation :generate_invoice_number, :on => :create
+    before_create :generate_invoice_number
     
     scope :from_current_year, where(["created_at > ? AND created_at < ?", Time.now.at_beginning_of_year, Time.now.at_end_of_year])
     
@@ -12,20 +12,19 @@ module Spree
     def generate_pdf
       self.update_attribute(:counter, self.counter + 1)
       WickedPdf.new.pdf_from_string(
-        StaticRender.render_erb(Spree::Config[:invoice_template_path], {
+        StaticRender.render_erb(SpreeInvoice.invoice_template_path, {
           :@order => self.order,
           :@address => self.order.bill_address,
           :@invoice_print => self
         }), {
-          :margin => ActiveSupport::JSON.decode(Spree::Config[:invoice_wkhtmltopdf_margin])
+          :margin => SpreeInvoice.wkhtmltopdf_margin
         }
       )
     end
     
+    private
     def generate_invoice_number
-      last_record = self.class.from_current_year.size
-      new_record = "%04d" % (last_record + 1).to_s
-      self.invoice_number = "#{new_record}/A" if self.invoice_number.blank?
+      write_attribute(:invoice_number, SpreeInvoice.invoice_number_generation_method.call(Spree::Invoice.from_current_year.length + 1))
     end
   end
   

data/app/models/spree/order_decorator.rb

@@ -1,13 +1,11 @@
 Spree::Order.class_eval do
-  has_one :invoice
+  has_one :invoice, :dependent => :destroy
   after_update :add_invoice
 
   private
   def add_invoice
   	# Only create an invoice if the order is completed!
   	# And only create it if there is no invoice yet.
-  	if Spree::Config[:invoice_on_order_complete]
-      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/app/models/spree/user_decorator.rb

@@ -1,3 +1,3 @@
 Spree::User.class_eval do
-  has_many :invoices
+  has_many :invoice
 end

data/db/migrate/20120207124038_create_invoices.rb

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

data/lib/generators/spree_invoice/install/templates/initializer.rb

@@ -3,3 +3,28 @@ require 'wicked_pdf'
 WickedPdf.config = {
   :exe_path => SpreeInvoice::WKHTMLToPDF.bin_path
 }
+
+SpreeInvoice.setup do |config|
+  config.on_confirm_email = true
+  config.invoice_number_generation_method = lambda { |next_invoice_count|
+        number = "%04d" % next_invoice_count.to_s
+        "R-#{Time.now.year}-#{number}"
+  }
+  
+  config.invoice_template_path = "app/views/spree/invoices/invoice_template.html.erb"
+  config.except_payment = ['Spree::PaymentMethod::Check']
+  config.wkhtmltopdf_margin = {
+    :top    => 10,
+    :bottom => 10,
+    :left   => 15,
+    :right  => 15
+  }
+  config.invoice_seller_details = %Q|
+  Spree Demo
+  P.IVA: 12345678901
+  C.F.: 12345678901
+  Street Address, 12
+  00000 City (STATE)
+  |
+  config.invoice_seller_logo = Spree::Config[:admin_interface_logo]
+end

data/lib/generators/spree_invoice/install/templates/invoice_template.html.erb

@@ -8,10 +8,10 @@
 <body>
 	<div id="wrapper">
 		<div id="header">
-			<%= wicked_pdf_image_tag(Spree::Config[:invoice_seller_logo]) %>
+			<%= wicked_pdf_image_tag(SpreeInvoice.invoice_seller_logo) %>
 		</div>
 		<div id="content">
-			<%= Spree::Config[:invoice_seller_details].gsub("|", "<br />").html_safe %><br />
+			<%= SpreeInvoice.invoice_seller_details %><br />
 			<%= @order.id %>
 		</div>
 	</div>

data/lib/spree_invoice/version.rb

@@ -1,3 +1,3 @@
 module SpreeInvoice
-  VERSION = "1.1.3"
+  VERSION = "1.1.10"
 end

data/lib/spree_invoice.rb

@@ -1,3 +1,33 @@
 require 'spree_core'
-require 'wicked_pdf'
 require 'spree_invoice/engine'
+
+module SpreeInvoice
+  ## CONFIGURATION OPTIONS
+  mattr_accessor :on_confirm_email
+  @@on_confirm_email = true
+  
+  mattr_accessor :invoice_seller_details
+  @@invoice_seller_details = nil
+  
+  mattr_accessor :invoice_seller_logo
+  @@invoice_seller_logo = nil
+  
+  mattr_accessor :invoice_template_path
+  @@invoice_template_path = "app/views/spree/invoices/invoice_template.html.erb"
+  
+  mattr_accessor :except_payment
+  @@except_payment = ['Spree::PaymentMethod::Check']
+  
+  mattr_accessor :wkhtmltopdf_margin
+  @@wkhtmltopdf_margin = {:top    => 10, :bottom => 10, :left   => 15, :right  => 15}
+  
+  mattr_accessor :invoice_number_generation_method
+  @@invoice_number_generation_method = lambda { |next_invoice_count|
+        number = "%04d" % next_invoice_count.to_s
+        "R-#{Time.now.year}-#{number}"
+  }
+  
+  def self.setup
+    yield self
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_invoice
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,23 +28,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !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.9.4
+        version: '0'
 description: This gem provides invoice pdf generation from a html template via wkhtmltopdf.
 email:
 - damiano.giacomello@diginess.it
@@ -66,7 +82,6 @@ files:
 - app/assets/images/admin/icons/receipt.png
 - app/controllers/spree/invoice_controller.rb
 - app/mailers/spree/order_mailer_decorator.rb
-- app/models/spree/app_configuration_decorator.rb
 - app/models/spree/invoice.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/user_decorator.rb

data/app/models/spree/app_configuration_decorator.rb

@@ -1,26 +0,0 @@
-# This is the primary location for defining spree preferences
-#
-# The expectation is that this is created once and stored in
-# the spree environment
-#
-# setters:
-# a.color = :blue
-# a[:color] = :blue
-# a.set :color = :blue
-# a.preferred_color = :blue
-#
-# getters:
-# a.color
-# a[:color]
-# a.get :color
-# a.preferred_color
-#
-Spree::AppConfiguration.class_eval do
-  # Alphabetized to more easily lookup particular preferences
-  preference :invoice_on_confirm_email, :boolean, :default => false
-  preference :invoice_on_order_complete, :boolean, :default => false
-  preference :invoice_seller_logo, :string, :default => Spree::Config[:admin_interface_logo]
-  preference :invoice_template_path, :string, :default => "spree/invoices/invoice_template.html"
-  preference :invoice_wkhtmltopdf_margin, :string, :default => "{\"top\":\"10\",\"bottom\":\"10\",\"left\":\"15\",\"right\":\"15\"}"
-  preference :invoice_seller_details, :string, :default => "Spree Demo| P.IVA: 12345678901| C.F.: 12345678901| Street Address, 12| 00000 City (STATE)"
-end