magelex 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbda5aa522eef5b3da7f41ad1efc32e85a451e80
-  data.tar.gz: b097cd63d2734096b785f85b7db06a11eefd8cbe
+  metadata.gz: 0184b857c2eff1981ea6684932358aa778e174ce
+  data.tar.gz: ccd7cf2ea42949c582ed42fae44ae04cc4a803e1
 SHA512:
-  metadata.gz: 62481373f646ddde8da7e4e830c0b10a581e2214c7a6c7f52d11072d23443552e1327273356e5996c1e4d7c30ff3021c1ea029722afb52d085c880219d202abd
-  data.tar.gz: 023cbd9161e35894893e266c0487483c3f3e02608b72ddfafb6435b249da8562eb4cf17644690b3fc61ae336670ddc5ca5229e872dd3c91487ce5e096bc83c5e
+  metadata.gz: 2ff3635bffbe4d5b17728ae27608cd49b8f19aa896955e43fde788a7062ed6e1a44fa6026dc96a682e791504eee0964773f1d8895bf614a32f5aa5ec752bbc4f
+  data.tar.gz: 4b802c922f790b677016b7f781e4fbb3ffee3e8dfa6f754711dd62e2fa8ebde00637f60ae8161fee09ad606eabddedfb75e15b76175a6b9c8b7c9a290e41cf6e

data/README.md

@@ -38,6 +38,10 @@ By default, `magelex` will log to `STDERR`, but you can pass the path to a log f
 
 It consumes a single file (given as argument, as in `magelex magento_orders.csv`) or a directory of files.  `magelex` will create a file with same filename in the path `lexware` (can be changed with the `--out-dir` option).
 
+### magelex_debug
+
+To play around with data, `magelex_debug` can help you.  Nothing that couldnt be done with some proper application of shell scripting foo, but more convenient. Run  `magelex_debug --help` to get an overview over possible options and arguments.
+
 ### Configuration
 
 Configure magento MySQL database access in `magelex.conf` .  An example configuration comes shipped with the gem (`magelex.conf.example`).
@@ -63,6 +67,11 @@ Quite something
 
 ## Changes
 
+  - 0.1.6:
+    fixed discounts in lexware output (have to be negative)\
+    skip rounding when consuming shipping costs
+  - 0.1.5:
+    respect existence of incorrect tax assignments when considering whether a split booking has to be done.
   - 0.1.4:
     respect per-item discounts
 

data/bin/anonymize

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+require "magelex"
+
+def print_usage
+  STDOUT.puts "#{$PROGRAM_NAME} INFILE [OUTFILE]"
+  STDOUT.puts "Anonymizes a magento csv, outputs to STDOUT "
+  STDOUT.puts "if no OUTFILE is given."
+end
+
+if ARGV.length < 1
+  print_usage
+  STDERR.puts "Need an FILE argument"
+  exit 1
+end
+
+if ARGV.length > 1
+  outfile = ARGV[1]
+else
+  outfile = "-"
+end
+
+if File.file?(outfile) && File.exist?(outfile)
+  print_usage
+  STDERR.puts "Output file #{outfile} already exists."
+  exit 2
+end
+
+# CSV read. Keep fields. Change fields. CSV write.
+
+KEEP_FIELDS = ["Order Number","Order Date","Order Status","Order Subtotal","Order Tax","Order Shipping","Order Discount","Order Grand Total","Order Base Grand Total","Customer Name","Shipping Country","Shipping Country Name","Billing Name","Billing Country","Billing Country Name","Item Name","Item Status","Item Original Price","Item Price","Item Qty Ordered","Item Qty Invoiced","Item Tax","Item Discount","Item Total"]
+
+out_rows = []
+CSV::foreach(ARGV[0], headers: :first_row) do |row|
+  out_rows << KEEP_FIELDS.map{|f| row[f]}
+end
+
+order_nr_idx      = KEEP_FIELDS.index('Order Number')
+customer_name_idx = KEEP_FIELDS.index('Customer Name')
+billing_name_idx  = KEEP_FIELDS.index('Billing Name')
+
+# 'Anonymisation'
+out_rows.each do |r|
+  r[customer_name_idx] = "Ano Sno#{r[order_nr_idx]}den Mous"
+  r[billing_name_idx] = "Ano Sno#{r[order_nr_idx]}den Mous"
+end
+
+csv_s = CSV::generate do |csv|
+  csv << KEEP_FIELDS
+  out_rows.each do |r|
+    csv << r
+  end
+end
+
+if outfile == "-"
+  puts csv_s
+else
+  File.open(outfile, 'w') do |f|
+    f.write csv_s
+  end
+end

data/lib/magelex/bill_modifier.rb

@@ -14,10 +14,10 @@ module Magelex
 
     def self.process_shipping_costs bill
       if bill.swiss?
-        bill.total_0 += LexwareBill.floor2(bill.shipping_cost)
+        bill.total_0 += bill.shipping_cost
       else
         bill.tax_19 += bill.shipping_cost * 0.19
-        bill.total_19 += LexwareBill.floor2(bill.shipping_cost * 1.19)
+        bill.total_19 += (bill.shipping_cost * 1.19)
       end
     end
 

data/lib/magelex/lexware_bill.rb

@@ -78,7 +78,7 @@ module Magelex
     end
 
     def customer_lastname
-      @customer_name.split[-1]
+      @customer_name.to_s.split[-1]
     end
 
     def in_eu?

data/lib/magelex/lexware_csv.rb

@@ -1,5 +1,6 @@
 module Magelex
   module LexwareCSV
+    # Writes(renders) to file.
     def self.write file, bills
       File.open(file, 'w') do |f|
         f.write render(bills).gsub("\n", "\r\n").encode(
@@ -11,13 +12,12 @@ 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),
         0]
-      # subs
-      [:total_0, :total_7, :total_19, :incorrect_tax, :discount_7, :discount_19].each do |part|
+      # subs, refactoring needed.
+      [:total_0, :total_7, :total_19, :incorrect_tax].each do |part|
         if (amount = bill.send(part)) != 0
           rows << [
                   bill.date.strftime("%d.%m.%Y"),
@@ -29,6 +29,18 @@ module Magelex
                   ]
         end
       end
+      [:discount_7, :discount_19].each do |part|
+        if (amount = bill.send(part)) != 0
+          rows << [
+                  bill.date.strftime("%d.%m.%Y"),
+                  bill.order_nr,
+                  bill.customer_name,
+                  - amount.round(2),
+                  0,
+                  Magelex::AccountNumber.for(bill, part),
+                  ]
+        end
+      end
       rows
     end
 
@@ -53,6 +65,7 @@ module Magelex
       end
     end
 
+    # Renders into String
     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.5".freeze
+  VERSION = "0.1.6".freeze
 end

data/lib/magelex.rb

@@ -35,9 +35,6 @@ module Magelex
                               "(0: #{bill.total_0} + 7: #{bill.total_7} "\
                               "+ 19: #{bill.total_19} "\
                               "= #{bill.total_0 + bill.total_7 + bill.total_19})")
-          if bill.discount_19 != 0 || bill.discount_7 != 0
-            Magelex.logger.info(bill.inspect)
-          end
         else
           if bill.swiss?
             Magelex.logger.info("#{bill.order_nr}: swiss")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magelex
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -84,6 +84,7 @@ description:
 email:
 - felix.wolfsteller@gmail.com
 executables:
+- anonymize
 - magelex
 - magelex_debug
 extensions: []
@@ -95,6 +96,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/anonymize
 - bin/magelex
 - bin/magelex_debug
 - lib/magelex.rb