Linearize and clean up delivery form
This commit is contained in:
parent
bf32e72414
commit
dd70b84ef0
16 changed files with 170 additions and 155 deletions
|
@ -142,9 +142,6 @@ $(function() {
|
||||||
// Sort tables with a default sort
|
// Sort tables with a default sort
|
||||||
$('.sorter-bar.default-sort-asc button:nth-child(1)').trigger('click');
|
$('.sorter-bar.default-sort-asc button:nth-child(1)').trigger('click');
|
||||||
$('.sorter-bar.default-sort-desc button:nth-child(2)').trigger('click');
|
$('.sorter-bar.default-sort-desc button:nth-child(2)').trigger('click');
|
||||||
|
|
||||||
// Translate Select2 messages - could be done in another place, right?
|
|
||||||
$.fn.select2.defaults.formatNoMatches = function () { return "-"; };
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// compare two elements interpreted as text
|
// compare two elements interpreted as text
|
||||||
|
|
|
@ -48,6 +48,12 @@ body {
|
||||||
font-size: @baseFontSize;
|
font-size: @baseFontSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Do not use additional margin for input in table
|
||||||
|
.form-horizontal .control-group.control-group-intable,
|
||||||
|
.form-horizontal .controls.controls-intable {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
@mainRedColor: #ED0606;
|
@mainRedColor: #ED0606;
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
|
|
|
@ -13,6 +13,7 @@ class DeliveriesController < ApplicationController
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@delivery = @supplier.deliveries.build
|
@delivery = @supplier.deliveries.build
|
||||||
|
@delivery.delivered_on = Date.today #TODO: move to model/database
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
@ -60,12 +61,12 @@ class DeliveriesController < ApplicationController
|
||||||
unless old_article.nil?
|
unless old_article.nil?
|
||||||
@stock_article = old_article.dup
|
@stock_article = old_article.dup
|
||||||
else
|
else
|
||||||
@stock_article = @supplier.stock_articles.build
|
@stock_article = @supplier.stock_articles.build(params[:stock_article])
|
||||||
end
|
end
|
||||||
render :layout => false
|
render :layout => false
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_stock_article
|
def create_stock_article
|
||||||
@stock_article = StockArticle.new(params[:stock_article])
|
@stock_article = StockArticle.new(params[:stock_article])
|
||||||
|
|
||||||
if @stock_article.valid? and @stock_article.save
|
if @stock_article.valid? and @stock_article.save
|
||||||
|
|
|
@ -10,16 +10,19 @@ module DeliveriesHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def stock_articles_for_select(supplier)
|
def articles_for_select2(supplier)
|
||||||
supplier.stock_articles.undeleted.reorder('articles.name ASC').map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }
|
supplier.articles.undeleted.reorder('articles.name ASC').map {|a| {:id => a.id, :text => "#{a.name} (#{number_to_currency a.price}/#{a.unit})"} }
|
||||||
end
|
|
||||||
|
|
||||||
def articles_for_select(supplier)
|
|
||||||
supplier.articles.undeleted.reorder('articles.name ASC').map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }.unshift(['', nil])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def stock_articles_for_table(supplier)
|
def stock_articles_for_table(supplier)
|
||||||
supplier.stock_articles.undeleted.reorder('articles.name COLLATE NOCASE ASC')
|
supplier.stock_articles.undeleted.reorder('articles.name COLLATE NOCASE ASC')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def stock_change_remove_link(stock_change_form)
|
||||||
|
return link_to t('.remove_article'), "#", :class => 'remove_new_stock_change btn btn-small' if stock_change_form.object.new_record?
|
||||||
|
output = stock_change_form.hidden_field :_destroy
|
||||||
|
output += link_to t('.remove_article'), "#", :class => 'destroy_stock_change btn btn-small'
|
||||||
|
return output.html_safe
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -16,18 +16,48 @@
|
||||||
unmark_article_unavailable_for_delivery( stock_change.data('id') );
|
unmark_article_unavailable_for_delivery( stock_change.data('id') );
|
||||||
return false;
|
return false;
|
||||||
})
|
})
|
||||||
$('#copy_from_article').select2({
|
|
||||||
placeholder: '#{t '.copy_order_article'}',
|
$('#new_stock_article').removeAttr('disabled').select2({
|
||||||
allowClear: true
|
placeholder: '#{t '.create_stock_article'}',
|
||||||
|
data: #{articles_for_select2(@supplier).to_json},
|
||||||
|
createSearchChoice: function(term) {
|
||||||
|
return {
|
||||||
|
id: 'new',
|
||||||
|
text: term
|
||||||
|
};
|
||||||
|
},
|
||||||
|
formatResult: function(result, container, query, escapeMarkup) {
|
||||||
|
if(result.id == 'new') {
|
||||||
|
return result.text + ' (#{t '.create_from_blank'})';
|
||||||
|
}
|
||||||
|
var markup=[];
|
||||||
|
Select2.util.markMatch(result.text, query.term, markup, escapeMarkup);
|
||||||
|
return markup.join("");
|
||||||
|
}
|
||||||
}).on('change', function(e) {
|
}).on('change', function(e) {
|
||||||
if(e.val != '') {
|
var selectedArticle = $(e.currentTarget).select2('data');
|
||||||
|
if(!selectedArticle) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if('new' == selectedArticle.id) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: '#{new_stock_article_supplier_deliveries_path(@supplier)}',
|
url: '#{new_stock_article_supplier_deliveries_path(@supplier)}',
|
||||||
type: 'get',
|
type: 'get',
|
||||||
data: {old_article_id: e.val},
|
data: {stock_article: {name: selectedArticle.text}},
|
||||||
contentType: 'application/json; charset=UTF-8'
|
contentType: 'application/json; charset=UTF-8'
|
||||||
});
|
});
|
||||||
$('#copy_from_article').select2('data', null);
|
$('#new_stock_article').select2('data', null);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if('' != selectedArticle.id) {
|
||||||
|
$.ajax({
|
||||||
|
url: '#{new_stock_article_supplier_deliveries_path(@supplier)}',
|
||||||
|
type: 'get',
|
||||||
|
data: {old_article_id: selectedArticle.id},
|
||||||
|
contentType: 'application/json; charset=UTF-8'
|
||||||
|
});
|
||||||
|
$('#new_stock_article').select2('data', null);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -47,28 +77,20 @@
|
||||||
return articleTr.hasClass('unavailable');
|
return articleTr.hasClass('unavailable');
|
||||||
}
|
}
|
||||||
|
|
||||||
-# remove validate true for the form, because it disabled html5 validation
|
= simple_form_for [@supplier, @delivery], validate: true do |f|
|
||||||
-# is there anything broken with the simple_form validation? (bootstrap issue?)
|
|
||||||
= simple_form_for [@supplier, @delivery] do |f|
|
|
||||||
= f.hidden_field :supplier_id
|
= f.hidden_field :supplier_id
|
||||||
.row-fluid
|
|
||||||
|
|
||||||
.span6
|
|
||||||
%h2= t '.title_select_stock_articles'
|
%h2= t '.title_select_stock_articles'
|
||||||
.well.well-small
|
.well.well-small
|
||||||
.btn-toolbar
|
.btn-toolbar
|
||||||
.btn-group
|
.btn-group
|
||||||
= link_to t('.new_stock_article'), new_stock_article_supplier_deliveries_path(@supplier), remote: true, class: 'btn'
|
%input#new_stock_article{:style => 'width: 500px;'}
|
||||||
= select_tag(:copy_from_article, options_for_select(articles_for_select(@supplier)))
|
|
||||||
%table.table.table-condensed.table-hover#stock_articles_for_adding
|
%table.table.table-condensed.table-hover#stock_articles_for_adding
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th
|
%th
|
||||||
= t '.article'
|
= t '.article'
|
||||||
%span.sorter-bar.default-sort-asc{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-name'}}
|
%span.sorter-bar.default-sort-asc{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-name'}}
|
||||||
%th= t '.unit'
|
|
||||||
%th= t '.price'
|
%th= t '.price'
|
||||||
%th= t '.vat'
|
|
||||||
%th
|
%th
|
||||||
= t '.category'
|
= t '.category'
|
||||||
%span.sorter-bar{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-category'}}
|
%span.sorter-bar{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-category'}}
|
||||||
|
@ -77,33 +99,19 @@
|
||||||
- for article in stock_articles_for_table(@supplier)
|
- for article in stock_articles_for_table(@supplier)
|
||||||
= render :partial => 'stock_article_for_adding', :locals => {:article => article}
|
= render :partial => 'stock_article_for_adding', :locals => {:article => article}
|
||||||
|
|
||||||
.span6
|
|
||||||
%h2= t '.title_fill_quantities'
|
%h2= t '.title_fill_quantities'
|
||||||
<!-- = f.inspect -->
|
|
||||||
%table.table.table-condensed#stock_changes
|
%table.table.table-condensed#stock_changes
|
||||||
%thead
|
%thead
|
||||||
%tr
|
%tr
|
||||||
%th
|
%th
|
||||||
= t '.article'
|
= t '.article'
|
||||||
%span.sorter-bar.default-sort-asc{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-name'}}
|
%span.sorter-bar.default-sort-asc{:data => {'compare-function' => 'compareText', 'sort-criterion' => 'sort-by-name'}}
|
||||||
%th= t '.price_per_unit'
|
%th= t '.price'
|
||||||
%th= t '.quantity'
|
%th= t '.quantity'
|
||||||
%th= t '.actions'
|
%th= t '.actions'
|
||||||
%tbody
|
%tbody
|
||||||
-# see also the partial 'stock_change' which is used for AJAX updates!
|
|
||||||
-# see also the partial 'stock_change' which is used for AJAX updates!
|
|
||||||
-# see also the partial 'stock_change' which is used for AJAX updates!
|
|
||||||
= f.simple_fields_for :stock_changes do |stock_change_form|
|
= f.simple_fields_for :stock_changes do |stock_change_form|
|
||||||
- stock_change = stock_change_form.object
|
= render :partial => 'stock_change_fields', :locals => {:f => stock_change_form}
|
||||||
%tr{:id => "stock_change_stock_article_#{stock_change.stock_article.id}", :data => {:id => stock_change.stock_article.id}}
|
|
||||||
%td.sort-by-name
|
|
||||||
= stock_change_form.association :stock_article, :as => :hidden
|
|
||||||
%span.stock_article_name= stock_change.stock_article.name
|
|
||||||
%td.numeric.price-per-unit #{number_to_currency stock_change.stock_article.price}/#{stock_change.stock_article.unit}
|
|
||||||
%td= stock_change_form.input :quantity, :wrapper => :intable, :input_html => {:class => 'stock-change-quantity', :autocomplete => :off}
|
|
||||||
%td
|
|
||||||
= stock_change_form.hidden_field :_destroy
|
|
||||||
= link_to t('.remove_article'), "#", :class => 'destroy_stock_change btn btn-small'
|
|
||||||
|
|
||||||
%h2= t '.title_finish_delivery'
|
%h2= t '.title_finish_delivery'
|
||||||
= f.input :delivered_on, as: :date_picker
|
= f.input :delivered_on, as: :date_picker
|
||||||
|
|
|
@ -1,16 +1,11 @@
|
||||||
- css_class = ( @delivery and @delivery.includes_article? article ) ? ( 'unavailable' ) : ( false )
|
- css_class = ( @delivery and @delivery.includes_article? article ) ? ( 'unavailable' ) : ( false )
|
||||||
%tr{:id => "stock_article_#{article.id}", :class => css_class}
|
%tr{:id => "stock_article_#{article.id}", :class => css_class}
|
||||||
%td.sort-by-name
|
%td.sort-by-name= article.name
|
||||||
= article.name
|
%td #{number_to_currency article.price}/#{article.unit}
|
||||||
%td.numeric= article.unit
|
|
||||||
%td.numeric= number_to_currency article.price
|
|
||||||
%td.numeric= number_to_percentage article.tax
|
|
||||||
%td.sort-by-category= article.article_category.name
|
%td.sort-by-category= article.article_category.name
|
||||||
%td
|
%td
|
||||||
.btn-group
|
.btn-group
|
||||||
= link_to t('.action_edit'), edit_stock_article_supplier_deliveries_path(@supplier, :stock_article_id => article.id), remote: true, class: 'btn btn-mini'
|
= link_to t('.action_edit'), edit_stock_article_supplier_deliveries_path(@supplier, :stock_article_id => article.id), remote: true, class: 'btn btn-mini'
|
||||||
= link_to t('.action_other_price'), new_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => article.id), remote: true, class: 'btn btn-mini'
|
= link_to t('.action_other_price'), new_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => article.id), remote: true, class: 'btn btn-mini'
|
||||||
- if @delivery and @delivery.includes_article? article
|
- deliver_button_disabled = ( @delivery and @delivery.includes_article? article ) ? ( 'disabled' ) : ( false )
|
||||||
= link_to t('.action_add_to_delivery'), add_stock_change_supplier_deliveries_path(@supplier, :stock_article_id => article.id), :method => :post, remote: true, class: 'button-add-stock-change btn btn-mini', disabled: 'disabled'
|
= link_to t('.action_add_to_delivery'), add_stock_change_supplier_deliveries_path(@supplier, :stock_article_id => article.id), :method => :post, remote: true, class: 'button-add-stock-change btn btn-mini btn-primary', disabled: deliver_button_disabled
|
||||||
- else
|
|
||||||
= link_to t('.action_add_to_delivery'), add_stock_change_supplier_deliveries_path(@supplier, :stock_article_id => article.id), :method => :post, remote: true, class: 'button-add-stock-change btn btn-mini'
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
- url = ( stock_article.new_record? ) ? ( add_stock_article_supplier_deliveries_path(@supplier) ) : ( update_stock_article_supplier_deliveries_path(@supplier) )
|
- url = ( stock_article.new_record? ) ? ( create_stock_article_supplier_deliveries_path(@supplier) ) : ( update_stock_article_supplier_deliveries_path(@supplier) )
|
||||||
= simple_form_for stock_article, url: url, remote: true do |f|
|
= simple_form_for stock_article, url: url, remote: true, validate: true do |f|
|
||||||
= f.hidden_field :supplier_id
|
= f.association :supplier, :as => :hidden
|
||||||
- unless stock_article.new_record?
|
= f.hidden_field :id unless stock_article.new_record?
|
||||||
= f.hidden_field :id
|
|
||||||
.modal-header
|
.modal-header
|
||||||
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
|
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
|
||||||
%h3= t 'activerecord.models.stock_article'
|
%h3= t 'activerecord.models.stock_article'
|
||||||
|
@ -21,4 +20,4 @@
|
||||||
= f.association :article_category
|
= f.association :article_category
|
||||||
.modal-footer
|
.modal-footer
|
||||||
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
|
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
|
||||||
= f.submit class: 'btn btn-primary'
|
= f.submit :class => 'btn btn-primary', 'data-disable-with' => t('ui.please_wait')
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
-# see also the partial 'form' which is used for existing stock_changes when loading the edit!
|
- if stock_change.stock_article.new_record?
|
||||||
-# see also the partial 'form' which is used for existing stock_changes when loading the edit!
|
= simple_fields_for "delivery[new_stock_changes_new_stock_article][]", stock_change do |f|
|
||||||
-# see also the partial 'form' which is used for existing stock_changes when loading the edit!
|
= render :partial => 'stock_change_fields', :locals => {:f => f}
|
||||||
= simple_fields_for "delivery[new_stock_changes][]", stock_change, validate: true do |f|
|
- else
|
||||||
- f.object.quantity = '' if 0 == f.object.quantity
|
= simple_fields_for "delivery[new_stock_changes][]", stock_change do |f|
|
||||||
%tr{:id => "stock_change_stock_article_#{stock_change.stock_article.id}", :data => {:id => stock_change.stock_article.id}}
|
= render :partial => 'stock_change_fields', :locals => {:f => f}
|
||||||
%td.sort-by-name
|
|
||||||
= f.association :stock_article, :as => :hidden
|
|
||||||
%span.stock_article_name= stock_change.stock_article.name
|
|
||||||
%td.numeric.price-per-unit #{number_to_currency stock_change.stock_article.price}/#{stock_change.stock_article.unit}
|
|
||||||
%td= f.input :quantity, :wrapper => :intable, :input_html => {:class => 'stock-change-quantity', :autocomplete => :off}
|
|
||||||
%td= link_to t('.remove_article'), "#", :class => 'remove_new_stock_change btn btn-small'
|
|
||||||
|
|
9
app/views/deliveries/_stock_change_fields.html.haml
Normal file
9
app/views/deliveries/_stock_change_fields.html.haml
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
- stock_change = f.object
|
||||||
|
- stock_article = stock_change.stock_article
|
||||||
|
%tr{:id => "stock_change_stock_article_#{stock_article.id}", :data => {:id => stock_article.id}}
|
||||||
|
%td.sort-by-name
|
||||||
|
%span.stock_article_name= stock_change.stock_article.name
|
||||||
|
= f.association :stock_article, :as => :hidden
|
||||||
|
%td.price-per-unit #{number_to_currency stock_article.price}/#{stock_change.stock_article.unit}
|
||||||
|
%td= f.input :quantity, :wrapper => :intable, :input_html => {:class => 'stock-change-quantity', :autocomplete => :off}
|
||||||
|
%td= stock_change_remove_link f
|
|
@ -1,20 +1,24 @@
|
||||||
if(!is_article_unavailable_for_delivery(<%= @stock_change.stock_article.id %>)) {
|
(function(w) {
|
||||||
<%# would be easier to return in the opposite case, but how? %>
|
if(is_article_unavailable_for_delivery(<%= @stock_change.stock_article.id %>)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
mark_article_unavailable_for_delivery(<%= @stock_change.stock_article.id %>);
|
mark_article_unavailable_for_delivery(<%= @stock_change.stock_article.id %>);
|
||||||
|
|
||||||
(function(w) {
|
var quantity = w.prompt('<%= j(t('.how_many_units', :unit => @stock_change.stock_article.unit, :name => @stock_change.stock_article.name)) %>'); <%# how to properly escape here? %>
|
||||||
|
if(null === quantity) {
|
||||||
|
unmark_article_unavailable_for_delivery(<%= @stock_change.stock_article.id %>); // think wisely before changing this: What about double clicks on "deliver" button?
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$('#stock_changes tr').removeClass('success');
|
$('#stock_changes tr').removeClass('success');
|
||||||
|
|
||||||
var stock_change = $(
|
var stock_change = $(
|
||||||
'<%= j(render(:partial => 'stock_change', :locals => {:stock_change => @stock_change})) %>'
|
'<%= j(render(:partial => 'stock_change', :locals => {:stock_change => @stock_change})) %>'
|
||||||
).addClass('success');
|
).addClass('success');
|
||||||
|
|
||||||
|
$('input.stock-change-quantity', stock_change).val(quantity);
|
||||||
|
|
||||||
$('#stock_changes').append(stock_change);
|
$('#stock_changes').append(stock_change);
|
||||||
updateSort('#stock_changes');
|
updateSort('#stock_changes');
|
||||||
|
})(window);
|
||||||
var quantity = w.prompt('<%= j(t('.how_many_units', :unit => @stock_change.stock_article.unit, :name => @stock_change.stock_article.name)) %>'); <%# how to properly escape here? %>
|
|
||||||
$('input.stock-change-quantity', stock_change).val(quantity);
|
|
||||||
})(window);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -3,6 +3,8 @@ $('div.container-fluid').prepend(
|
||||||
);
|
);
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
// update entry in stock_article table
|
||||||
|
|
||||||
$('#stock_articles_for_adding tr').removeClass('success');
|
$('#stock_articles_for_adding tr').removeClass('success');
|
||||||
|
|
||||||
var old_entry = $('#stock_article_<%= @stock_article.id %>');
|
var old_entry = $('#stock_article_<%= @stock_article.id %>');
|
||||||
|
@ -11,14 +13,15 @@ $('div.container-fluid').prepend(
|
||||||
'<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article, :delivery => @delivery})) %>'
|
'<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article, :delivery => @delivery})) %>'
|
||||||
).addClass('success');
|
).addClass('success');
|
||||||
|
|
||||||
if(unavailable) {
|
|
||||||
stock_article_for_adding.addClass('unavailable');
|
|
||||||
$('.button-add-stock-change', stock_article_for_adding).attr('disabled', 'disabled');
|
|
||||||
}
|
|
||||||
|
|
||||||
old_entry.replaceWith(stock_article_for_adding);
|
old_entry.replaceWith(stock_article_for_adding);
|
||||||
updateSort('#stock_articles_for_adding');
|
updateSort('#stock_articles_for_adding');
|
||||||
|
|
||||||
|
if(unavailable) {
|
||||||
|
mark_article_unavailable_for_delivery(<%= @stock_article.id %>);
|
||||||
|
}
|
||||||
|
|
||||||
|
// update entry in stock_changes table
|
||||||
|
|
||||||
$('#stock_changes tr').removeClass('success');
|
$('#stock_changes tr').removeClass('success');
|
||||||
|
|
||||||
var stock_change_entry = $('#stock_change_stock_article_<%= @stock_article.id %>');
|
var stock_change_entry = $('#stock_change_stock_article_<%= @stock_article.id %>');
|
||||||
|
|
|
@ -45,21 +45,6 @@ SimpleForm.setup do |config|
|
||||||
b.use :error, :wrap_with => { :tag => :span, :class => :error }
|
b.use :error, :wrap_with => { :tag => :span, :class => :error }
|
||||||
end
|
end
|
||||||
|
|
||||||
config.wrappers :intable, :class => 'control-group',
|
|
||||||
:error_class => :error do |b|
|
|
||||||
b.use :html5
|
|
||||||
b.use :placeholder
|
|
||||||
b.optional :maxlength
|
|
||||||
b.optional :pattern
|
|
||||||
b.optional :min_max
|
|
||||||
b.optional :readonly
|
|
||||||
|
|
||||||
b.use :input
|
|
||||||
b.use :hint
|
|
||||||
b.use :error, :wrap_with => { :tag => :span, :class => 'help-inline' }
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# The default wrapper to be used by the FormBuilder.
|
# The default wrapper to be used by the FormBuilder.
|
||||||
config.default_wrapper = :default
|
config.default_wrapper = :default
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,17 @@ SimpleForm.setup do |config|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Do not use the label in tables
|
||||||
|
config.wrappers :intable, :tag => 'div', :class => 'control-group control-group-intable', :error_class => 'error' do |b|
|
||||||
|
b.use :html5
|
||||||
|
b.use :placeholder
|
||||||
|
b.wrapper :tag => 'div', :class => 'controls controls-intable' do |ba|
|
||||||
|
ba.use :input
|
||||||
|
ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
|
||||||
|
ba.use :hint, :wrap_with => { :tag => 'p', :class => 'help-block' }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
|
# Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
|
||||||
# Check the Bootstrap docs (http://twitter.github.com/bootstrap)
|
# Check the Bootstrap docs (http://twitter.github.com/bootstrap)
|
||||||
# to learn about the different styles for forms and inputs,
|
# to learn about the different styles for forms and inputs,
|
||||||
|
|
|
@ -418,10 +418,10 @@ de:
|
||||||
deliveries:
|
deliveries:
|
||||||
add_stock_change:
|
add_stock_change:
|
||||||
how_many_units: Wie viele Einheiten (%{unit}) des Artikels »%{name}« liefern?
|
how_many_units: Wie viele Einheiten (%{unit}) des Artikels »%{name}« liefern?
|
||||||
add_stock_article:
|
|
||||||
notice: Neuer Lagerartikel »%{name}« gespeichert.
|
|
||||||
create:
|
create:
|
||||||
notice: Lieferung wurde erstellt. Bitte nicht vergessen die Rechnung anzulegen!
|
notice: Lieferung wurde erstellt. Bitte nicht vergessen die Rechnung anzulegen!
|
||||||
|
create_stock_article:
|
||||||
|
notice: Neuer Lagerartikel »%{name}« gespeichert.
|
||||||
destroy:
|
destroy:
|
||||||
notice: Lieferung wurde gelöscht.
|
notice: Lieferung wurde gelöscht.
|
||||||
edit:
|
edit:
|
||||||
|
@ -430,12 +430,11 @@ de:
|
||||||
actions: Optionen
|
actions: Optionen
|
||||||
article: Artikel
|
article: Artikel
|
||||||
category: Kategorie
|
category: Kategorie
|
||||||
copy_order_article: Kopiere Bestellartikel
|
create_from_blank: Ohne Vorlage anlegen
|
||||||
new_stock_article: Neuen Lagerartikel anlegen
|
create_stock_article: Lagerartikel anlegen
|
||||||
price: Preis (netto)
|
price: Preis (netto)
|
||||||
price_per_unit: Preis/Einheit
|
price_per_unit: Preis/Einheit
|
||||||
quantity: Menge
|
quantity: Menge
|
||||||
remove_article: Artikel aus Lieferung entfernen
|
|
||||||
title_fill_quantities: 2. Liefermenge angeben
|
title_fill_quantities: 2. Liefermenge angeben
|
||||||
title_finish_delivery: 3. Lieferung abschließen
|
title_finish_delivery: 3. Lieferung abschließen
|
||||||
title_select_stock_articles: 1. Lagerartikel auswählen
|
title_select_stock_articles: 1. Lagerartikel auswählen
|
||||||
|
@ -464,7 +463,7 @@ de:
|
||||||
action_add_to_delivery: 'Liefern'
|
action_add_to_delivery: 'Liefern'
|
||||||
action_edit: 'Bearbeiten'
|
action_edit: 'Bearbeiten'
|
||||||
action_other_price: 'Anderer Preis'
|
action_other_price: 'Anderer Preis'
|
||||||
stock_change:
|
stock_change_fields:
|
||||||
remove_article: Artikel aus Lieferung entfernen
|
remove_article: Artikel aus Lieferung entfernen
|
||||||
suppliers_overview: Lieferantenübersicht
|
suppliers_overview: Lieferantenübersicht
|
||||||
update:
|
update:
|
||||||
|
@ -1846,6 +1845,7 @@ de:
|
||||||
close: ! '×'
|
close: ! '×'
|
||||||
success: ! '<i class="icon icon-ok"></i>'
|
success: ! '<i class="icon icon-ok"></i>'
|
||||||
or_cancel: oder abbrechen
|
or_cancel: oder abbrechen
|
||||||
|
please_wait: Bitte warten...
|
||||||
save: Speichern
|
save: Speichern
|
||||||
show: Anzeigen
|
show: Anzeigen
|
||||||
views:
|
views:
|
||||||
|
|
|
@ -105,7 +105,7 @@ Foodsoft::Application.routes.draw do
|
||||||
post :add_stock_change, :on => :collection
|
post :add_stock_change, :on => :collection
|
||||||
|
|
||||||
get :new_stock_article, :on => :collection
|
get :new_stock_article, :on => :collection
|
||||||
post :add_stock_article, :on => :collection
|
post :create_stock_article, :on => :collection
|
||||||
|
|
||||||
get :edit_stock_article, :on => :collection
|
get :edit_stock_article, :on => :collection
|
||||||
put :update_stock_article, :on => :collection
|
put :update_stock_article, :on => :collection
|
||||||
|
|
Loading…
Reference in a new issue