spree_invoice 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,14 @@
1
+ Spree::Admin::GeneralSettingsController.class_eval do
2
+ def show
3
+ @preferences = ['site_name', 'default_seo_title', 'default_meta_keywords',
4
+ 'default_meta_description', 'site_url', 'invoice_seller_details']
5
+ end
6
+
7
+ def edit
8
+ @preferences = [:site_name, :default_seo_title, :default_meta_keywords,
9
+ :default_meta_description, :site_url, :allow_ssl_in_production,
10
+ :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
11
+ :check_for_spree_alerts, :invoice_on_confirm_email, :invoice_on_order_complete,
12
+ :invoice_seller_details]
13
+ end
14
+ end
@@ -1,7 +1,7 @@
1
1
  Spree::OrderMailer.class_eval do
2
2
 
3
3
  def confirm_email(order, resend = false)
4
- if Spree::Config[:on_confirm_email]
4
+ if Spree::Config[:invoice_on_confirm_email]
5
5
  inv_print = Spree::Invoice.find_or_create_by_oser_id_and_user_id(order.id, order.user_id)
6
6
  attachments["#{inv_print.invoice_number}.pdf"] = {
7
7
  :content => inv_print.generate_pdf,
@@ -1,3 +1,3 @@
1
1
  module SpreeInvoice
2
- VERSION = "1.2.0"
2
+ VERSION = "1.2.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_invoice
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2013-03-29 00:00:00.000000000 Z
14
+ date: 2013-04-15 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: spree_core
@@ -64,6 +64,7 @@ files:
64
64
  - lib/spree_invoice.rb
65
65
  - lib/tasks/spree_invoice.rake
66
66
  - app/assets/images/admin/icons/receipt.png
67
+ - app/controllers/spree/admin/general_settings_controller_decorator.rb
67
68
  - app/controllers/spree/invoice_controller.rb
68
69
  - app/mailers/spree/order_mailer_decorator.rb
69
70
  - app/models/spree/app_configuration_decorator.rb