ydim 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5799a076ddcb592dd3c58dcf3b66e1bb73d1fcd
-  data.tar.gz: f0652bdf5e23d2a58ed0f25bc89f8b5d243a0300
+  metadata.gz: 46e6d36c539ca68440088c2792c44d9b9915b27a
+  data.tar.gz: 2c8e5d48ea0acb9ee159f7e38929876dcb565b7b
 SHA512:
-  metadata.gz: 64014cab48920fcee5f11de39dd6cfc448219159f96da842a319b39de5a491c733e1df8b1a036adf5fce11644a0baf6315ba00e2d91cdbc76f95c5e5518e3945
-  data.tar.gz: 4f56513aab7e625450e0d1992e2fa4b5a81ba4b0823b4e339361a8c694a557499ba73efa91d7672fdba48d5d19205559e697c2e928041729c0eef14526c87b3e
+  metadata.gz: 1099d4d4da58ca3c7e9cdf86795f31757f925ea833e56b45005b792250657a8073d9f5bb3b2fef187012c98677c857f7c01ee2c2b486da4a50220fc8619ffb9c
+  data.tar.gz: d29c220a2628613cf5e4ac9c14ba572fffc4addc22f3640eecf1f138f05f77ebb1815db2ae7213d8e6e5843253eb5ad7b94ef19eb19a4622c28be661e5b8b887

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.8 / 09.01.2018
+
+* Replace config['tax'] by vat_rate
+* Fix loading config for sending mail
+
+
 === 1.0.7 / 08.01.2018
 
 * Fix loading the desired config early

data/lib/pdfinvoice/config.rb

@@ -31,7 +31,6 @@ module PdfInvoice
 			},
 			'logo_path'					=> nil,
 			'logo_link'					=> nil,
-			'tax'								=> 0,
 			'texts'							=> {
 				'date'						=> 'Date',	
 				'description'			=> 'Description',

data/lib/pdfinvoice/invoice.rb

@@ -116,7 +116,7 @@ module PdfInvoice
 				}
 				table.data = @items.collect { |line|
 					item_total = line.at(3).to_f * line.at(4).to_f
-          vat += line[5] || @config.tax.to_f * item_total
+          vat += line[5] || (@config.vat_rate.to_f * item_total / 100)
 					total += item_total
 					date = line.at(0).strftime(@config.formats['date'])
 					cw = pdf.text_width(date) * PDF::SimpleTable::WIDTH_FACTOR

data/lib/ydim/invoice.rb

@@ -106,9 +106,7 @@ module YDIM
       config.formats['quantity'] = "%1.#{@precision}f"
       config.formats['total'] = "#{@currency} %1.2f"
       if(item = @items[0])
-        if((item.vat_rate - YDIM::Server.config.vat_rate).abs > 0.1)
-          config.texts['tax'] = "MwSt 7.6%"
-        end
+        config.texts['tax'] = sprintf("MwSt %0.1f%%", item.vat_rate)
       end
       invoice = PdfInvoice::Invoice.new(config)
       invoice.date = @date

data/lib/ydim/mail.rb

@@ -6,6 +6,7 @@ require 'mail'
 module YDIM
   module Mail
     config = YDIM::Server.config
+    config.load(config.config)
     ::Mail.defaults do
       delivery_method :smtp, {
         :address => config.smtp_server,

data/lib/ydim/version.rb

@@ -1,3 +1,3 @@
 module YDIM
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydim
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger