From a92a51d88af11237bc66b69fe202bfa643c6d504 Mon Sep 17 00:00:00 2001
From: viehlieb <pf@pragma-shift.net>
Date: Tue, 31 Jan 2023 15:25:36 +0100
Subject: [PATCH] include foodsoft-article-import

---
 Gemfile                |  2 ++
 Gemfile.lock           | 12 +++++++++++-
 app/models/supplier.rb |  7 +++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 42ac26db..1fda1f10 100644
--- a/Gemfile
+++ b/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: 'v0.1'
 gem 'roo'
 gem 'roo-xls'
 gem 'spreadsheet'
diff --git a/Gemfile.lock b/Gemfile.lock
index f55e3397..0c9eaf3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://git.local-it.org/Foodsoft/foodsoft_article_import
+  revision: c7e432c247ca6aa327ae889d22f78227efed2479
+  tag: v0.1
+  specs:
+    foodsoft_article_import (1.0.0)
+      roo (~> 2.9.0)
+      simplecov
+
 GIT
   remote: https://github.com/gregschmit/recurring_select
   revision: 29febc4c4abdd6c30636c33a7d2daecb09973ecf
@@ -615,6 +624,7 @@ DEPENDENCIES
   exception_notification
   factory_bot_rails
   faker
+  foodsoft_article_import!
   foodsoft_discourse!
   foodsoft_documents!
   foodsoft_links!
@@ -686,4 +696,4 @@ DEPENDENCIES
   whenever
 
 BUNDLED WITH
-   2.4.3
+   2.4.2
diff --git a/app/models/supplier.rb b/app/models/supplier.rb
index 862f5c24..4d9253bf 100644
--- a/app/models/supplier.rb
+++ b/app/models/supplier.rb
@@ -1,3 +1,4 @@
+require 'foodsoft_article_import'
 class Supplier < ApplicationRecord
   include MarkAsDeletedWithName
   include CustomFields
@@ -76,10 +77,12 @@ class Supplier < ApplicationRecord
   # @param options [Hash] Options passed to {FoodsoftFile#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")
+    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, options: options) 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]