magelex 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9375788e021f187ddbad0f169654145ff6d28f7c
-  data.tar.gz: 1a04c859ed76349806144ab41bb2541af91ee187
+  metadata.gz: 032119d67096a3213c374635a710796c3732ea30
+  data.tar.gz: 9451eb9eba3fddd6bf7d6a12d0af3e554dc53222
 SHA512:
-  metadata.gz: c166ff52c6a1cb1a17c3e4b24821e3250c26cd5da42a8fe9ac5f359d3aa81ee4e508ac1ea399c84709133b102604783945c86862f9ae84f4ca325fb45b30abb5
-  data.tar.gz: 687c4a026691875b1ce9d9506777b91884b49f7509bfa8ca990e6e6352e52c6d0f5195e35157643e01bedcc6a5b793d0b1800ce666a1f5c0aebbc9a3054fd15d
+  metadata.gz: a4e4e62c48ffa8fca02d241e5a953b191cf8fd3e6a7ad29769140aef3a0eae03b681822fa23a251b1aa33aac76afc108a798f97865d44eed6a606fce294e1a0d
+  data.tar.gz: cf520013296e47b60ac59790e43b677337673b7bb65bd18c292a3af5b9e95fddf60a0411492af011d0cc4cbaf8587e09a4c53961955cba9e46cc431ad694bbd3

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 *.swp
 magelex.conf
+/data/
+/lexware/

data/README.md

@@ -48,6 +48,10 @@ If no database queries should be done, invoke with `--skip-db`.
 
 Call `magelex --help` to get a basic idea.
 
+## TODOs
+
+  - Respect Discounts (item and totals).
+
 ## Development
 
 After checking out the repo, run `rake spec` to run the tests. You can also run `bundle console` for an interactive prompt that will allow you to experiment. Run `bundle exec magelex` to use the gem in this directory, ignoring other installed copies of this gem.

data/bin/magelex

@@ -52,50 +52,20 @@ Magelex.logger.formatter = proc { |severity, datetime, progname, msg|
 def main options
   Magelex.logger.info("Started")
 
-  # Import/Read file.
-  bills_export = []
-  bills = Magelex::MagentoCSV.read ARGV[0]
-  bills.each do |bill|
-    if !bill.complete?
-      Magelex.logger.info("Skip order #{bill.order_nr} (incomplete: #{bill.status})")
-    else # complete!
-      bill.consume_shipping_cost
-      bill.swissify
-      if !bill.check
-        Magelex.logger.info("Skip order #{bill.order_nr} "\
-                            "(totals do not match #{bill.total} != "\
-                            "(0: #{bill.total_0} + 7: #{bill.total_7} "\
-                            "+ 19: #{bill.total_19} "\
-                            "= #{bill.total_0 + bill.total_7 + bill.total_19})")
-      else
-        Magelex.logger.debug("Handle #{bill.order_nr}")
-        bills_export << bill
-      end
-    end
-  end
+  Dir.mkdir options[:out_dir] rescue {}
+  outdir = Pathname.new(options[:out_dir]).realpath
 
-  # Fix dates via database.
-  if !options[:skipdb]
-    begin
-      Magelex.logger.info("Fetching dates from magento mysql.")
-      Magelex::MagentoMYSQL.update_dates YAML.load_file('magelex.conf'), bills_export
-    rescue => e
-      Magelex.logger.error("Could not connect to MySQL database, exiting.")
-      Magelex.logger.error(e.inspect)
-      exit 2
+  if File.directory?(ARGV[0])
+    Dir.entries(ARGV[0]).select{|e| !File.directory? e}.each do |f|
+      outfile = outdir.join(File::basename f)
+      infile = Pathname.new(ARGV[0]).join f
+      Magelex.logger.info("Processing file #{infile}")
+      Magelex::process_file infile, outfile, options
     end
+  else
+    outfile = outdir.join(File::basename ARGV[0])
+    Magelex::process_file ARGV[0], outfile, options
   end
-
-  # Export/Write to file
-  Dir.mkdir options[:out_dir] rescue {}
-  outdir  = Pathname.new(options[:out_dir]).realpath
-  outfile = outdir.join(File::basename ARGV[0])
-  if File.exist?(outfile)
-    Magelex.logger.error("Output file #{outfile} exists already, exiting.")
-    exit 3
-  end
-  Magelex.logger.info("Writing to #{outfile}")
-  Magelex::LexwareCSV.write outfile, bills_export
   Magelex.logger.info("Finished")
 end
 

data/lib/magelex/lexware_account.rb

@@ -21,7 +21,7 @@ module Magelex
       elsif tax_kind == :total_19
         return for_19 bill
       else
-        raise "unknown tax_kind"
+        raise "unknown tax_kind (#{tax_kind})"
       end
     end
 

data/lib/magelex/lexware_bill.rb

@@ -7,7 +7,7 @@ module Magelex
                   'NL','AT','PL','PT','RO','SI','SK','FI','SE','UK']
 
     attr_accessor :order_nr, :customer_name, :country_code,
-      :date, :status, :shipping_cost, :total, :total_0, :total_7, :total_19
+      :date, :status, :shipping_cost, :total, :total_0, :total_7, :total_19, :has_problems
 
     def initialize values={}
       @total_0, @total_7, @total_19, @total = 0, 0, 0, 0
@@ -21,6 +21,7 @@ module Magelex
       @status   = values.delete(:status) || nil
       @shipping_cost = values.delete(:shipping_cost) || nil
       @country_code  = values.delete(:country_code) || nil
+      @has_problems  = false
       if !values.empty?
         raise "Unknown values for bill: #{values.inspect}"
       end
@@ -30,16 +31,18 @@ module Magelex
       @country_code == 'CH'
     end
 
-    def add_item amount, tax, name
-      case TaxGuess.guess(amount, tax)
-      when :tax0
-        @total_0 += amount
-      when :tax7
-        @total_7 += amount
-      when :tax19
-        @total_19 += amount
-      else
-        raise 'Unknown Tax class'
+    def add_item amount, tax, name, discount=0
+      begin
+        case TaxGuess.guess(amount, tax)
+        when :tax0
+          @total_0 += amount.round(2)# - discount.round(0)
+        when :tax7
+          @total_7 += amount.round(2)# - discount.round(0)
+        when :tax19
+          @total_19 += amount.round(2)# - discount.round(0)
+        end
+      rescue
+        @has_problems = true
       end
     end
 
@@ -52,11 +55,19 @@ module Magelex
     end
 
     def check
-      @total.round(2) == (@total_0 + @total_7 + @total_19).round(2)
+      @has_problems == false && @total > 0 && @total.round(2) == (@total_0.round(2) + @total_7.round(2) + @total_19.round(2)).round(2)
+    end
+
+    def self.floor2 value
+      (value * 100).to_i / 100.0
     end
 
     def consume_shipping_cost
-      @total_19 += @shipping_cost * 1.19
+      if swiss?
+        @total_0 += LexwareBill.floor2(@shipping_cost)
+      else
+        @total_19 += LexwareBill.floor2(@shipping_cost * 1.19)
+      end
       @shipping_cost = 0
     end
 

data/lib/magelex/lexware_csv.rb

@@ -7,15 +7,14 @@ module Magelex
       end
     end
 
-    def self.to_rows bill
-      # main
+    def self.to_split_rows bill
       rows = []
       rows << [bill.date.strftime("%d.%m.%Y"),
-       bill.order_nr,
-       bill.customer_name,
-       bill.total.round(2),
-       Magelex::AccountNumber.for_customer(bill),
-       0]
+        bill.order_nr,
+        bill.customer_name,
+        bill.total.round(2),
+        Magelex::AccountNumber.for_customer(bill),
+        0]
       # subs
       [:total_0, :total_7, :total_19].each do |part|
         if (amount = bill.send(part)) != 0
@@ -32,6 +31,27 @@ module Magelex
       rows
     end
 
+    def self.to_single_row bill
+      tax_kind = [:total_0, :total_7, :total_19].detect{|t| bill.send(t) > 0}
+
+      [[bill.date.strftime("%d.%m.%Y"),
+       bill.order_nr,
+       bill.customer_name,
+       bill.total.round(2),
+       Magelex::AccountNumber.for_customer(bill),
+       Magelex::AccountNumber.for(bill, tax_kind)
+       ]]
+    end
+
+    def self.to_rows bill
+      # split-booking needed?
+      if [:total_0, :total_7, :total_19].map{|t| bill.send(t)}.count{|i| i > 0} > 1
+        to_split_rows bill
+      else
+        to_single_row bill
+      end
+    end
+
     def self.render bills
       CSV.generate(encoding: 'utf-8') do |csv|
         bills.each do |b|

data/lib/magelex/version.rb

@@ -1,3 +1,3 @@
 module Magelex
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/magelex.rb

@@ -15,4 +15,50 @@ module Magelex
   def self.logger= logger
     @logger = logger
   end
+
+  def self.process_file in_file, out_file, options
+    bills_export = []
+    # Import/Read file.
+    bills = Magelex::MagentoCSV.read in_file
+    bills.each do |bill|
+      if !bill.complete?
+        Magelex.logger.info("Skip order #{bill.order_nr} (incomplete: #{bill.status})")
+      else # complete!
+        bill.consume_shipping_cost
+        bill.swissify
+        if !bill.check
+          Magelex.logger.info("Skip order #{bill.order_nr}#{bill.swiss? ? ' (swiss)' : ''}")
+          Magelex.logger.info("  (totals do not match #{bill.total} != "\
+                              "(0: #{bill.total_0} + 7: #{bill.total_7} "\
+                              "+ 19: #{bill.total_19} "\
+                              "= #{bill.total_0 + bill.total_7 + bill.total_19})")
+        else
+          Magelex.logger.debug("Handle #{bill.order_nr}")
+          bills_export << bill
+        end
+      end
+    end
+
+    # Fix dates via database.
+    if !options[:skipdb]
+      begin
+        Magelex.logger.info("Fetching dates from magento mysql.")
+        Magelex::MagentoMYSQL.update_dates YAML.load_file('magelex.conf'), bills_export
+      rescue => e
+        Magelex.logger.error("Could not connect to MySQL database, exiting.")
+        Magelex.logger.error(e.inspect)
+        exit 2
+      end
+    else
+      Magelex.logger.debug("Skip fetching dates from magento mysql.")
+    end
+
+    # Export/Write to file
+    if File.exist?(out_file)
+      Magelex.logger.error("Output file #{out_file} exists already, exiting.")
+      exit 3
+    end
+    Magelex.logger.info("Writing to #{out_file}")
+    Magelex::LexwareCSV.write out_file, bills_export
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magelex
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2