removedev notes

Gemfile

@@ -50,6 +50,8 @@ gem 'attribute_normalizer'
 gem 'ice_cube'
 # At time of development 01-06-2022 mmddyyyy necessary fix for config_helper.rb form builder was not in rubygems so we pull from github, see: https://github.com/gregschmit/recurring_select/pull/152
 gem 'recurring_select', git: 'https://github.com/gregschmit/recurring_select'
+# TODO: publish gem on github
+gem 'foodsoft_article_import', git: 'https://git.local-it.org/Foodsoft/foodsoft_article_import', tag: 'v1.9'
 gem 'roo'
 gem 'roo-xls'
 gem 'spreadsheet'

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://git.local-it.org/Foodsoft/foodsoft_article_import
+  revision: 573851e5497758e1d27d2199f03b939e6bda9e35
+  tag: v1.9
+  specs:
+    foodsoft_article_import (1.0.0)
+      roo (~> 2.9.0)
+
 GIT
   remote: https://github.com/gregschmit/recurring_select
   revision: 29febc4c4abdd6c30636c33a7d2daecb09973ecf
@@ -615,6 +623,7 @@ DEPENDENCIES
   exception_notification
   factory_bot_rails
   faker
+  foodsoft_article_import!
   foodsoft_discourse!
   foodsoft_documents!
   foodsoft_links!
@@ -686,4 +695,4 @@ DEPENDENCIES
   whenever
 
 BUNDLED WITH
-   2.4.3
+   2.4.2

app/controllers/articles_controller.rb

@@ -148,10 +148,11 @@ class ArticlesController < ApplicationController
   # Update articles from a spreadsheet
   def parse_upload
     uploaded_file = params[:articles]['file'] or raise I18n.t('articles.controller.parse_upload.no_file')
+    type = params[:articles]['type']
     options = { filename: uploaded_file.original_filename }
     options[:outlist_absent] = (params[:articles]['outlist_absent'] == '1')
     options[:convert_units] = (params[:articles]['convert_units'] == '1')
-    @updated_article_pairs, @outlisted_articles, @new_articles = @supplier.sync_from_file uploaded_file.tempfile, options
+    @updated_article_pairs, @outlisted_articles, @new_articles = @supplier.sync_from_file uploaded_file.tempfile, type, options
     if @updated_article_pairs.empty? && @outlisted_articles.empty? && @new_articles.empty?
       redirect_to supplier_articles_path(@supplier), :notice => I18n.t('articles.controller.parse_upload.notice')
     end

app/lib/foodsoft_file.rb

@@ -1,25 +0,0 @@
-# Foodsoft-file import
-class FoodsoftFile
-  # parses a string from a foodsoft-file
-  # returns two arrays with articles and outlisted_articles
-  # the parsed article is a simple hash
-  def self.parse(file, options = {})
-    SpreadsheetFile.parse file, options do |row, row_index|
-      next if row[2].blank?
-
-      article = { :order_number => row[1],
-                  :name => row[2],
-                  :note => row[3],
-                  :manufacturer => row[4],
-                  :origin => row[5],
-                  :unit => row[6],
-                  :price => row[7],
-                  :tax => row[8],
-                  :deposit => (row[9].nil? ? "0" : row[9]),
-                  :unit_quantity => row[10],
-                  :article_category => row[13] }
-      status = row[0] && row[0].strip.downcase == 'x' ? :outlisted : nil
-      yield status, article, row_index
-    end
-  end
-end

app/lib/spreadsheet_file.rb

@@ -1,22 +0,0 @@
-require 'roo'
-
-class SpreadsheetFile
-  def self.parse(file, options = {})
-    filepath = file.is_a?(String) ? file : file.to_path
-    filename = options.delete(:filename) || filepath
-    fileext = File.extname(filename)
-    options[:csv_options] = { col_sep: ';', encoding: 'utf-8' }.merge(options[:csv_options] || {})
-    s = Roo::Spreadsheet.open(filepath, options.merge({ extension: fileext }))
-
-    row_index = 1
-    s.each do |row|
-      if row_index == 1
-        # @todo try to detect headers; for now using the index is ok
-      else
-        yield row, row_index
-      end
-      row_index += 1
-    end
-    row_index
-  end
-end

app/models/article.rb

@@ -51,7 +51,7 @@ class Article < ApplicationRecord
   has_many :orders, through: :order_articles
 
   # Replace numeric seperator with database format
-  localize_input_of :price, :tax, :deposit
+  localize_input_of :price, :tax, :deposit, :price_per
   # Get rid of unwanted whitespace. {Unit#new} may even bork on whitespace.
   normalize_attributes :name, :unit, :note, :manufacturer, :origin, :order_number
 
@@ -142,7 +142,6 @@ class Article < ApplicationRecord
       new_unit_quantity = new_article.unit_quantity
       new_unit = new_article.unit
     end
-
     return Article.compare_attributes(
       {
         :name => [self.name, new_article.name],
@@ -152,6 +151,8 @@ class Article < ApplicationRecord
         :price => [self.price.to_f.round(2), new_price.to_f.round(2)],
         :tax => [self.tax, new_article.tax],
         :deposit => [self.deposit.to_f.round(2), new_article.deposit.to_f.round(2)],
+        :price_per => [self.price_per.to_f.round(2), new_article.price_per.to_f.round(2)],
+        :unit_symbol => [self.unit_symbol, new_article.unit_symbol],
         # take care of different num-objects.
         :unit_quantity => [self.unit_quantity.to_s.to_f, new_unit_quantity.to_s.to_f],
         :note => [self.note.to_s, new_article.note.to_s]

app/models/concerns/localize_input.rb

@@ -8,7 +8,7 @@ module LocalizeInput
     separator = I18n.t("separator", scope: "number.format")
     delimiter = I18n.t("delimiter", scope: "number.format")
     input.gsub!(delimiter, "") if input.match(/\d+#{Regexp.escape(delimiter)}+\d+#{Regexp.escape(separator)}+\d+/) # Remove delimiter
-    input.gsub!(separator, ".") # Replace separator with db compatible character
+    input.gsub!(separator, ".") or input.gsub!(",", ".") # Replace separator with db compatible character
     input
   rescue
     Rails.logger.warn "Can't localize input: #{input}"

app/models/concerns/price_calculation.rb

@@ -12,6 +12,14 @@ module PriceCalculation
     add_percent(gross_price, FoodsoftConfig[:price_markup])
   end
 
+  def fc_price_per
+    if price_per > 0
+      add_percent(add_percent(price_per, tax), FoodsoftConfig[:price_markup])
+    else
+      fc_price
+    end
+  end
+
   private
 
   def add_percent(value, percent)

app/models/group_order.rb

@@ -45,6 +45,8 @@ class GroupOrder < ApplicationRecord
         # Build hash with relevant data
         data[:order_articles][order_article.id] = {
           :price => order_article.article.fc_price,
+          :price_per => order_article.article.fc_price_per,
+          :unit_symbol => order_article.article.unit_symbol,
           :unit => order_article.article.unit_quantity,
           :quantity => (goa ? goa.quantity : 0),
           :others_quantity => order_article.quantity - (goa ? goa.quantity : 0),

app/models/shared_article.rb

@@ -19,8 +19,10 @@ class SharedArticle < ApplicationRecord
       :unit_quantity => unit_quantity,
       :order_number => number,
       :article_category => ArticleCategory.find_match(category),
+      :price_per => price_per,
+      :unit_symbol => unit_symbol,
       # convert to db-compatible-string
-      :shared_updated_on => updated_on.to_formatted_s(:db)
+      :shared_updated_on => updated_on.to_fs(:db)
     )
   end
 end

app/models/supplier.rb

@@ -1,3 +1,4 @@
+require 'foodsoft_article_import'
 class Supplier < ApplicationRecord
   include MarkAsDeletedWithName
   include CustomFields
@@ -73,18 +74,20 @@ class Supplier < ApplicationRecord
   # Synchronise articles with spreadsheet.
   #
   # @param file [File] Spreadsheet file to parse
-  # @param options [Hash] Options passed to {FoodsoftFile#parse} except when listed here.
+  # @param options [Hash] Options passed to {FoodsoftArticleImport#parse} except when listed here.
   # @option options [Boolean] :outlist_absent Set to +true+ to remove articles not in spreadsheet.
   # @option options [Boolean] :convert_units Omit or set to +true+ to keep current units, recomputing unit quantity and price.
-  def sync_from_file(file, options = {})
+  def sync_from_file(file, type, options = {})
     all_order_numbers = []
     updated_article_pairs, outlisted_articles, new_articles = [], [], []
-    FoodsoftFile::parse file, options do |status, new_attrs, line|
+    custom_codes_path = File.join(Rails.root, "config", "custom_codes.yml")
+    opts = options.except(:convert_units, :outlist_absent)
+    custom_codes_file_path = custom_codes_path if File.exist?(custom_codes_path)
+    FoodsoftArticleImport.parse(file, custom_file_path: custom_codes_file_path, type: type, **opts) do |new_attrs, status, line|
       article = articles.undeleted.where(order_number: new_attrs[:order_number]).first
       new_attrs[:article_category] = ArticleCategory.find_match(new_attrs[:article_category])
       new_attrs[:tax] ||= FoodsoftConfig[:tax_default]
       new_article = articles.build(new_attrs)
-
       if status.nil?
         if article.nil?
           new_articles << new_article

app/views/articles/_form.html.haml

@@ -1,5 +1,6 @@
 = simple_form_for [@supplier, @article], :validate => true, :remote => true do |f|
   = f.hidden_field :shared_updated_on
+  = f.hidden_field :unit_symbol
   = f.hidden_field :supplier_id
   .modal-header
     = close_button :modal

app/views/articles/_sync.html.haml

@@ -17,14 +17,14 @@
     %i
       = t '.update.update_msg', count: @updated_article_pairs.size
       = t '.update.body'
-  = render 'sync_table', articles: @updated_article_pairs, field: 'articles', hidden_fields: %w(shared_updated_on)
+  = render 'sync_table', articles: @updated_article_pairs, field: 'articles', hidden_fields: %w(shared_updated_on unit_symbol)
   %hr/
 
 - if @new_articles.any?
   %h2= t '.upnew.title'
   %p
     %i= t '.upnew.body_count', count: @new_articles.length
-  = render 'sync_table', articles: @new_articles, field: 'new_articles', hidden_fields: %w(shared_updated_on order_number availability)
+  = render 'sync_table', articles: @new_articles, field: 'new_articles', hidden_fields: %w(shared_updated_on order_number availability unit_symbol)
   %hr/
 
 - if ignored_article_count > 0

app/views/articles/_sync_table.html.haml

@@ -8,6 +8,7 @@
       %th= heading_helper Article, :unit
       %th= heading_helper Article, :unit_quantity, short: true
       %th= heading_helper Article, :price
+      %th= heading_helper Article, :price_per
       %th= heading_helper Article, :tax
       %th= heading_helper Article, :deposit
       %th= heading_helper Article, :article_category
@@ -23,6 +24,7 @@
           %td= article.unit
           %td= article.unit_quantity
           %td= number_to_currency article.price
+          %td= number_to_currency article.price_per.round(2)
           %td= number_to_percentage article.tax
           %td= number_to_currency article.deposit
           %td= article.article_category.name if article.article_category
@@ -41,6 +43,10 @@
             .input-prepend
               %span.add-on= t 'number.currency.format.unit'
               = form.text_field 'price', class: 'input-mini', style: 'width: 45px'
+          %td{:style => highlight_new(attrs, :price_per)}
+            .input-prepend
+              %span.add-on= t 'number.currency.format.unit'
+              = form.text_field 'price_per', class: 'input-mini', style: 'width: 45px'
           %td{:style => highlight_new(attrs, :tax)}
             .input-append
               = form.text_field 'tax', class: 'input-mini', style: 'width: 45px'

app/views/articles/upload.html.haml

@@ -71,9 +71,14 @@
 = form_for :articles, :url => parse_upload_supplier_articles_path(@supplier),
    :html => { multipart: true, class: "form-horizontal" } do |f|
 
+  
   .control-group
-    %label(for="articles_file")= t '.file_label'
+    %label(for="articles_file")
+      %strong= t '.file_label'
     = f.file_field "file"
+    %label(for="articles_file")
+      %strong="select the file type you are about to upload"
+    =f.collection_select :type, ["bnn","foodsoft","odin"], :to_s, :to_s
 
   .control-group
     %label(for="articles_outlist_absent")

app/views/group_orders/_form.html.haml

@@ -77,6 +77,7 @@
           %th{style: 'width:120px'}= heading_helper StockArticle, :supplier
         %th{style: "width:13px;"}
         %th{style: "width:4.5em;"}= t '.price'
+        %th{style: "width:4.5em;"}= t '.price_per'
         %th{style: "width:4.5em;"}= heading_helper Article, :unit
         - unless @order.stockit?
           %th{style: "width:70px;"}= heading_helper OrderArticle, :missing_units, short: true
@@ -100,6 +101,7 @@
               %td= truncate order_article.article.supplier.name, length: 15
             %td= h order_article.article.origin
             %td= number_to_currency(@ordering_data[:order_articles][order_article.id][:price])
+            %td= "#{number_to_currency(@ordering_data[:order_articles][order_article.id][:price_per])}/#{@ordering_data[:order_articles][order_article.id][:unit_symbol]||@ordering_data[:order_articles][order_article.id][:unit]}"
             %td= order_article.article.unit
             %td
               - if @order.stockit?

config/locales/de.yml

@@ -1052,6 +1052,7 @@ de:
       action_save: Bestellung speichern
       new_funds: Neuer Kontostand
       price: Preis
+      price_per: Preis je Mengeneinheit (ohne Pfand)
       reset_article_search: Suche zurücksetzen
       search_article: Artikel suchen...
       sum_amount: Gesamtbestellmenge bisher

config/locales/en.yml

@@ -1054,6 +1054,7 @@ en:
       action_save: Save order
       new_funds: New account balance
       price: Price
+      price_per: Price per quantity unit (without deposit)
       reset_article_search: Reset search
       search_article: Search for articles...
       sum_amount: Current amount

config/locales/es.yml

@@ -929,6 +929,7 @@ es:
       action_save: Guardar pedido
       new_funds: Nuevo balance de cuenta
       price: Precio
+      price_per: Precio por unidad de cantidad (sin depósito)
       reset_article_search: Reinicia la búsqueda
       search_article: Busca artículos...
       sum_amount: Cantidad actual

config/locales/fr.yml

@@ -678,6 +678,7 @@ fr:
       action_save: Enregistrer ta commande
       new_funds: Nouveau solde
       price: Prix
+      price_per: Prix par unité de quantité (sans consigne)
       reset_article_search: Réinitialiser la recherche
       search_article: Rechercher des produits...
       sum_amount: Quantité déjà commandée

config/locales/nl.yml

@@ -1024,6 +1024,7 @@ nl:
       action_save: Bestelling opslaan
       new_funds: Nieuw tegoed
       price: Prijs
+      price_per: Prijs per hoeveelheidseenheid (zonder statiegeld)
       reset_article_search: Alles tonen
       search_article: Artikelen zoeken...
       sum_amount: Huidig totaalbedrag

db/migrate/20230220214408_add_price_per_to_articles.rb

@@ -0,0 +1,6 @@
+class AddPricePerToArticles < ActiveRecord::Migration[7.0]
+  def change
+    add_column :articles, :price_per, :float, default: 0.0
+    add_column :articles, :unit_symbol, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,17 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_01_06_144440) do
+ActiveRecord::Schema[7.0].define(version: 2023_02_20_214408) do
+  create_table "action_text_rich_texts", charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "body", size: :long
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
+  end
+
   create_table "active_storage_attachments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
@@ -75,6 +85,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_144440) do
     t.datetime "deleted_at", precision: nil
     t.string "type"
     t.integer "quantity", default: 0
+    t.float "price_per", default: 0.0
+    t.string "unit_symbol"
     t.index ["article_category_id"], name: "index_articles_on_article_category_id"
     t.index ["name", "supplier_id"], name: "index_articles_on_name_and_supplier_id"
     t.index ["supplier_id"], name: "index_articles_on_supplier_id"
@@ -282,7 +294,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_144440) do
   create_table "messages", id: :integer, charset: "utf8mb4", collation: "utf8mb4_general_ci", force: :cascade do |t|
     t.integer "sender_id"
     t.string "subject", null: false
-    t.text "body"
     t.boolean "private", default: false
     t.datetime "created_at", precision: nil
     t.integer "reply_to"

spec/controllers/articles_controller_spec.rb

@@ -187,8 +187,8 @@ describe ArticlesController, type: :controller do
   describe '#parse_upload' do
     let(:file) { Rack::Test::UploadedFile.new(Rails.root.join('spec/fixtures/files/upload_test.csv'), original_filename: 'upload_test.csv') }
 
-    it 'updates particles from spreadsheet' do
-      post_with_supplier :parse_upload, params: { articles: { file: file, outlist_absent: '1', convert_units: '1' } }
+    it 'updates articles from spreadsheet' do
+      post_with_supplier :parse_upload, params: { articles: { file: file, outlist_absent: '1', convert_units: '1', type: 'foodsoft' } }
       expect(response).to have_http_status(:success)
     end
 

spec/factories/article.rb

@@ -7,6 +7,7 @@ FactoryBot.define do
     tax { [6, 21].sample }
     deposit { rand(10) < 8 ? 0 : [0.0, 0.80, 1.20, 12.00].sample }
     unit_quantity { rand(5) < 3 ? 1 : rand(1..20) }
+    price_per { rand(0.1..26.0).round(2) }
 
     factory :article do
       sequence(:name) { |n| Faker::Lorem.words(number: rand(2..4)).join(' ') + " ##{n}" }

spec/fixtures/bnn_file_01.bnn

@@ -0,0 +1,5 @@
+BNN;3;0;Naturkost Nord, Hamburg;T;Angebot Nr. 0922;EUR;20220905;20221001;20220825;837;1
+29932;;;;4280001958081;4280001958203;Walnoten (ongeroosterd);bio;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;1;1 kg;1;N;930190;99260;;1,41;;;;1;;;4,49;2,34;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;1;;
+28391;;;;4280001958081;4280001958203;Pijnboompitten;dem;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;1;100 g;10;N;930190;99260;;1,41;;;;1;;;5,56;2.89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;10;;
+1829;;;;4280001958081;4280001958203;Appelsap (verpakt);;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;4x250 ml;10;4x250 ml;10;N;930190;99260;;3,21;;;;1;;;4,49;2.89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;l;4;;
+177813;;;;4280001958081;4280001958203;Tomaten;bio;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;1;500 g;20;N;930190;99260;;1,20;;;;1;;;4,49;2.89;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;2;;

spec/fixtures/bnn_file_02.bnn

@@ -0,0 +1,2 @@
+BNN;3;0;Naturkost Nord, Hamburg;T;Angebot Nr. 0922;EUR;20220905;20221001;20220825;837;1
+1;;;;4280001958081;4280001958203;Tomatoes;organic;;;med;;GR;C%;DE-?KO-001;120;1302;10;55;;1;;20;500 g;1;N;930190;99260;;1,41;;;;1;;;4,49;1,20;J;;2;3;;;;;;;;;;;;;;;;;;;A;;;;;Kg;2;;

spec/fixtures/odin_file_01.xml

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xmlproduct>
+<leverancierkop>
+<leveranciersnummer>1039</leveranciersnummer>
+<versienummer>1.08</versienummer>
+<naam>Estafette Associatie C.V.</naam>
+<plaats>Geldermalsen</plaats>
+</leverancierkop>
+<product>
+<eancode>8719325207668</eancode>
+<omschrijving>Walnoten (ongeroosterd)</omschrijving>
+<kassaomschrijving>Nucli rose</kassaomschrijving>
+<plucode></plucode>
+<weegschaalartikel>0</weegschaalartikel>
+<wichtartikel>0</wichtartikel>
+<pluartikel>0</pluartikel>
+<inhoud>1</inhoud>
+<eenheid>kg</eenheid>
+<verpakkingce>Stuk</verpakkingce>
+<statiegeld>0</statiegeld>
+<merk>Het warme woud</merk>
+<kwaliteit>bio</kwaliteit>
+<keurmerkbio></keurmerkbio>
+<keurmerkoverig></keurmerkoverig>
+<herkomst>NL</herkomst>
+<herkomstregio></herkomstregio>
+<btw>6</btw>
+<cblcode>1017515</cblcode>
+<bestelnummer>29932</bestelnummer>
+<sve>10</sve>
+<status>Actief</status>
+<ingredienten>druiven*</ingredienten>
+<d204>0</d204>
+<d209>0</d209>
+<d210>2</d210>
+<d212>2</d212>
+<d213>0</d213>
+<d214>0</d214>
+<d234>0</d234>
+<d215>2</d215>
+<d239>2</d239>
+<d216>0</d216>
+<d217>2</d217>
+<d220>0</d220>
+<d221>2</d221>
+<d223>0</d223>
+<d236>2</d236>
+<d235>2</d235>
+<d238>2</d238>
+<d225>2</d225>
+<d228>1</d228>
+<d232>0</d232>
+<d237>2</d237>
+<d240>0</d240>
+<d241>2</d241>
+<d242>2</d242>
+<lengteverpakking></lengteverpakking>
+<breedteverpakking></breedteverpakking>
+<hoogteverpakking></hoogteverpakking>
+<proefdiervrij>0</proefdiervrij>
+<vegetarisch>0</vegetarisch>
+<veganistisch>0</veganistisch>
+<rauwemelk>0</rauwemelk>
+<bewaartemperatuur>1</bewaartemperatuur>
+<gebruikstips></gebruikstips>
+<soortleverancier>2</soortleverancier>
+<geriefartikel>0</geriefartikel>
+<prijs>
+<prijslijn>adviesprijs</prijslijn>
+<ingangsdatum>2022-08-18</ingangsdatum>
+<inkoopprijs>2.34</inkoopprijs>
+<consumentenprijs>7.95</consumentenprijs>
+</prijs>
+</product>
+<product>
+<eancode>8719325207668</eancode>
+<omschrijving>Pijnboompitten</omschrijving>
+<kassaomschrijving>Nucli rose</kassaomschrijving>
+<plucode></plucode>
+<weegschaalartikel>0</weegschaalartikel>
+<wichtartikel>0</wichtartikel>
+<pluartikel>0</pluartikel>
+<inhoud>100</inhoud>
+<eenheid>g</eenheid>
+<verpakkingce>Stuk</verpakkingce>
+<statiegeld>0</statiegeld>
+<merk>NELEMAN</merk>
+<kwaliteit>dem</kwaliteit>
+<keurmerkbio></keurmerkbio>
+<keurmerkoverig></keurmerkoverig>
+<herkomst>TR</herkomst>
+<herkomstregio></herkomstregio>
+<btw>6</btw>
+<cblcode>1017515</cblcode>
+<bestelnummer>28391</bestelnummer>
+<sve>10</sve>
+<status>Actief</status>
+<ingredienten>druiven*</ingredienten>
+<d204>0</d204>
+<d209>0</d209>
+<d210>2</d210>
+<d212>2</d212>
+<d213>0</d213>
+<d214>0</d214>
+<d234>0</d234>
+<d215>2</d215>
+<d239>2</d239>
+<d216>0</d216>
+<d217>2</d217>
+<d220>0</d220>
+<d221>2</d221>
+<d223>0</d223>
+<d236>2</d236>
+<d235>2</d235>
+<d238>2</d238>
+<d225>2</d225>
+<d228>1</d228>
+<d232>0</d232>
+<d237>2</d237>
+<d240>0</d240>
+<d241>2</d241>
+<d242>2</d242>
+<lengteverpakking></lengteverpakking>
+<breedteverpakking></breedteverpakking>
+<hoogteverpakking></hoogteverpakking>
+<proefdiervrij>0</proefdiervrij>
+<vegetarisch>0</vegetarisch>
+<veganistisch>0</veganistisch>
+<rauwemelk>0</rauwemelk>
+<bewaartemperatuur>1</bewaartemperatuur>
+<gebruikstips></gebruikstips>
+<soortleverancier>2</soortleverancier>
+<geriefartikel>0</geriefartikel>
+<prijs>
+<prijslijn>adviesprijs</prijslijn>
+<ingangsdatum>2022-08-18</ingangsdatum>
+<inkoopprijs>5.56</inkoopprijs>
+<consumentenprijs>7.95</consumentenprijs>
+</prijs>
+</product>
+<product>
+<eancode>8719325207668</eancode>
+<omschrijving>Appelsap (verpakt)</omschrijving>
+<kassaomschrijving>Nucli rose</kassaomschrijving>
+<plucode></plucode>
+<weegschaalartikel>0</weegschaalartikel>
+<wichtartikel>0</wichtartikel>
+<pluartikel>0</pluartikel>
+<inhoud>4x250</inhoud>
+<eenheid>ml</eenheid>
+<verpakkingce>Stuk</verpakkingce>
+<statiegeld>0.4</statiegeld>
+<merk>Appelgaarde</merk>
+<kwaliteit></kwaliteit>
+<keurmerkbio></keurmerkbio>
+<keurmerkoverig></keurmerkoverig>
+<herkomst>DE</herkomst>
+<herkomstregio></herkomstregio>
+<btw>6</btw>
+<cblcode>1017515</cblcode>
+<bestelnummer>1829</bestelnummer>
+<sve>10</sve>
+<status>Actief</status>
+<ingredienten>druiven*</ingredienten>
+<d204>0</d204>
+<d209>0</d209>
+<d210>2</d210>
+<d212>2</d212>
+<d213>0</d213>
+<d214>0</d214>
+<d234>0</d234>
+<d215>2</d215>
+<d239>2</d239>
+<d216>0</d216>
+<d217>2</d217>
+<d220>0</d220>
+<d221>2</d221>
+<d223>0</d223>
+<d236>2</d236>
+<d235>2</d235>
+<d238>2</d238>
+<d225>2</d225>
+<d228>1</d228>
+<d232>0</d232>
+<d237>2</d237>
+<d240>0</d240>
+<d241>2</d241>
+<d242>2</d242>
+<lengteverpakking></lengteverpakking>
+<breedteverpakking></breedteverpakking>
+<hoogteverpakking></hoogteverpakking>
+<proefdiervrij>0</proefdiervrij>
+<vegetarisch>0</vegetarisch>
+<veganistisch>0</veganistisch>
+<rauwemelk>0</rauwemelk>
+<bewaartemperatuur>1</bewaartemperatuur>
+<gebruikstips></gebruikstips>
+<soortleverancier>2</soortleverancier>
+<geriefartikel>0</geriefartikel>
+<prijs>
+<prijslijn>adviesprijs</prijslijn>
+<ingangsdatum>2022-08-18</ingangsdatum>
+<inkoopprijs>3.21</inkoopprijs>
+<consumentenprijs>7.95</consumentenprijs>
+</prijs>
+</product>
+<product>
+<eancode>8719325207668</eancode>
+<omschrijving>Tomaten</omschrijving>
+<kassaomschrijving>Nucli rose</kassaomschrijving>
+<plucode></plucode>
+<weegschaalartikel>0</weegschaalartikel>
+<wichtartikel>0</wichtartikel>
+<pluartikel>0</pluartikel>
+<inhoud>500</inhoud>
+<eenheid>g</eenheid>
+<verpakkingce>Stuk</verpakkingce>
+<statiegeld>0</statiegeld>
+<merk>De röde hof</merk>
+<kwaliteit>bio</kwaliteit>
+<keurmerkbio></keurmerkbio>
+<keurmerkoverig></keurmerkoverig>
+<herkomst>DE</herkomst>
+<herkomstregio></herkomstregio>
+<btw>6</btw>
+<cblcode>1017515</cblcode>
+<bestelnummer>177813</bestelnummer>
+<sve>20</sve>
+<status>Actief</status>
+<ingredienten>druiven*</ingredienten>
+<d204>0</d204>
+<d209>0</d209>
+<d210>2</d210>
+<d212>2</d212>
+<d213>0</d213>
+<d214>0</d214>
+<d234>0</d234>
+<d215>2</d215>
+<d239>2</d239>
+<d216>0</d216>
+<d217>2</d217>
+<d220>0</d220>
+<d221>2</d221>
+<d223>0</d223>
+<d236>2</d236>
+<d235>2</d235>
+<d238>2</d238>
+<d225>2</d225>
+<d228>1</d228>
+<d232>0</d232>
+<d237>2</d237>
+<d240>0</d240>
+<d241>2</d241>
+<d242>2</d242>
+<lengteverpakking></lengteverpakking>
+<breedteverpakking></breedteverpakking>
+<hoogteverpakking></hoogteverpakking>
+<proefdiervrij>0</proefdiervrij>
+<vegetarisch>0</vegetarisch>
+<veganistisch>0</veganistisch>
+<rauwemelk>0</rauwemelk>
+<bewaartemperatuur>1</bewaartemperatuur>
+<gebruikstips></gebruikstips>
+<soortleverancier>2</soortleverancier>
+<geriefartikel>0</geriefartikel>
+<prijs>
+<prijslijn>adviesprijs</prijslijn>
+<ingangsdatum>2022-08-18</ingangsdatum>
+<inkoopprijs>1.2</inkoopprijs>
+<consumentenprijs>7.95</consumentenprijs>
+</prijs>
+</product>
+</xmlproduct>

spec/fixtures/odin_file_02.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xmlproduct>
+<leverancierkop>
+<leveranciersnummer>1039</leveranciersnummer>
+<versienummer>1.08</versienummer>
+<naam>Estafette Associatie C.V.</naam>
+<plaats>Geldermalsen</plaats>
+</leverancierkop>
+<product>
+<eancode>8719325207668</eancode>
+<omschrijving>Tomatoes</omschrijving>
+<kassaomschrijving>Nucli rose</kassaomschrijving>
+<plucode></plucode>
+<weegschaalartikel>0</weegschaalartikel>
+<wichtartikel>0</wichtartikel>
+<pluartikel>0</pluartikel>
+<inhoud>500</inhoud>
+<eenheid>g</eenheid>
+<verpakkingce>Stuk</verpakkingce>
+<statiegeld>0</statiegeld>
+<merk>De röde hof</merk>
+<kwaliteit>organic</kwaliteit>
+<keurmerkbio></keurmerkbio>
+<keurmerkoverig></keurmerkoverig>
+<herkomst>Somewhere, UK</herkomst>
+<herkomstregio></herkomstregio>
+<btw>6</btw>
+<cblcode>1017515</cblcode>
+<bestelnummer>1</bestelnummer>
+<sve>20</sve>
+<status>Actief</status>
+<ingredienten>druiven*</ingredienten>
+<d204>0</d204>
+<d209>0</d209>
+<d210>2</d210>
+<d212>2</d212>
+<d213>0</d213>
+<d214>0</d214>
+<d234>0</d234>
+<d215>2</d215>
+<d239>2</d239>
+<d216>0</d216>
+<d217>2</d217>
+<d220>0</d220>
+<d221>2</d221>
+<d223>0</d223>
+<d236>2</d236>
+<d235>2</d235>
+<d238>2</d238>
+<d225>2</d225>
+<d228>1</d228>
+<d232>0</d232>
+<d237>2</d237>
+<d240>0</d240>
+<d241>2</d241>
+<d242>2</d242>
+<lengteverpakking></lengteverpakking>
+<breedteverpakking></breedteverpakking>
+<hoogteverpakking></hoogteverpakking>
+<proefdiervrij>0</proefdiervrij>
+<vegetarisch>0</vegetarisch>
+<veganistisch>0</veganistisch>
+<rauwemelk>0</rauwemelk>
+<bewaartemperatuur>1</bewaartemperatuur>
+<gebruikstips></gebruikstips>
+<soortleverancier>2</soortleverancier>
+<geriefartikel>0</geriefartikel>
+<prijs>
+<prijslijn>adviesprijs</prijslijn>
+<ingangsdatum>2022-08-18</ingangsdatum>
+<inkoopprijs>1.2</inkoopprijs>
+<consumentenprijs>7.95</consumentenprijs>
+</prijs>
+</product>
+</xmlproduct>

spec/integration/articles_spec.rb

@@ -1,9 +1,9 @@
 require_relative '../spec_helper'
 
 feature ArticlesController do
-  let(:user) { create :user, groups: [create(:workgroup, role_article_meta: true)] }
-  let(:supplier) { create :supplier }
-  let!(:article_category) { create :article_category }
+  let(:user) { create(:user, groups: [create(:workgroup, role_article_meta: true)]) }
+  let(:supplier) { create(:supplier) }
+  let!(:article_category) { create(:article_category) }
 
   before { login user }
 
@@ -18,7 +18,7 @@ feature ArticlesController do
     it 'can create a new article' do
       click_on I18n.t('articles.index.new')
       expect(page).to have_selector('form#new_article')
-      article = build :article, supplier: supplier, article_category: article_category
+      article = build(:article, supplier: supplier, article_category: article_category)
       within('#new_article') do
         fill_in 'article_name', :with => article.name
         fill_in 'article_unit', :with => article.unit
@@ -49,6 +49,7 @@ feature ArticlesController do
         let(:file) { Rails.root.join(test_file) }
 
         it do
+          find("#articles_type option[value='foodsoft']").select_option
           find('input[type="submit"]').click
           expect(find("tr:nth-child(1) #new_articles__note").value).to eq "bio ◎"
           expect(find("tr:nth-child(2) #new_articles__name").value).to eq "Pijnboompitten"
@@ -64,56 +65,99 @@ feature ArticlesController do
       end
     end
 
-    describe "can update existing article" do
-      let!(:article) { create :article, supplier: supplier, name: 'Foobar', order_number: 1, unit: '250 g' }
+    Dir.glob('spec/fixtures/bnn_file_01.*') do |test_file|
+      describe "can import articles from #{test_file}" do
+        let(:file) { Rails.root.join(test_file) }
 
-      it do
-        find('input[type="submit"]').click
-        expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes'
-        find('input[type="submit"]').click
-        article.reload
-        expect(article.name).to eq 'Tomatoes'
-        expect([article.unit, article.unit_quantity, article.price]).to eq ['500 g', 20, 1.2]
+        it do
+          find("#articles_type option[value='bnn']").select_option
+          find('input[type="submit"]').click
+          expect(find("tr:nth-child(1) #new_articles__note").value).to eq "bio"
+          expect(find("tr:nth-child(1) #new_articles__name").value).to eq "Walnoten (ongeroosterd)"
+          # set article category
+          4.times do |i|
+            all("tr:nth-child(#{i + 1}) select > option")[1].select_option
+          end
+          find('input[type="submit"]').click
+
+          expect(page).to have_content("Pijnboompitten")
+
+          expect(supplier.articles.count).to eq 4
+        end
       end
     end
+  end
 
-    describe "handles missing data" do
-      it do
-        find('input[type="submit"]').click # to overview
-        find('input[type="submit"]').click # missing category, re-show form
-        expect(find('tr.alert')).to be_present
-        expect(supplier.articles.count).to eq 0
+  describe "updates" do
+    file_paths = ['spec/fixtures/foodsoft_file_02.csv', 'spec/fixtures/bnn_file_02.bnn', 'spec/fixtures/odin_file_02.xml']
+    let(:filename) { 'foodsoft_file_02.csv' }
+    let(:file)     { Rails.root.join("spec/fixtures/#{filename}") }
+    let(:val) { 'foodsoft' }
+    let(:type) { %w[foodsoft bnn odin] }
 
-        all("tr select > option")[1].select_option
-        find('input[type="submit"]').click # now it should succeed
-        expect(supplier.articles.count).to eq 1
-      end
+    before do
+      visit upload_supplier_articles_path(supplier_id: supplier.id)
+      attach_file 'articles_file', file
+      find("#articles_type option[value='#{val}']").select_option
     end
 
-    describe "can remove an existing article" do
-      let!(:article) { create :article, supplier: supplier, name: 'Foobar', order_number: 99999 }
+    file_paths.each_with_index do |test_file, index|
+      describe "updates article for #{test_file}" do
+        let(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 1, unit: '250 g') }
+        let(:file) { Rails.root.join(test_file) }
+        let(:val) { type[index] }
 
-      it do
-        check('articles_outlist_absent')
-        find('input[type="submit"]').click
-        expect(find("#outlisted_articles_#{article.id}", visible: :all)).to be_present
+        it do
+          article.reload
+          find('input[type="submit"]').click
+          expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes'
+          find('input[type="submit"]').click
+          article.reload
+          expect(article.name).to eq 'Tomatoes'
+          if type[index] == "odin"
+            expect([article.unit, article.unit_quantity, article.price]).to eq ['500gr', 20, 1.20]
+          else
+            expect([article.unit, article.unit_quantity, article.price]).to eq ['500 g', 20, 1.20]
+          end
+        end
 
-        all("tr select > option")[1].select_option
-        find('input[type="submit"]').click
-        expect(article.reload.deleted?).to be true
+        it "handles missing data" do
+          find('input[type="submit"]').click # to overview
+          find('input[type="submit"]').click # missing category, re-show form
+          expect(find('tr.alert')).to be_present
+          expect(supplier.articles.count).to eq 0
+
+          all("tr select > option")[1].select_option
+          find('input[type="submit"]').click # now it should succeed
+          expect(supplier.articles.count).to eq 1
+        end
       end
-    end
 
-    describe "can convert units when updating" do
-      let!(:article) { create :article, supplier: supplier, order_number: 1, unit: '250 g' }
+      describe "can remove an existing article" do
+        let!(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 99999) }
 
-      it do
-        check('articles_convert_units')
-        find('input[type="submit"]').click
-        expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes'
-        find('input[type="submit"]').click
-        article.reload
-        expect([article.unit, article.unit_quantity, article.price]).to eq ['250 g', 40, 0.6]
+        it do
+          check('articles_outlist_absent')
+          find('input[type="submit"]').click
+          expect(find("#outlisted_articles_#{article.id}", visible: :all)).to be_present
+
+          all("tr select > option")[1].select_option
+          find('input[type="submit"]').click
+          expect(article.reload.deleted?).to be true
+        end
+      end
+
+      describe "can convert units when updating" do
+        let!(:article) { create(:article, supplier: supplier, order_number: 1, unit: '250 g') }
+
+        it do
+          check('articles_convert_units')
+          find('input[type="submit"]').click
+          expect(find("#articles_#{article.id}_name").value).to eq 'Tomatoes'
+          find('input[type="submit"]').click
+          article.reload
+          expect([article.unit, article.unit_quantity, article.price]).to eq ['250 g', 40, 0.6]
+        end
       end
     end
   end

spec/models/supplier_spec.rb

@@ -11,7 +11,7 @@ describe Supplier do
       options = { filename: 'foodsoft_file_01.csv' }
       options[:outlist_absent] = true
       options[:convert_units] = true
-      updated_article_pairs, outlisted_articles, new_articles = supplier.sync_from_file(Rails.root.join('spec/fixtures/foodsoft_file_01.csv'), options)
+      updated_article_pairs, outlisted_articles, new_articles = supplier.sync_from_file(Rails.root.join('spec/fixtures/foodsoft_file_01.csv'), "foodsoft", options)
       expect(new_articles.length).to be > 0
       expect(updated_article_pairs.first[1][:name]).to eq 'Tomaten'
       expect(outlisted_articles.first).to eq article2