this merge breaks alot
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
commit
f4f61f02db
|
@ -46,6 +46,11 @@ class ArticlesController < ApplicationController
|
|||
render :layout => false
|
||||
end
|
||||
|
||||
def edit
|
||||
@article = Article.find(params[:id])
|
||||
render :action => 'new', :layout => false
|
||||
end
|
||||
|
||||
def create
|
||||
@article = Article.new(params[:article])
|
||||
if @article.valid? && @article.save
|
||||
|
@ -55,11 +60,6 @@ class ArticlesController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
@article = Article.find(params[:id])
|
||||
render :action => 'new', :layout => false
|
||||
end
|
||||
|
||||
# Updates one Article and highlights the line if succeded
|
||||
def update
|
||||
@article = Article.find(params[:id])
|
||||
|
@ -152,6 +152,7 @@ class ArticlesController < ApplicationController
|
|||
options = { filename: uploaded_file.original_filename }
|
||||
options[:outlist_absent] = (params[:articles]['outlist_absent'] == '1')
|
||||
options[:convert_units] = (params[:articles]['convert_units'] == '1')
|
||||
options[:update_category] = (params[:articles]['update_category'] == '1')
|
||||
@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')
|
||||
|
|
|
@ -143,20 +143,24 @@ class Article < ApplicationRecord
|
|||
new_unit = new_article.unit
|
||||
end
|
||||
|
||||
return Article.compare_attributes(
|
||||
{
|
||||
:name => [self.name, new_article.name],
|
||||
:manufacturer => [self.manufacturer, new_article.manufacturer.to_s],
|
||||
:origin => [self.origin, new_article.origin],
|
||||
:unit => [self.unit, new_unit],
|
||||
: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)],
|
||||
# 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]
|
||||
}
|
||||
)
|
||||
attribute_hash = {
|
||||
:name => [self.name, new_article.name],
|
||||
:manufacturer => [self.manufacturer, new_article.manufacturer.to_s],
|
||||
:origin => [self.origin, new_article.origin],
|
||||
:unit => [self.unit, new_unit],
|
||||
: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)],
|
||||
# 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]
|
||||
}
|
||||
if options[:update_category] == true
|
||||
new_article_category = new_article.article_category
|
||||
attribute_hash[:article_category] = [self.article_category, new_article_category] unless new_article_category.blank?
|
||||
end
|
||||
|
||||
Article.compare_attributes(attribute_hash)
|
||||
end
|
||||
|
||||
# Compare attributes from two different articles.
|
||||
|
|
|
@ -85,7 +85,13 @@ class Supplier < ApplicationRecord
|
|||
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])
|
||||
|
||||
if new_attrs[:article_category].present? && options[:update_category]
|
||||
new_attrs[:article_category] = ArticleCategory.find_match(new_attrs[:article_category]) || ArticleCategory.create_or_find_by!(name: new_attrs[:article_category])
|
||||
else
|
||||
new_attrs[:article_category] = nil
|
||||
end
|
||||
|
||||
new_attrs[:tax] ||= FoodsoftConfig[:tax_default]
|
||||
new_article = articles.build(new_attrs)
|
||||
|
||||
|
@ -93,7 +99,7 @@ class Supplier < ApplicationRecord
|
|||
if article.nil?
|
||||
new_articles << new_article
|
||||
else
|
||||
unequal_attributes = article.unequal_attributes(new_article, options.slice(:convert_units))
|
||||
unequal_attributes = article.unequal_attributes(new_article, options.slice(:convert_units, :update_category))
|
||||
unless unequal_attributes.empty?
|
||||
article.attributes = unequal_attributes
|
||||
updated_article_pairs << [article, unequal_attributes]
|
||||
|
|
|
@ -49,7 +49,8 @@
|
|||
.input-prepend
|
||||
%span.add-on= t 'number.currency.format.unit'
|
||||
= form.text_field 'deposit', class: 'input-mini', style: 'width: 45px'
|
||||
%td= form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] },
|
||||
%td{:style => highlight_new(attrs, :article_category)}
|
||||
= form.select :article_category_id, ArticleCategory.all.map {|a| [ a.name, a.id ] },
|
||||
{include_blank: true}, class: 'input-small'
|
||||
- unless changed_article.errors.empty?
|
||||
%tr.alert
|
||||
|
|
|
@ -81,6 +81,9 @@
|
|||
=f.collection_select :type, ["bnn","foodsoft","odin"], :to_s, :to_s
|
||||
|
||||
.control-group
|
||||
%label(for="articles_update_category")
|
||||
= f.check_box "update_category"
|
||||
= t '.options.update_category'
|
||||
%label(for="articles_outlist_absent")
|
||||
= f.check_box "outlist_absent"
|
||||
= t '.options.outlist_absent'
|
||||
|
|
|
@ -568,6 +568,7 @@ de:
|
|||
options:
|
||||
convert_units: Derzeitige Einheiten beibehalten, berechne Mengeneinheit und Preis (wie Synchronisieren).
|
||||
outlist_absent: Artikel löschen, die nicht in der hochgeladenen Datei sind.
|
||||
update_category: Kategorien aus der Datei übernehmen und erstellen.
|
||||
sample:
|
||||
juices: Säfte
|
||||
nuts: Nüsse
|
||||
|
|
|
@ -569,6 +569,7 @@ en:
|
|||
options:
|
||||
convert_units: Keep current units, recompute unit quantity and price (like synchronize).
|
||||
outlist_absent: Delete articles not in uploaded file.
|
||||
update_category: Create and replace categories from uploaded file.
|
||||
sample:
|
||||
juices: Juices
|
||||
nuts: Nuts
|
||||
|
|
|
@ -515,6 +515,7 @@ es:
|
|||
options:
|
||||
convert_units: Mantener unidades actuales, recomputar la cantidad y precio de unidades (como sincronizar).
|
||||
outlist_absent: Borrar artículos que no están en el archivo subido.
|
||||
update_category: Toma las categorías del archivo subido.
|
||||
sample:
|
||||
juices: Jugos
|
||||
nuts: Nueces
|
||||
|
|
|
@ -539,6 +539,7 @@ nl:
|
|||
options:
|
||||
convert_units: Bestaande eenheden behouden, herbereken groothandelseenheid en prijs (net als synchronizeren).
|
||||
outlist_absent: Artikelen die niet in het bestand voorkomen, verwijderen.
|
||||
upload_category: Categorieën overnemen uit bestand.
|
||||
sample:
|
||||
juices: Sappen
|
||||
nuts: Noten
|
||||
|
|
|
@ -133,6 +133,31 @@ feature ArticlesController do
|
|||
end
|
||||
end
|
||||
|
||||
describe "takes over category from file" do
|
||||
it do
|
||||
find(:css, '#articles_update_category[value="1"]').set(true) # check take over category from file
|
||||
expect(ArticleCategory.count).to eq 1 # new Category vegetables should be created from file
|
||||
find('input[type="submit"]').click # upload file
|
||||
find('input[type="submit"]').click # submit changes
|
||||
expect(ArticleCategory.count).to eq 2 # it is
|
||||
expect(supplier.articles.count).to eq 1
|
||||
expect(supplier.articles.first.article_category.name).to eq "Vegetables"
|
||||
end
|
||||
end
|
||||
|
||||
describe "overwrites article_category from file" do
|
||||
let!(:article_category) { create(:article_category, name: "Fruit") }
|
||||
let(:article) { create(:article, supplier: supplier, name: 'Tomatoes', order_number: 1, unit: '250 g', article_category: article_category) }
|
||||
|
||||
it do
|
||||
find(:css, '#articles_update_category[value="1"]').set(true) # check take over category from file
|
||||
find('input[type="submit"]').click #upload file
|
||||
find('input[type="submit"]').click #submit changes
|
||||
expect(supplier.articles.count).to eq 1
|
||||
expect(supplier.articles.first.article_category.name).to eq "Vegetables"
|
||||
end
|
||||
end
|
||||
|
||||
describe "can remove an existing article" do
|
||||
let!(:article) { create(:article, supplier: supplier, name: 'Foobar', order_number: 99999) }
|
||||
|
||||
|
|
Loading…
Reference in New Issue