Merge branch 'master' into updated-gems
Conflicts: Gemfile.lock app/views/deliveries/_form.html.haml
This commit is contained in:
wvengen
commit
eef4626107
1
Gemfile
1
Gemfile
|
|
@ -16,6 +16,7 @@ group :assets do
|
|||
end
|
||||
|
||||
gem 'jquery-rails'
|
||||
gem 'select2-rails'
|
||||
gem 'bootstrap-datepicker-rails'
|
||||
|
||||
gem 'mysql2'
|
||||
|
|
|
|||
|
|
@ -212,6 +212,9 @@ GEM
|
|||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
select2-rails (3.4.3)
|
||||
sass-rails
|
||||
thor (~> 0.14)
|
||||
simple-navigation (3.11.0)
|
||||
activesupport (>= 2.3.2)
|
||||
simple-navigation-bootstrap (1.0.0)
|
||||
|
|
@ -299,6 +302,7 @@ DEPENDENCIES
|
|||
resque
|
||||
ruby-prof
|
||||
sass-rails (~> 3.2.3)
|
||||
select2-rails
|
||||
simple-navigation
|
||||
simple-navigation-bootstrap
|
||||
simple_form
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require select2
|
||||
//= require twitter/bootstrap
|
||||
//= require jquery.tokeninput
|
||||
//= require bootstrap-datepicker/core
|
||||
|
|
@ -10,6 +11,7 @@
|
|||
//= require rails.validations.simple_form
|
||||
//= require_self
|
||||
//= require ordering
|
||||
//= require stupidtable
|
||||
|
||||
// allow touch devices to work on click events
|
||||
// http://stackoverflow.com/a/16221066
|
||||
|
|
@ -114,8 +116,15 @@ $(function() {
|
|||
|
||||
// Use bootstrap datepicker for dateinput
|
||||
$('.datepicker').datepicker({format: 'yyyy-mm-dd', language: I18n.locale});
|
||||
|
||||
// See stupidtable.js for initialization of local table sorting
|
||||
});
|
||||
|
||||
// retrigger last local table sorting
|
||||
function updateSort(table) {
|
||||
$('.sorting-asc, .sorting-desc', table).toggleClass('.sorting-asc .sorting-desc')
|
||||
.removeData('sort-dir').trigger('click'); // CAUTION: removing data field of plugin
|
||||
}
|
||||
|
||||
// gives the row an yellow background
|
||||
function highlightRow(checkbox) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,186 @@
|
|||
// Stupid jQuery table plugin.
|
||||
|
||||
// Call on a table
|
||||
// sortFns: Sort functions for your datatypes.
|
||||
(function($) {
|
||||
|
||||
$.fn.stupidtable = function(sortFns) {
|
||||
return this.each(function() {
|
||||
var $table = $(this);
|
||||
sortFns = sortFns || {};
|
||||
|
||||
// ==================================================== //
|
||||
// Utility functions //
|
||||
// ==================================================== //
|
||||
|
||||
// Merge sort functions with some default sort functions.
|
||||
sortFns = $.extend({}, {
|
||||
"int": function(a, b) {
|
||||
return parseInt(a, 10) - parseInt(b, 10);
|
||||
},
|
||||
"float": function(a, b) {
|
||||
return parseFloat(a) - parseFloat(b);
|
||||
},
|
||||
"string": function(a, b) {
|
||||
if (a < b) return -1;
|
||||
if (a > b) return +1;
|
||||
return 0;
|
||||
},
|
||||
"string-ins": function(a, b) {
|
||||
a = a.toLowerCase();
|
||||
b = b.toLowerCase();
|
||||
if (a < b) return -1;
|
||||
if (a > b) return +1;
|
||||
return 0;
|
||||
}
|
||||
}, sortFns);
|
||||
|
||||
// Return the resulting indexes of a sort so we can apply
|
||||
// this result elsewhere. This returns an array of index numbers.
|
||||
// return[0] = x means "arr's 0th element is now at x"
|
||||
var sort_map = function(arr, sort_function, reverse_column) {
|
||||
var map = [];
|
||||
var index = 0;
|
||||
if (reverse_column) {
|
||||
for (var i = arr.length-1; i >= 0; i--) {
|
||||
map.push(i);
|
||||
}
|
||||
}
|
||||
else {
|
||||
var sorted = arr.slice(0).sort(sort_function);
|
||||
for (var i=0; i<arr.length; i++) {
|
||||
index = $.inArray(arr[i], sorted);
|
||||
|
||||
// If this index is already in the map, look for the next index.
|
||||
// This handles the case of duplicate entries.
|
||||
while ($.inArray(index, map) != -1) {
|
||||
index++;
|
||||
}
|
||||
map.push(index);
|
||||
}
|
||||
}
|
||||
return map;
|
||||
};
|
||||
|
||||
// Apply a sort map to the array.
|
||||
var apply_sort_map = function(arr, map) {
|
||||
var clone = arr.slice(0),
|
||||
newIndex = 0;
|
||||
for (var i=0; i<map.length; i++) {
|
||||
newIndex = map[i];
|
||||
clone[newIndex] = arr[i];
|
||||
}
|
||||
return clone;
|
||||
};
|
||||
|
||||
// ==================================================== //
|
||||
// Begin execution! //
|
||||
// ==================================================== //
|
||||
|
||||
// Do sorting when THs are clicked
|
||||
$table.on("click", "th", function() {
|
||||
var trs = $table.children("tbody").children("tr");
|
||||
var $this = $(this);
|
||||
var th_index = 0;
|
||||
var dir = $.fn.stupidtable.dir;
|
||||
|
||||
$table.find("th").slice(0, $this.index()).each(function() {
|
||||
var cols = $(this).attr("colspan") || 1;
|
||||
th_index += parseInt(cols,10);
|
||||
});
|
||||
|
||||
// Determine (and/or reverse) sorting direction, default `asc`
|
||||
var sort_dir = $this.data("sort-dir") === dir.ASC ? dir.DESC : dir.ASC;
|
||||
|
||||
// Choose appropriate sorting function. If we're sorting descending, check
|
||||
// for a `data-sort-desc` attribute.
|
||||
if ( sort_dir == dir.DESC )
|
||||
var type = $this.data("sort-desc") || $this.data("sort") || null;
|
||||
else
|
||||
var type = $this.data("sort") || null;
|
||||
|
||||
// Prevent sorting if no type defined
|
||||
if (type === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Trigger `beforetablesort` event that calling scripts can hook into;
|
||||
// pass parameters for sorted column index and sorting direction
|
||||
$table.trigger("beforetablesort", {column: th_index, direction: sort_dir});
|
||||
// More reliable method of forcing a redraw
|
||||
$table.css("display");
|
||||
|
||||
// Run sorting asynchronously on a timout to force browser redraw after
|
||||
// `beforetablesort` callback. Also avoids locking up the browser too much.
|
||||
setTimeout(function() {
|
||||
// Gather the elements for this column
|
||||
var column = [];
|
||||
var sortMethod = sortFns[type];
|
||||
|
||||
// Push either the value of the `data-order-by` attribute if specified
|
||||
// or just the text() value in this column to column[] for comparison.
|
||||
trs.each(function(index,tr) {
|
||||
var $e = $(tr).children().eq(th_index);
|
||||
var sort_val = $e.data("sort-value");
|
||||
var order_by = typeof(sort_val) !== "undefined" ? sort_val : $e.text();
|
||||
column.push(order_by);
|
||||
});
|
||||
|
||||
// Create the sort map. This column having a sort-dir implies it was
|
||||
// the last column sorted. As long as no data-sort-desc is specified,
|
||||
// we're free to just reverse the column.
|
||||
var reverse_column = !!$this.data("sort-dir") && !$this.data("sort-desc");
|
||||
var theMap = sort_map(column, sortMethod, reverse_column);
|
||||
|
||||
// Reset siblings
|
||||
$table.find("th").data("sort-dir", null).removeClass("sorting-desc sorting-asc");
|
||||
$this.data("sort-dir", sort_dir).addClass("sorting-"+sort_dir);
|
||||
|
||||
// Replace the content of tbody with the sortedTRs. Strangely (and
|
||||
// conveniently!) enough, .append accomplishes this for us.
|
||||
var sortedTRs = $(apply_sort_map(trs, theMap));
|
||||
$table.children("tbody").append(sortedTRs);
|
||||
|
||||
// Trigger `aftertablesort` event. Similar to `beforetablesort`
|
||||
$table.trigger("aftertablesort", {column: th_index, direction: sort_dir});
|
||||
// More reliable method of forcing a redraw
|
||||
$table.css("display");
|
||||
}, 10);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
// Enum containing sorting directions
|
||||
$.fn.stupidtable.dir = {ASC: "asc", DESC: "desc"};
|
||||
|
||||
})(jQuery);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// own additions for automatic initialization of table sorting
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
$(function() {
|
||||
var stupidtables = $('table.stupidtable');
|
||||
|
||||
if(stupidtables.length) {
|
||||
// Add pseudo links just for matching foodsoft style
|
||||
$('th[data-sort]', stupidtables).wrapInner('<a href="#" class="stupidlink"></a>');
|
||||
$('.stupidlink', stupidtables).on('click', function(e) {e.preventDefault();});
|
||||
|
||||
// Init stupidtable sorting
|
||||
stupidtables.stupidtable();
|
||||
|
||||
// Update class of sort link after sort to match foodsoft style
|
||||
stupidtables.on('aftertablesort', function(e, data) {
|
||||
// Ignore data and use the updated classes in DOM
|
||||
var stupidthead = $('thead', this);
|
||||
$('a.stupidlink', stupidthead).removeClass('sortup sortdown');
|
||||
$('th.sorting-asc a.stupidlink', stupidthead).addClass('sortup');
|
||||
$('th.sorting-desc a.stupidlink', stupidthead).addClass('sortdown');
|
||||
});
|
||||
|
||||
// Sort tables with a default sort
|
||||
$('.default-sort', stupidtables).trigger('click');
|
||||
}
|
||||
});
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
*= require bootstrap_and_overrides
|
||||
*= require select2
|
||||
*= require token-input-bootstrappy
|
||||
*= require bootstrap-datepicker
|
||||
*/
|
||||
*/
|
||||
|
|
@ -35,6 +35,22 @@ body {
|
|||
dd { .clearfix(); }
|
||||
}
|
||||
|
||||
// Do not use additional margin for input in table
|
||||
.form-horizontal .control-group.control-group-intable,
|
||||
.form-horizontal .controls.controls-intable {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
// Light tooltips without empty space below tables
|
||||
.tooltip-inner {
|
||||
color: #000;
|
||||
background-color: rgb(245,245,245);
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
.tooltip-inner .table {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
@mainRedColor: #ED0606;
|
||||
|
||||
.logo {
|
||||
|
|
|
|||
|
|
@ -5,43 +5,25 @@ class DeliveriesController < ApplicationController
|
|||
|
||||
def index
|
||||
@deliveries = @supplier.deliveries.all :order => 'delivered_on DESC'
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.xml { render :xml => @deliveries }
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
@delivery = Delivery.find(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.xml { render :xml => @delivery }
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@delivery = @supplier.deliveries.build
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
format.xml { render :xml => @delivery }
|
||||
end
|
||||
@delivery.delivered_on = Date.today #TODO: move to model/database
|
||||
end
|
||||
|
||||
def create
|
||||
@delivery = Delivery.new(params[:delivery])
|
||||
|
||||
respond_to do |format|
|
||||
if @delivery.save
|
||||
flash[:notice] = I18n.t('deliveries.create.notice')
|
||||
format.html { redirect_to([@supplier,@delivery]) }
|
||||
format.xml { render :xml => @delivery, :status => :created, :location => @delivery }
|
||||
else
|
||||
format.html { render :action => "new" }
|
||||
format.xml { render :xml => @delivery.errors, :status => :unprocessable_entity }
|
||||
end
|
||||
|
||||
if @delivery.save
|
||||
flash[:notice] = I18n.t('deliveries.create.notice')
|
||||
redirect_to [@supplier, @delivery]
|
||||
else
|
||||
render :action => "new"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -52,15 +34,11 @@ class DeliveriesController < ApplicationController
|
|||
def update
|
||||
@delivery = Delivery.find(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
if @delivery.update_attributes(params[:delivery])
|
||||
flash[:notice] = I18n.t('deliveries.update.notice')
|
||||
format.html { redirect_to([@supplier,@delivery]) }
|
||||
format.xml { head :ok }
|
||||
else
|
||||
format.html { render :action => "edit" }
|
||||
format.xml { render :xml => @delivery.errors, :status => :unprocessable_entity }
|
||||
end
|
||||
if @delivery.update_attributes(params[:delivery])
|
||||
flash[:notice] = I18n.t('deliveries.update.notice')
|
||||
redirect_to [@supplier,@delivery]
|
||||
else
|
||||
render :action => "edit"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -69,40 +47,60 @@ class DeliveriesController < ApplicationController
|
|||
@delivery.destroy
|
||||
|
||||
flash[:notice] = I18n.t('deliveries.destroy.notice')
|
||||
respond_to do |format|
|
||||
format.html { redirect_to(supplier_deliveries_url(@supplier)) }
|
||||
format.xml { head :ok }
|
||||
redirect_to supplier_deliveries_url(@supplier)
|
||||
end
|
||||
|
||||
# three possibilites to fill a new_stock_article form
|
||||
# (1) start from blank or use params
|
||||
def new_stock_article
|
||||
@stock_article = @supplier.stock_articles.build(params[:stock_article])
|
||||
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
# (2) StockArticle as template
|
||||
def copy_stock_article
|
||||
@stock_article = StockArticle.find(params[:old_stock_article_id]).dup
|
||||
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
# (3) non-stock Article as template
|
||||
def derive_stock_article
|
||||
@stock_article = Article.find(params[:old_article_id]).becomes(StockArticle).dup
|
||||
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
def create_stock_article
|
||||
@stock_article = StockArticle.new(params[:stock_article])
|
||||
|
||||
if @stock_article.valid? and @stock_article.save
|
||||
render :layout => false
|
||||
else
|
||||
render :action => 'new_stock_article', :layout => false
|
||||
end
|
||||
end
|
||||
|
||||
def add_stock_article
|
||||
article = @supplier.stock_articles.build(params[:stock_article])
|
||||
render :update do |page|
|
||||
if article.save
|
||||
logger.debug "new StockArticle: #{article.id}"
|
||||
page.insert_html :bottom, 'stock_changes', :partial => 'stock_change',
|
||||
:locals => {:stock_change => article.stock_changes.build, :supplier => @supplier}
|
||||
def edit_stock_article
|
||||
@stock_article = StockArticle.find(params[:stock_article_id])
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
page.replace_html 'new_stock_article', :partial => 'stock_article_form',
|
||||
:locals => {:stock_article => @supplier.stock_articles.build}
|
||||
else
|
||||
page.replace_html 'new_stock_article', :partial => 'stock_article_form',
|
||||
:locals => {:stock_article => article}
|
||||
end
|
||||
def update_stock_article
|
||||
@stock_article = StockArticle.find(params[:stock_article][:id])
|
||||
|
||||
if @stock_article.update_attributes(params[:stock_article])
|
||||
render :layout => false
|
||||
else
|
||||
render :action => 'edit_stock_article', :layout => false
|
||||
end
|
||||
end
|
||||
|
||||
def add_stock_change
|
||||
@stock_change = StockChange.new
|
||||
@stock_change.stock_article = StockArticle.find(params[:stock_article_id])
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
def fill_new_stock_article_form
|
||||
article = Article.find(params[:article_id])
|
||||
@supplier = article.supplier
|
||||
stock_article = @supplier.stock_articles.build(
|
||||
article.attributes.reject { |attr| attr == ('id' || 'type')}
|
||||
)
|
||||
|
||||
render :partial => 'stock_article_form', :locals => {:stock_article => stock_article}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -158,5 +158,13 @@ module ApplicationHelper
|
|||
end
|
||||
flash_messages.join("\n").html_safe
|
||||
end
|
||||
|
||||
# render base errors in a form after failed validation
|
||||
# http://railsapps.github.io/twitter-bootstrap-rails.html
|
||||
def base_errors resource
|
||||
return '' if (resource.errors.empty?) or (resource.errors[:base].empty?)
|
||||
messages = resource.errors[:base].map { |msg| content_tag(:li, msg) }.join
|
||||
render :partial => 'shared/base_errors', :locals => {:error_messages => messages}
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
module DeliveriesHelper
|
||||
|
||||
|
||||
def link_to_invoice(delivery)
|
||||
if delivery.invoice
|
||||
link_to number_to_currency(delivery.invoice.amount), [:finance, delivery.invoice],
|
||||
|
|
@ -9,9 +9,29 @@ module DeliveriesHelper
|
|||
class: 'btn btn-mini'
|
||||
end
|
||||
end
|
||||
|
||||
def stock_articles_for_select(supplier)
|
||||
supplier.stock_articles.undeleted.reorder('articles.name ASC').map {|a| ["#{a.name} (#{number_to_currency a.price}/#{a.unit})", a.id] }
|
||||
|
||||
def articles_for_select2(supplier)
|
||||
supplier.articles.undeleted.reorder('articles.name ASC').map {|a| {:id => a.id, :text => "#{a.name} (#{number_to_currency a.price}/#{a.unit})"} }
|
||||
end
|
||||
|
||||
|
||||
def stock_articles_for_table(supplier)
|
||||
supplier.stock_articles.undeleted.reorder('articles.name ASC')
|
||||
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
|
||||
|
||||
def stock_article_price_hint(stock_article)
|
||||
t('simple_form.hints.stock_article.edit_stock_article.price',
|
||||
:stock_article_copy_link => link_to(t('.copy_stock_article'),
|
||||
copy_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => stock_article.id),
|
||||
:remote => true
|
||||
)
|
||||
)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,11 +2,15 @@ class Delivery < ActiveRecord::Base
|
|||
|
||||
belongs_to :supplier
|
||||
has_one :invoice
|
||||
has_many :stock_changes, :dependent => :destroy
|
||||
has_many :stock_changes,
|
||||
:dependent => :destroy,
|
||||
:include => 'stock_article',
|
||||
:order => 'articles.name ASC'
|
||||
|
||||
scope :recent, :order => 'created_at DESC', :limit => 10
|
||||
|
||||
validates_presence_of :supplier_id
|
||||
validates_presence_of :supplier_id, :delivered_on
|
||||
validate :stock_articles_must_be_unique
|
||||
|
||||
accepts_nested_attributes_for :stock_changes, :allow_destroy => :true
|
||||
|
||||
|
|
@ -15,6 +19,18 @@ class Delivery < ActiveRecord::Base
|
|||
stock_changes.build(attributes) unless attributes[:quantity].to_i == 0
|
||||
end
|
||||
end
|
||||
|
||||
def includes_article?(article)
|
||||
self.stock_changes.map{|stock_change| stock_change.stock_article.id}.include? article.id
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def stock_articles_must_be_unique
|
||||
unless stock_changes.reject{|sc| sc.marked_for_destruction?}.map {|sc| sc.stock_article.id}.uniq!.nil?
|
||||
errors.add(:base, I18n.t('model.delivery.each_stock_article_must_be_unique'))
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,45 +1,134 @@
|
|||
- content_for :javascript do
|
||||
:javascript
|
||||
$(function() {
|
||||
$(document).on('click', '.destroy_stock_change', function() {
|
||||
$(this).prev('input').val('1').parent().hide();
|
||||
$('#stock_changes').on('click', '.destroy_stock_change', function() {
|
||||
$(this).prev('input').val('1'); // check for destruction
|
||||
|
||||
var stock_change = $(this).closest('tr');
|
||||
stock_change.hide(); // do not remove (to ensure destruction)
|
||||
stock_change.removeAttr('id'); // remove id to allow re-adding
|
||||
mark_article_for_delivery( stock_change.data('id') );
|
||||
return false;
|
||||
});
|
||||
|
||||
$(document).on('click', '.remove_new_stock_change', function() {
|
||||
$(this).parent().remove();
|
||||
$('#stock_changes').on('click', '.remove_new_stock_change', function() {
|
||||
var stock_change = $(this).closest('tr');
|
||||
stock_change.remove();
|
||||
mark_article_for_delivery( stock_change.data('id') );
|
||||
return false;
|
||||
})
|
||||
|
||||
$('#new_stock_article').removeAttr('disabled').select2({
|
||||
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) {
|
||||
var selectedArticle = $(e.currentTarget).select2('data');
|
||||
if(!selectedArticle) {
|
||||
return false;
|
||||
}
|
||||
if('new' == selectedArticle.id) {
|
||||
$.ajax({
|
||||
url: '#{new_stock_article_supplier_deliveries_path(@supplier)}',
|
||||
type: 'get',
|
||||
data: {stock_article: {name: selectedArticle.text}},
|
||||
contentType: 'application/json; charset=UTF-8'
|
||||
});
|
||||
$('#new_stock_article').select2('data', null);
|
||||
return true;
|
||||
}
|
||||
if('' != selectedArticle.id) {
|
||||
$.ajax({
|
||||
url: '#{derive_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;
|
||||
}
|
||||
});
|
||||
|
||||
enablePriceTooltips();
|
||||
});
|
||||
|
||||
function mark_article_for_delivery(stock_article_id) {
|
||||
var articleTr = $('#stock_article_' + stock_article_id);
|
||||
if( is_article_available_for_delivery(stock_article_id) ) {
|
||||
articleTr.removeClass('unavailable');
|
||||
$('.button-add-stock-change', articleTr).removeAttr('disabled');
|
||||
}
|
||||
else {
|
||||
articleTr.addClass('unavailable');
|
||||
$('.button-add-stock-change', articleTr).attr('disabled', 'disabled');
|
||||
}
|
||||
}
|
||||
function is_article_available_for_delivery(stock_article_id) {
|
||||
return ( 0 == $('#stock_change_stock_article_' + stock_article_id).length );
|
||||
}
|
||||
|
||||
function enablePriceTooltips(context) {
|
||||
$('[data-toggle~="tooltip"]', context).tooltip({
|
||||
animation: false,
|
||||
html: true,
|
||||
placement: 'left'
|
||||
});
|
||||
}
|
||||
|
||||
= simple_form_for [@supplier, @delivery], validate: true do |f|
|
||||
= f.hidden_field :supplier_id
|
||||
#stock_changes
|
||||
= f.fields_for :stock_changes do |stock_change_form|
|
||||
%p
|
||||
= stock_change_form.select :stock_article_id, stock_articles_for_select(@supplier)
|
||||
Menge
|
||||
= stock_change_form.text_field :quantity, size: 5, autocomplete: 'off'
|
||||
= stock_change_form.hidden_field :_destroy
|
||||
= link_to t('.remove_article'), "#", class: 'destroy_stock_change'
|
||||
%p
|
||||
= link_to t('.add_article'), {action: 'add_stock_change', supplier_id: @supplier.id}, remote: true
|
||||
%p
|
||||
%small= t('.note_new_article', new_link: link_to(t('.note_new_article_link'), new_stock_article_path)).html_safe
|
||||
%hr/
|
||||
= f.error_notification
|
||||
= base_errors f.object
|
||||
= f.association :supplier, :as => :hidden
|
||||
|
||||
%h2= t '.title_select_stock_articles'
|
||||
%table#stock_articles_for_adding.table.table-hover.stupidtable
|
||||
%thead
|
||||
%tr
|
||||
%th.default-sort{:data => {:sort => 'string'}}= t '.article'
|
||||
%th= t '.price'
|
||||
%th= t '.unit'
|
||||
%th= t '.category'
|
||||
%th= t '.actions'
|
||||
%tfoot
|
||||
%tr
|
||||
%th{:colspan => 5}
|
||||
- if articles_for_select2(@supplier).empty?
|
||||
= link_to t('.create_stock_article'), new_stock_article_supplier_deliveries_path(@supplier), :remote => true, :class => 'btn'
|
||||
- else
|
||||
%input#new_stock_article{:style => 'width: 500px;'}
|
||||
%tbody
|
||||
- for article in stock_articles_for_table(@supplier)
|
||||
= render :partial => 'stock_article_for_adding', :locals => {:article => article}
|
||||
|
||||
%h2= t '.title_fill_quantities'
|
||||
%table.table#stock_changes.stupidtable
|
||||
%thead
|
||||
%tr
|
||||
%th.default-sort{:data => {:sort => 'string'}}= t '.article'
|
||||
%th= t '.price'
|
||||
%th= t '.unit'
|
||||
%th= t '.quantity'
|
||||
%th= t '.actions'
|
||||
%tbody
|
||||
= f.simple_fields_for :stock_changes do |stock_change_form|
|
||||
= render :partial => 'stock_change_fields', :locals => {:f => stock_change_form}
|
||||
|
||||
%h2= t '.title_finish_delivery'
|
||||
= f.input :delivered_on, as: :date_picker
|
||||
= f.input :note, input_html: {size: '35x4'}
|
||||
.form-actions
|
||||
= f.submit class: 'btn btn-primary'
|
||||
= link_to t('ui.or_cancel'), supplier_deliveries_path(@supplier)
|
||||
|
||||
/
|
||||
TODO: Fix this!!
|
||||
.span6
|
||||
%h2= t '.new_article.title'
|
||||
%p
|
||||
= t('.new_article.search', supplier: @supplier.name).html_safe + ': '
|
||||
= text_field_tag 'article_name'
|
||||
%hr/
|
||||
#stock_article_form
|
||||
= render 'stock_article_form', stock_article: @supplier.stock_articles.build
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
- css_class = ( @delivery and @delivery.includes_article? article ) ? ( 'unavailable' ) : ( false )
|
||||
%tr{:id => "stock_article_#{article.id}", :class => css_class}
|
||||
%td= article.name
|
||||
%td{:data => {:toggle => :tooltip, :title => render(:partial => 'shared/article_price_info', :locals => {:article => article})}}= number_to_currency article.price
|
||||
%td= article.unit
|
||||
%td= article.article_category.name
|
||||
%td
|
||||
= 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'), copy_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => article.id), remote: true, class: 'btn btn-mini'
|
||||
- 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 btn-primary', disabled: deliver_button_disabled
|
||||
|
|
@ -1,14 +1,23 @@
|
|||
= simple_form_for stock_article, url: add_stock_article_supplier_deliveries_path(@supplier), remote: true,
|
||||
validate: true do |f|
|
||||
= f.hidden_field :supplier_id
|
||||
= f.input :name
|
||||
= f.input :unit
|
||||
= f.input :note
|
||||
= f.input :price
|
||||
= f.input :tax, :wrapper => :append do
|
||||
= f.input_field :tax
|
||||
%span.add-on %
|
||||
-# untested, because this view is currently not included (?)
|
||||
= f.input :deposit
|
||||
= f.association :article_category
|
||||
= f.submit class: 'btn'
|
||||
- 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, validate: true do |f|
|
||||
= f.association :supplier, :as => :hidden
|
||||
= f.hidden_field :id unless stock_article.new_record?
|
||||
.modal-header
|
||||
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
|
||||
%h3= t 'activerecord.models.stock_article'
|
||||
.modal-body
|
||||
= f.input :name
|
||||
= f.input :unit
|
||||
= f.input :note
|
||||
- if stock_article.new_record?
|
||||
= f.input :price
|
||||
= f.input :tax, :wrapper => :append do
|
||||
= f.input_field :tax
|
||||
%span.add-on %
|
||||
= f.input :deposit
|
||||
- else
|
||||
= f.input :price, :input_html => {:disabled => 'disabled'}, :hint => stock_article_price_hint(stock_article)
|
||||
= f.association :article_category
|
||||
.modal-footer
|
||||
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
|
||||
= f.submit :class => 'btn btn-primary', 'data-disable-with' => t('ui.please_wait')
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%p
|
||||
= fields_for "delivery[new_stock_changes][]", stock_change do |form|
|
||||
= form.select :stock_article_id, stock_articles_for_select(supplier)
|
||||
Menge
|
||||
= form.text_field :quantity, :size => 5, :autocomplete => 'off'
|
||||
= link_to t('.remove_article'), "#", :class => 'remove_new_stock_change'
|
||||
- if stock_change.stock_article.new_record?
|
||||
= simple_fields_for "delivery[new_stock_changes_new_stock_article][]", stock_change do |f|
|
||||
= render :partial => 'stock_change_fields', :locals => {:f => f}
|
||||
- else
|
||||
= simple_fields_for "delivery[new_stock_changes][]", stock_change do |f|
|
||||
= render :partial => 'stock_change_fields', :locals => {:f => f}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
- 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
|
||||
%span.stock_article_name= stock_change.stock_article.name
|
||||
= f.association :stock_article, :as => :hidden
|
||||
%td.price{:data => {:toggle => :tooltip, :title => render(:partial => 'shared/article_price_info', :locals => {:article => stock_article})}}= number_to_currency stock_article.price
|
||||
%td.unit= 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
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
(function(w) {
|
||||
if(!is_article_available_for_delivery(<%= @stock_change.stock_article.id %>)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$('#stock_changes tr').removeClass('success');
|
||||
|
||||
var stock_change = $(
|
||||
'<%= j(render(:partial => 'stock_change', :locals => {:stock_change => @stock_change})) %>'
|
||||
).addClass('success');
|
||||
enablePriceTooltips(stock_change);
|
||||
|
||||
$('#stock_changes').append(stock_change);
|
||||
mark_article_for_delivery(<%= @stock_change.stock_article.id %>);
|
||||
updateSort('#stock_changes');
|
||||
|
||||
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) {
|
||||
stock_change.remove();
|
||||
mark_article_for_delivery(<%= @stock_change.stock_article.id %>);
|
||||
return false;
|
||||
}
|
||||
$('input.stock-change-quantity', stock_change).val(quantity);
|
||||
|
||||
})(window);
|
||||
|
|
@ -1 +0,0 @@
|
|||
$('#stock_changes').append('#{escape_javascript(render(:partial => 'stock_change', :locals => {:stock_change => StockChange.new, :supplier => @supplier}))}');
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
$('#modalContainer').html(
|
||||
'<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
|
||||
);
|
||||
|
||||
$('#modalContainer').modal();
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
$('div.container-fluid').prepend(
|
||||
'<%= j(render(:partial => 'shared/alert_success', :locals => {:alert_message => t('.notice', :name => @stock_article.name)})) %>'
|
||||
);
|
||||
|
||||
(function() {
|
||||
$('#stock_articles_for_adding tr').removeClass('success');
|
||||
|
||||
var stock_article_for_adding = $(
|
||||
'<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article})) %>'
|
||||
).addClass('success');
|
||||
enablePriceTooltips(stock_article_for_adding);
|
||||
|
||||
$('#stock_articles_for_adding tbody').append(stock_article_for_adding);
|
||||
updateSort('#stock_articles_for_adding');
|
||||
})();
|
||||
|
||||
$('#modalContainer').modal('hide');
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
$('#modalContainer').html(
|
||||
'<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
|
||||
);
|
||||
|
||||
$('#modalContainer').modal();
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
$('#modalContainer').html(
|
||||
'<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
|
||||
);
|
||||
|
||||
$('#modalContainer').modal();
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
$('#modalContainer').html(
|
||||
'<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
|
||||
);
|
||||
|
||||
$('#modalContainer').modal();
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
$('div.container-fluid').prepend(
|
||||
'<%= j(render(:partial => 'shared/alert_success', :locals => {:alert_message => t('.notice', :name => @stock_article.name)})) %>'
|
||||
);
|
||||
|
||||
(function() {
|
||||
// update entry in stock_article table
|
||||
|
||||
$('#stock_articles_for_adding tr').removeClass('success');
|
||||
|
||||
var stock_article_for_adding = $(
|
||||
'<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article, :delivery => @delivery})) %>'
|
||||
).addClass('success');
|
||||
enablePriceTooltips(stock_article_for_adding);
|
||||
|
||||
$('#stock_article_<%= @stock_article.id %>').replaceWith(stock_article_for_adding);
|
||||
updateSort('#stock_articles_for_adding');
|
||||
|
||||
mark_article_for_delivery(<%= @stock_article.id %>);
|
||||
|
||||
// update entry in stock_changes table
|
||||
|
||||
$('#stock_changes tr').removeClass('success');
|
||||
|
||||
var stock_change_entry = $('#stock_change_stock_article_<%= @stock_article.id %>');
|
||||
$('.stock_article_name', stock_change_entry).text('<%= j(@stock_article.name) %>');
|
||||
$('.unit', stock_change_entry).text('<%= j(@stock_article.unit) %>');
|
||||
|
||||
stock_change_entry.addClass('success');
|
||||
|
||||
updateSort('#stock_changes');
|
||||
})();
|
||||
|
||||
$('#modalContainer').modal('hide');
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
.alert.fade.in.alert-success
|
||||
%a.close{:href => '#', :data => {:dismiss => 'alert'}}
|
||||
= t('ui.marks.close').html_safe
|
||||
= t('ui.marks.success').html_safe
|
||||
= alert_message
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
%table.table.table-condensed
|
||||
%tr
|
||||
%th= t 'activerecord.attributes.article.price'
|
||||
%td.numeric= number_to_currency article.price
|
||||
%tr
|
||||
%th= t 'activerecord.attributes.article.deposit'
|
||||
%td.numeric= number_to_currency article.deposit
|
||||
%tr
|
||||
%th= t 'activerecord.attributes.article.tax'
|
||||
%td.numeric= number_to_percentage article.tax
|
||||
- unless article.fc_price == article.gross_price
|
||||
%tr
|
||||
%th= t 'activerecord.attributes.article.fc_share'
|
||||
%td.numeric= number_to_currency(article.fc_price-article.gross_price)
|
||||
%tr
|
||||
%th= t 'activerecord.attributes.article.fc_price'
|
||||
%td.numeric= number_to_currency article.fc_price
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
.alert.alert-error.alert-block
|
||||
%a.close{:href => '#', :data => {:dismiss => 'alert'}}
|
||||
= t('ui.marks.close').html_safe
|
||||
%ul
|
||||
= error_messages.html_safe
|
||||
|
|
@ -4,11 +4,5 @@ var successDiv = $('<div class="alert fade in alert-success"><a class="close" da
|
|||
successDiv.append(document.createTextNode('#{escape_javascript(t('.notice', name: @article.name))}'));
|
||||
$('div.container-fluid').prepend(successDiv);
|
||||
|
||||
-# WARNING: If you try to use the escape j(...) here, an error occurs:
|
||||
-# Ein Fehler ist aufgetreten: undefined method `gsub' for 50:Fixnum
|
||||
-# However, it should work without without escaping.
|
||||
-# Note that article names which are purely numeric, e.g. 12345, are escaped correctly (see above).
|
||||
|
||||
$('#stockArticle-#{@article.id}').remove();
|
||||
|
||||
-# WARNING: Do not use a simple .fadeOut() above, because it conflicts with the show/hide function of unavailable articles.
|
||||
|
|
|
|||
|
|
@ -36,7 +36,18 @@ SimpleForm.setup do |config|
|
|||
input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
|
||||
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.
|
||||
# Check the Bootstrap docs (http://twitter.github.com/bootstrap)
|
||||
# to learn about the different styles for forms and inputs,
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ de:
|
|||
article_category: Kategorie
|
||||
availability: Artikel ist verfügbar?
|
||||
deposit: Pfand
|
||||
fc_price: Endpreis
|
||||
fc_share: FC-Aufschlag
|
||||
gross_price: Bruttopreis
|
||||
price: Nettopreis
|
||||
tax: MwSt
|
||||
|
|
@ -421,20 +423,28 @@ de:
|
|||
second: Sekunden
|
||||
year: Jahr
|
||||
deliveries:
|
||||
add_stock_change:
|
||||
how_many_units: Wie viele Einheiten (%{unit}) des Artikels »%{name}« liefern?
|
||||
create:
|
||||
notice: Lieferung wurde erstellt. Bitte nicht vergessen die Rechnung anzulegen!
|
||||
create_stock_article:
|
||||
notice: Neuer Lagerartikel »%{name}« gespeichert.
|
||||
destroy:
|
||||
notice: Lieferung wurde gelöscht.
|
||||
edit:
|
||||
title: Lieferung bearbeiten
|
||||
form:
|
||||
add_article: Lagerartikel der Lieferung hinzufügen
|
||||
new_article:
|
||||
search: Suche nach Artikeln aus dem <i>%{supplier}</i> Katalog
|
||||
title: Neuen Lagerartikel anlegen
|
||||
note_new_article: Ist ein Artikel noch nicht in der Lagerverwaltung, muss er erst %{new_link} werden.
|
||||
note_new_article_link: neu angelegt
|
||||
remove_article: Artikel aus Lieferung entfernen
|
||||
actions: Optionen
|
||||
article: Artikel
|
||||
category: Kategorie
|
||||
create_from_blank: Ohne Vorlage anlegen
|
||||
create_stock_article: Lagerartikel anlegen
|
||||
price: Nettopreis
|
||||
quantity: Menge
|
||||
title_fill_quantities: 2. Liefermenge angeben
|
||||
title_finish_delivery: 3. Lieferung abschließen
|
||||
title_select_stock_articles: 1. Lagerartikel auswählen
|
||||
unit: Einheit
|
||||
index:
|
||||
confirm_delete: Bist Du sicher?
|
||||
new_delivery: Neue Lieferung für %{supplier} anlegen
|
||||
|
|
@ -454,11 +464,19 @@ de:
|
|||
title: Lieferung anzeigen
|
||||
title_articles: Artikel
|
||||
unit: Einheit
|
||||
stock_change:
|
||||
stock_article_for_adding:
|
||||
action_add_to_delivery: 'Liefern'
|
||||
action_edit: 'Bearbeiten'
|
||||
action_other_price: 'Kopieren'
|
||||
stock_article_form:
|
||||
copy_stock_article: 'Lagerartikel kopieren'
|
||||
stock_change_fields:
|
||||
remove_article: Artikel aus Lieferung entfernen
|
||||
suppliers_overview: Lieferantenübersicht
|
||||
update:
|
||||
notice: Lieferung wurde aktualisiert.
|
||||
update_stock_article:
|
||||
notice: Lagerartikel »%{name}« aktualisiert.
|
||||
documents:
|
||||
order_by_articles:
|
||||
filename: Bestellung %{name}-%{date} - Artikelsortierung
|
||||
|
|
@ -1151,6 +1169,8 @@ de:
|
|||
subject: ! 'Betreff:'
|
||||
title: Nachricht anzeigen
|
||||
model:
|
||||
delivery:
|
||||
each_stock_article_must_be_unique: Lieferung darf jeden Lagerartikel höchstens einmal auflisten.
|
||||
membership:
|
||||
no_admin_delete: Mitgliedschaft kann nicht beendet werden. Du bist die letzte Administratorin
|
||||
order_article:
|
||||
|
|
@ -1515,6 +1535,10 @@ de:
|
|||
update_current_price: Ändert auch den Preis für aktuelle Bestellungen
|
||||
stock_article:
|
||||
supplier:
|
||||
copy_stock_article:
|
||||
name: Bitte ändern
|
||||
edit_stock_article:
|
||||
price: ! '<ul><li>Preisänderung gesperrt.</li><li>Bei Bedarf %{stock_article_copy_link}.</li></ul>'
|
||||
supplier:
|
||||
min_order_quantity: Die Mindestbestellmenge wird während der Bestellung angezeigt und soll motivieren
|
||||
task:
|
||||
|
|
@ -1834,7 +1858,9 @@ de:
|
|||
history: Verlauf anzeigen
|
||||
marks:
|
||||
close: ! '×'
|
||||
success: ! '<i class="icon icon-ok"></i>'
|
||||
or_cancel: oder abbrechen
|
||||
please_wait: Bitte warten...
|
||||
save: Speichern
|
||||
show: Anzeigen
|
||||
views:
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ en:
|
|||
article_category: article category
|
||||
availability: Is article available?
|
||||
deposit: deposit
|
||||
fc_price: FC price
|
||||
fc_share: FC share
|
||||
gross_price: gross price
|
||||
price: price
|
||||
tax: VAT
|
||||
|
|
@ -423,20 +425,28 @@ en:
|
|||
second: seconds
|
||||
year: years
|
||||
deliveries:
|
||||
add_stock_change:
|
||||
how_many_units: 'How many units (%{unit}) to deliver? Stock article name: %{name}.'
|
||||
create:
|
||||
notice: Delivery was created. Please don’t forget to create invoice!
|
||||
create_stock_article:
|
||||
notice: The new stock article »%{name}« was saved.
|
||||
destroy:
|
||||
notice: Delivery was deleted.
|
||||
edit:
|
||||
title: Edit suppliers
|
||||
title: Edit delivery
|
||||
form:
|
||||
add_article: Add stock article to delivery
|
||||
new_article:
|
||||
search: Search for articles in the <i>%{supplier}</i> catalogue
|
||||
title: Create new stock article
|
||||
note_new_article: When an article is not yet in the inventory, you have to %{new_link} it first.
|
||||
note_new_article_link: create
|
||||
remove_article: Remove article from delivery
|
||||
actions: Tasks
|
||||
article: Article
|
||||
category: Category
|
||||
copy_order_article: Copy order article
|
||||
new_stock_article: Create new stock article
|
||||
price: Netprice
|
||||
quantity: Quantity
|
||||
title_fill_quantities: 2. Set delivery quantities
|
||||
title_finish_delivery: 3. Finish delivery
|
||||
title_select_stock_articles: 1. Select stock articles
|
||||
unit: Unit
|
||||
index:
|
||||
confirm_delete: Are you sure?
|
||||
new_delivery: ! 'Create new delivery for %{supplier} '
|
||||
|
|
@ -456,11 +466,19 @@ en:
|
|||
title: Show delivery
|
||||
title_articles: Article
|
||||
unit: Unit
|
||||
stock_change:
|
||||
remove_article: Remove articles from delivery
|
||||
stock_article_for_adding:
|
||||
action_add_to_delivery: 'Add to delivery'
|
||||
action_edit: 'Edit'
|
||||
action_other_price: 'Copy'
|
||||
stock_article_form:
|
||||
copy_stock_article: 'Lagerartikel kopieren'
|
||||
stock_change_fields:
|
||||
remove_article: Remove article from delivery
|
||||
suppliers_overview: Supplier overview
|
||||
update:
|
||||
notice: Delivery was updated.
|
||||
update_stock_article:
|
||||
notice: The stock article »%{name}« was updated.
|
||||
documents:
|
||||
order_by_articles:
|
||||
filename: Order %{name}-%{date} - by articles
|
||||
|
|
@ -1153,6 +1171,8 @@ en:
|
|||
subject: ! 'Subject:'
|
||||
title: Show message
|
||||
model:
|
||||
delivery:
|
||||
each_stock_article_must_be_unique: Each stock article must not be listed more than once.
|
||||
membership:
|
||||
no_admin_delete: Membership can not be withdrawn as you are the last administrator.
|
||||
order_article:
|
||||
|
|
@ -1517,6 +1537,10 @@ en:
|
|||
update_current_price: Also update the price of the current order
|
||||
stock_article:
|
||||
supplier:
|
||||
copy_stock_article:
|
||||
name: Please modify
|
||||
edit_stock_article:
|
||||
price: ! '<ul><li>Price changes are forbidden.</li><li>If necessary, %{stock_article_copy_link}.</li></ul>'
|
||||
supplier:
|
||||
min_order_quantity: The minimum amount which has to be orderd will be shown during the order process and should motivate ordering
|
||||
task:
|
||||
|
|
|
|||
|
|
@ -104,8 +104,15 @@ Foodsoft::Application.routes.draw do
|
|||
get :shared_suppliers, :on => :collection
|
||||
|
||||
resources :deliveries do
|
||||
post :drop_stock_change, :on => :member
|
||||
post :add_stock_article, :on => :collection
|
||||
post :add_stock_change, :on => :collection
|
||||
|
||||
get :new_stock_article, :on => :collection
|
||||
get :copy_stock_article, :on => :collection
|
||||
get :derive_stock_article, :on => :collection
|
||||
post :create_stock_article, :on => :collection
|
||||
|
||||
get :edit_stock_article, :on => :collection
|
||||
put :update_stock_article, :on => :collection
|
||||
end
|
||||
|
||||
resources :articles do
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ fi
|
|||
sed -i "s|^\\(\\s*gem\\s\\+'sqlite3'\\)|#\1|" Gemfile
|
||||
sed -i "s|^\\(\\s*sqlite3\\b\)|#\1|" Gemfile.lock
|
||||
# make sure postgresql db is present, as it is the default heroku db
|
||||
echo "\ngem 'pg'" >>Gemfile
|
||||
echo "\ngem 'localeapp'" >>Gemfile
|
||||
echo $'\ngem "pg"' >>Gemfile
|
||||
echo $'\ngem "localeapp"' >>Gemfile
|
||||
# always use unicorn
|
||||
echo "\ngem 'unicorn'" >>Gemfile
|
||||
echo $'\ngem "unicorn"' >>Gemfile
|
||||
echo 'web: bundle exec unicorn -p $PORT -E $RACK_ENV' >Procfile
|
||||
bundle install --quiet # to update Gemfile.lock
|
||||
# do not ignore deployment files
|
||||
|
|
|
|||
Loading…
Reference in New Issue