magelex 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de06fc18a480aa62a7229eb17dd1039513345fd3
-  data.tar.gz: 2c47cad6e86d40495ddd67c32a6533ab5e2d4e77
+  metadata.gz: 3265c8e33e2ad6890d52621525e0c1bd5dd413be
+  data.tar.gz: 155eeb146e499ce591d689fc234800ccacc0667d
 SHA512:
-  metadata.gz: 07b259c2f497d0345b89ec13819b6717e2c64293bc212d7fe1a805214270aacf77f80fec7d0478462c2002cfd2a55b81741d6f171a971933aa1e924846873026
-  data.tar.gz: 7efba0085ec0ecfe48693fd2b0e71af54f7f4351769d943338d9bd8e39a2a339af03c9ab7e199b12f5ddd748318300778f5b8ccca1e43a543c78e71be301baea
+  metadata.gz: 3c15c967d7f20bdf9eedaf4f4cf333dbccfcd3c0fa7486a06b10a73fc78c52ef8f61cccb8757aa93cd8135fdf83314ae9c6eb65be44387d9705251149b4fe35c
+  data.tar.gz: b9263bc21038c81c2d33e69b9410a62a8df4db0a9324491e34e70db3c087456c93dc8e66fa04af3a44cf99079cb0d642f2498c388cd712fbb35c4c9a9b4e18bf

data/README.md

@@ -57,6 +57,11 @@ 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`).
 
+## Changes
+
+  - 0.1.4:
+    respect per-item discounts
+
 ## 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_debug

@@ -48,8 +48,7 @@ def main options
 
   # Import/Read file.
   bills = Magelex::MagentoCSV.read ARGV[0]
-  bills.each(&:swissify)
-  bills.each(&:process_shipping_costs)
+  Magelex::BillModifier.process bills
   bill_rows = bills.map do |bill|
     [
       bill.order_nr,

data/lib/magelex/bill_modifier.rb

@@ -1,10 +1,15 @@
 module Magelex
   module BillModifier
-    def self.process bill
-      # 'Trick' around with bill
-      swissify bill
-      process_shipping_costs bill
-      adjust_order_number bill
+    # shifts to total_0 for swiss orders,
+    # consumes the shipping cost (19)
+    # and adjusts the order number
+    # takes single bill or list of bills
+    def self.process bills
+      [*bills].each do |bill|
+        swissify bill
+        process_shipping_costs bill
+        adjust_order_number bill
+      end
     end
 
     def self.process_shipping_costs bill

data/lib/magelex/lexware_account.rb

@@ -23,6 +23,10 @@ module Magelex
         return for_19 bill
       elsif tax_kind == :incorrect_tax
         return for_incorrect_tax bill
+      elsif tax_kind == :discount_7
+        return for_discount_7 bill
+      elsif tax_kind == :discount_19
+        return for_discount_19 bill
       else
         raise "unknown tax_kind (#{tax_kind})"
       end
@@ -43,5 +47,13 @@ module Magelex
     def self.for_incorrect_tax bill
       '1783'
     end
+
+    def self.for_discount_7 bill
+      '8780'
+    end
+
+    def self.for_discount_19 bill
+      '8790'
+    end
   end
 end

data/lib/magelex/lexware_bill.rb

@@ -6,8 +6,13 @@ module Magelex
                   'IE','IT','CY','LV','LT','LU','HU','MT',
                   '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, :has_problems, :tax_7, :tax_19, :incorrect_tax
+    attr_accessor :order_nr, :customer_name,
+      :country_code,
+      :date, :status, :shipping_cost,
+      :total, :total_0, :total_7, :total_19,
+      :discount_7, :discount_19,
+      :total, :total_0, :total_7, :total_19,
+      :has_problems, :tax_7, :tax_19, :incorrect_tax
 
     def initialize values={}
       @total_0, @total_7, @total_19, @total = 0, 0, 0, 0
@@ -22,8 +27,10 @@ module Magelex
       @tax_19   = values.delete(:tax_19) || 0
       @incorrect_tax = values.delete(:incorrect_tax) || 0
       @status   = values.delete(:status) || nil
-      @shipping_cost = values.delete(:shipping_cost) || nil
+      @shipping_cost = values.delete(:shipping_cost) || 0
       @country_code  = values.delete(:country_code)  || nil
+      @discount_7    = values.delete(:discount_7) || 0
+      @discount_19   = values.delete(:discount_19)  || 0
       @has_problems  = false
       if !values.empty?
         raise "Unknown values for bill: #{values.inspect}"
@@ -36,21 +43,24 @@ module Magelex
 
     # Add item values to corresponding total_ and tax_ attributes
     # depending on discount, include or exclude taxes.
-    def add_item amount, tax, name, discount=0
+    # TODO full_amount shall not be 0 if discount is not zero
+    def add_item amount, tax, name, discount=0, full_amount=0
       begin
         case TaxGuess.guess(amount, tax)
         when :tax0
           @total_0 += amount.round(2)
         when :tax7
           if discount != 0
-            @total_7 += (amount.round(2) * 1.07)
+            @total_7 += full_amount.round(2)
+            @discount_7 += discount
           else
             @total_7 += amount.round(2)
           end
           @tax_7 += tax
         when :tax19
           if discount != 0
-            @total_19 += (amount.round(2) * 1.18)
+            @total_19 += full_amount.round(2)
+            @discount_19 += discount
           else
             @total_19 += amount.round(2)
           end
@@ -76,7 +86,12 @@ module Magelex
     end
 
     def check_diff
-      @total.round(2) - (@total_0.round(2) + @total_7.round(2) + @total_19.round(2) + @incorrect_tax.round(2)).round(2)
+      @total.round(2) - (@total_0.round(2) + \
+                         + @total_7.round(2) + \
+                         + @total_19.round(2) + \
+                         + @incorrect_tax.round(2) + \
+                         - @discount_7.round(2) + \
+                         - @discount_19.round(2)).round(2)
     end
 
     def check

data/lib/magelex/lexware_csv.rb

@@ -16,7 +16,7 @@ module Magelex
         Magelex::AccountNumber.for_customer(bill),
         0]
       # subs
-      [:total_0, :total_7, :total_19, :incorrect_tax].each do |part|
+      [:total_0, :total_7, :total_19, :incorrect_tax, :discount_7, :discount_19].each do |part|
         if (amount = bill.send(part)) != 0
           rows << [
                   bill.date.strftime("%d.%m.%Y"),

data/lib/magelex/magento_csv.rb

@@ -3,7 +3,7 @@ require 'csv'
 module Magelex
   module MagentoCSV
     MONEY_FIELDS = ['Order Shipping', 'Order Grand Total',
-                    'Item Total', 'Item Tax', 'Item Discount']
+                    'Item Original Price', 'Item Total', 'Item Tax', 'Item Discount']
 
     CSV::Converters[:german_money_amount] = lambda do |value, info|
       if MONEY_FIELDS.include? info[:header]
@@ -31,7 +31,7 @@ module Magelex
       bill = Magelex::LexwareBill.new
 
       # TODO: defining a attribute|colum- map would be nicer
-      bill.order_nr = row['Order Number']
+      bill.order_nr      = row['Order Number']
       bill.customer_name = row['Billing Name']
       bill.country_code  = row['Shipping Country']
       bill.date          = row['Order Date']
@@ -65,7 +65,8 @@ module Magelex
         current_bill.add_item(row['Item Total'],
                               row['Item Tax'],
                               row['Item Name'],
-                              row['Item Discount'])
+                              row['Item Discount'],
+                              row['Item Original Price'].to_f * row['Item Qty Ordered'].to_i)
 
         if !bills.include? (current_bill)
           bills << current_bill

data/lib/magelex/version.rb

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

data/lib/magelex.rb

@@ -27,15 +27,24 @@ module Magelex
       else # complete!
         Magelex::BillModifier.process bill
         if !bill.check
+          if bill.discount_7 != 0 || bill.discount_19 != 0
+            Magelex.logger.info("#{bill.order_nr}: discounted")
+          end
           Magelex.logger.info("Skip order #{bill.order_nr}#{bill.swiss? ? ' (swiss)' : ''} #{bill.has_problems ? ' (broken item)': '' }")
-          Magelex.logger.info("  (totals do not match #{bill.total} != "\
+          Magelex.logger.info("  (totals do not match [#{bill.check_diff}] #{bill.total} != "\
                               "(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")
           end
+          if bill.discount_7 != 0 || bill.discount_19 != 0
+            Magelex.logger.info("#{bill.order_nr}: discounted")
+          end
           Magelex.logger.debug("Handle #{bill.order_nr}")
           bills_export << bill
         end

metadata

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