magelex 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3265c8e33e2ad6890d52621525e0c1bd5dd413be
-  data.tar.gz: 155eeb146e499ce591d689fc234800ccacc0667d
+  metadata.gz: cbda5aa522eef5b3da7f41ad1efc32e85a451e80
+  data.tar.gz: b097cd63d2734096b785f85b7db06a11eefd8cbe
 SHA512:
-  metadata.gz: 3c15c967d7f20bdf9eedaf4f4cf333dbccfcd3c0fa7486a06b10a73fc78c52ef8f61cccb8757aa93cd8135fdf83314ae9c6eb65be44387d9705251149b4fe35c
-  data.tar.gz: b9263bc21038c81c2d33e69b9410a62a8df4db0a9324491e34e70db3c087456c93dc8e66fa04af3a44cf99079cb0d642f2498c388cd712fbb35c4c9a9b4e18bf
+  metadata.gz: 62481373f646ddde8da7e4e830c0b10a581e2214c7a6c7f52d11072d23443552e1327273356e5996c1e4d7c30ff3021c1ea029722afb52d085c880219d202abd
+  data.tar.gz: 023cbd9161e35894893e266c0487483c3f3e02608b72ddfafb6435b249da8562eb4cf17644690b3fc61ae336670ddc5ca5229e872dd3c91487ce5e096bc83c5e

data/README.md

@@ -57,6 +57,10 @@ Swiss orders require some special attention, so steps are undertaken to adjust t
 
 Finally the `LexwareBill`s that conform to the rules (`LexwareBill#check`) can be exported to be imported to Lexware (`Magelex::LexwareCSV`).
 
+## TODO
+
+Quite something
+
 ## Changes
 
   - 0.1.4:

data/bin/magelex

@@ -14,7 +14,7 @@ optparse = OptionParser.new do |opts|
     " data to be imported to open positions in lexware."
   opts.separator ""
 
-  opts.on('-o', '--out-dir DIR', 'Directory to write output files to.') do |o|
+  opts.on('-o', '--out-dir DIR', 'Directory to write output files to, otherwise concats to STDOUT. If "auto", outputs to source dir.') do |o|
     options[:out_dir] = o
   end
   opts.on('-l', '--log-file FILE', 'File to log to (default: STDERR).') do |o|

data/bin/magelex_debug

@@ -6,7 +6,7 @@ require 'yaml'
 require 'optparse'
 require 'terminal-table'
 
-options = {}
+options = {table: true, filter_checked: false, filter_complete: false, lexware: true}
 
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: #{$PROGRAM_NAME} DIR_OR_FILE"
@@ -14,12 +14,29 @@ optparse = OptionParser.new do |opts|
   opts.separator "Debug magelex im- and export"
   opts.separator ""
 
+  opts.separator "Filtering options"
+  opts.separator ""
+  opts.on('-b', '--bad', 'Show only bills that do not pass check') do |o|
+    options[:filter_checked] = o
+  end
+  opts.on('-c', '--[no-]complete', 'Show only bills that are complete') do |o|
+    options[:filter_complete] = o
+  end
+  opts.on('-n', '--ordernumber ORDERNUMBER', 'Show only bill with given ORDERNUMBER') do |o|
+    options[:filter_ordernumber] = o
+  end
+
+  opts.separator "Output options"
+  opts.separator ""
   opts.on('-v', '--verbose', 'Run verbosely') do |o|
     options[:verbose] = o
   end
-  opts.on('-s', '--skip-db', 'Do not update dates from mysql database.') do |o|
-    options[:skipdb] = o
+  opts.on('-t', '--[no-]table', 'Show table of bills') do |o|
+    options[:table] = o
   end
+  opts.on('-l', '--[no-]lexware', 'Show lexware output') do |o|
+    options[:lexware] = o
+   end
   opts.on_tail('--version', 'Show version and exit.') do
     puts "Magelex #{Magelex::VERSION}"
     exit 0
@@ -49,25 +66,41 @@ def main options
   # Import/Read file.
   bills = Magelex::MagentoCSV.read ARGV[0]
   Magelex::BillModifier.process bills
+
+  if options[:filter_complete]
+    bills.reject!{|b| !b.complete?}
+  end
+  if options[:filter_checked]
+    bills.reject!{|b| b.check}
+  end
+  if options[:filter_ordernumber]
+    bills.reject!{|b| b.order_nr.to_s != options[:filter_ordernumber].to_s}
+  end
+
   bill_rows = bills.map do |bill|
     [
       bill.order_nr,
-      bill.swiss? ? 'Y' : 'N',
+      bill.country_code,
       bill.total,
       "%.3f" %bill.total_0, "%.3f" % bill.total_7, "%.3f" % bill.total_19,
       "%.3f" % bill.tax_7, "%.3f" % bill.tax_19,
-      "%.3f" % bill.shipping_cost, "%.3f" % bill.check_diff, bill.check ? "Y" : "N"
+      "%.3f" % bill.shipping_cost, "%.3f" % (bill.discount_7 + bill.discount_19), "%.3f" % bill.check_diff, bill.check ? "Y" : "N"
     ]
   end
 
-  t = Terminal::Table.new(headings: ["nr", "S?","total_b",
-                                     "total0", "total7", "total19",
-                                     "tax7", "tax19",
-                                     "ship", "diff", "C"],
-                          rows: bill_rows)
+  if options[:table]
+    t = Terminal::Table.new(headings: ["nr", "Co","total_b",
+                                       "total0", "total7", "total19",
+                                       "tax7", "tax19",
+                                       "ship", "discount", "diff", "C"],
+                            rows: bill_rows)
+    puts t
+  end
+
+  if options[:lexware]
+    puts Magelex::LexwareCSV::render bills
+  end
 
-  puts t
-  puts Magelex::LexwareCSV::render bills
   Magelex.logger.info("Finished")
 end
 

data/lib/magelex/lexware_account.rb

@@ -28,6 +28,7 @@ module Magelex
       elsif tax_kind == :discount_19
         return for_discount_19 bill
       else
+        # its not a tax kind anymore, its a posten type
         raise "unknown tax_kind (#{tax_kind})"
       end
     end

data/lib/magelex/lexware_bill.rb

@@ -101,7 +101,6 @@ module Magelex
     def self.floor2 value
       (value * 100).to_i / 100.0
     end
-    end
 
     def complete?
       @status == "complete"

data/lib/magelex/lexware_csv.rb

@@ -11,6 +11,7 @@ module Magelex
       rows = []
       rows << [bill.date.strftime("%d.%m.%Y"),
         bill.order_nr,
+        # Replace , by dash
         bill.customer_name,
         bill.total.round(2),
         Magelex::AccountNumber.for_customer(bill),
@@ -45,7 +46,7 @@ module Magelex
 
     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
+      if [:total_0, :total_7, :total_19, :incorrect_tax, :discount_7, :discount_19].map{|t| bill.send(t)}.count{|i| i > 0} > 1
         to_split_rows bill
       else
         to_single_row bill

data/lib/magelex/magento_csv.rb

@@ -39,7 +39,7 @@ module Magelex
       bill.status        = row['Order Status']
 
       bill.shipping_cost = row['Order Shipping']
-      if bill.shipping_cost == 12.6
+      if (12.59..12.61).include? bill.shipping_cost
         Magelex::logger.info "Correcting shipping cost of #{bill.order_nr} (12.6 -> 15 / 1.19 €)"
         bill.shipping_cost = 15 / 1.19
       elsif bill.shipping_cost == 4.15

data/lib/magelex/version.rb

@@ -1,3 +1,3 @@
 module Magelex
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

data/lib/magelex.rb

@@ -71,6 +71,7 @@ module Magelex
       exit 3
     end
     Magelex.logger.info("Writing to #{out_file}")
+    # TODO want STDOUT
     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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2