Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

enable actions for multi (group) orders and ordergroup invoices

Browse source
This commit is contained in:
viehlieb 2025-05-19 16:37:05 +02:00
parent f676497e43
commit e902aa0d5a
44 changed files with 550 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

56
app/assets/javascripts/order.js
View file

@ -1,10 +1,11 @@
function doTheDownload(selectedGroupOrderIds, orderId, url, supplier, mode = "all") {
console.log(selectedGroupOrderIds);
if (mode == "all") {
var data = { order_id: orderId }
}
else {
var data = { group_order_ids: selectedGroupOrderIds }
var data = { multi_group_order_ids: selectedGroupOrderIds }
}
if (mode == "all" || selectedGroupOrderIds.length > 0) {
//suppress generic error warning
@ -73,7 +74,6 @@ function doTheDownload(selectedGroupOrderIds, orderId, url, supplier, mode = "al
}
}
$(document).off('change', '[class^="ajax-update-all-link-"] select').on('change', '[class^="ajax-update-all-link-"] select', function () {
var selectedValue = $(this).val();
var url = $(this).closest('a').attr('href');
@ -108,24 +108,66 @@ $(document).off('change', '[class^="ajax-update-link-"] select').on('change', '[
$(document).on('ready turbolinks:load', function () {
$('.expand-trigger').click(function () {
var orderId = $(this).closest('tr').data('order_id');
var expandedRow = $('#expanded-row-' + orderId);
var tableRow = $(this).closest('tr')
var orderId = tableRow.data('order_id');
var multiOrderId = tableRow.data('multi_order_id');
if(multiOrderId != undefined){
var expandedRow = $('#expanded-multi-row-' + multiOrderId);
console.log(multiOrderId);
}
else
{
var expandedRow = $('#expanded-row-' + orderId);
}
// Toggle visibility of the expanded row
expandedRow.slideToggle();
expandedRow.toggleClass('hidden');
tableRow.toggleClass('border');
expandedRow.toggleClass('bordered');
return false; // Prevent the default behavior of the link
});
});
$(document).on('click', '.merge-orders-btn', function () {
const url = $(this).data('url');
const selectedOrderIds = $('input[name="order_ids_for_multi_order[]"]:checked').map(function () {
return $(this).val();
}).get();
if (selectedOrderIds.length === 0) {
alert("Bitte wählen Sie mindestens eine Bestellung aus.");
return;
}
$.ajax({
url: url,
method: 'POST',
data: { order_ids_for_multi_order: selectedOrderIds },
success: function (response) {
window.location.reload();
},
error: function (xhr) {
window.location.reload();
}
});
});
$(document).off('click', '[id^="collective-direct-debit-link-selected-"]').on('click', '[id^="collective-direct-debit-link-selected-"]', function (e) {
e.preventDefault();
var input = "group_order_ids_for_order_"
var orderId = $(this).data("order-id");
var supplier = $(this).data("supplier");
if (orderId == undefined) {
orderId = $(this).data("multi-order-id");
input = "group_order_ids_for_multi_order_"
}
// Extract selected group_order_ids
var selectedGroupOrderIds = $('input[name^="group_order_ids_for_order_' + orderId + '"]:checked').map(function () {
var selectedGroupOrderIds = $('input[name^="'+ input + orderId + '"]:checked').map(function () {
return $(this).val();
}).get();
console.log(selectedGroupOrderIds);
var url = $(this).closest('a').attr('href');
doTheDownload(selectedGroupOrderIds, orderId, url, supplier, "selected");

23
app/assets/stylesheets/group_order_invoices.css
View file

@ -26,6 +26,29 @@
}
.expanded-row{
td {
padding-top: 0 !important;
}
}
.hidden{
display: none;
}
.border td{
background-color: rgb(231, 231, 194) !important;
}
.bordered {
.order-modal{
background-color: lightgoldenrodyellow !important;
padding-bottom: 2em ;
}
.multi-order-modal{
background-color: lightgoldenrodyellow !important;
padding-bottom: 2em ;
}
}
.table.group-order-invoices-table tr{
background-color: rgb(255, 255, 233);
}

8
app/controllers/concerns/send_group_order_invoice_pdf.rb
View file

@ -7,6 +7,14 @@ module Concerns::SendGroupOrderInvoicePdf
invoice_data = group_order_invoice.load_data_for_invoice
invoice_data[:title] = t('documents.group_order_invoice_pdf.title', supplier: invoice_data[:supplier])
invoice_data[:no_footer] = true
puts "
" + "____________" + "
" + "____________" + "
" + "____________" + "
" + "#{invoice_data.inspect}" + "
" + "____________"+ "
" + "____________"+ "
" + "____________"
GroupOrderInvoicePdf.new invoice_data
end

11
app/controllers/finance/balancing_controller.rb
View file

@ -1,7 +1,14 @@
class Finance::BalancingController < Finance::BaseController
def index
@multi_orders = MultiOrder.includes(:orders, :group_orders).page(params[:page]).per(@per_page).order('ends DESC')
@orders = Order.finished.non_multi_order.page(params[:page]).per(@per_page).order('ends DESC')
page = params[:page].to_i
page = 1 if page < 1
per_page = @per_page.to_i
offset = (page - 1) * per_page
multi_orders = MultiOrder.includes(:orders, :group_orders).page(params[:page]).per(@per_page).order('ends DESC')
orders = Order.finished.non_multi_order.page(params[:page]).per(@per_page).order('ends DESC')
combined = (multi_orders + orders).sort_by { |r| r.ends }.reverse
@results = Kaminari.paginate_array(combined).page(params[:page]).per(@per_page)
end
def new

2
app/controllers/group_order_invoices_controller.rb
View file

@ -49,7 +49,7 @@ class GroupOrderInvoicesController < ApplicationController
gos.each do |go|
goi = GroupOrderInvoice.find_or_create_by!(group_order_id: go.id)
goi.invoice_date = invoice_date
goi.invoice_number = goi.generate_invoice_number(GroupOrderInvoice, 1)
goi.invoice_number = goi.generate_invoice_number(goi, 1)
goi.save!
end
respond_to do |format|

124
app/controllers/multi_orders_controller.rb
View file

@ -1,21 +1,42 @@
class MultiOrdersController < ApplicationController
include SepaHelper
before_action :set_multi_order, only: [:generate_ordergroup_invoices]
def create
orders = Order.where(id: multi_order_params[:order_ids_for_multi_order])
unclosed_orders = orders.select { |order| order.closed? == false }
multi_orders = orders.select { |order| order.multi_order_id.present? }
invoiced_orders = orders.select {|order| order.group_orders.map(&:group_order_invoice).compact.present? }
if multi_order_params[:multi_order_ids_for_multi_multi_order].present?
#TODO: do the i18n and add a test
flash[:alert] = "Du kannst keine Multi-Bestellungen in eine Multi-Multi-Bestellung umwandeln."
redirect_to finance_order_index_path
msg = "Du kannst keine Multi-Bestellungen in eine Multi-Multi-Bestellung umwandeln."
flash[:alert] = msg
respond_to do |format|
format.js
format.html { redirect_to finance_order_index_path }
end
return
end
if multi_orders.any? || unclosed_orders.any?
#TODO: do the i18n and add a test
flash[:alert] = "Die Bestellung ist noch nicht abgeschlossen oder ist bereits Teil einer Multi-Bestellung."
redirect_to finance_order_index_path
msg = "Die Bestellung ist bereits Teil einer Multi-Bestellung oder ist noch nicht abgeschlossen."
flash[:alert] = msg
respond_to do |format|
format.js
format.html { redirect_to finance_order_index_path }
end
return
end
if invoiced_orders.any?
msg = "Zusammenführen nicht möglich. Es gibt bereits Rechnungen für einige der Bestellgruppen."
flash[:alert] = msg
respond_to do |format|
format.js
format.html { redirect_to finance_order_index_path }
end
return
end
@ -24,15 +45,6 @@ class MultiOrdersController < ApplicationController
@multi_order.orders = orders
@multi_order.ends = orders.map(&:ends).max
@multi_order.save!
puts "
" + "______________" + "
" + "______________" + "
" + "______________" + "
" + "#{@multi_order.errors.inspect}" + "
" + "______________"+ "
" + "______________"+ "
" + "______________"
#create multi group orders
all_group_orders = orders.flat_map(&:group_orders)
@ -42,7 +54,6 @@ class MultiOrdersController < ApplicationController
multi_group_order = MultiGroupOrder.create!(
multi_order: @multi_order, group_orders: group_orders
)
# Now, associate each group_order with the new multi_group_order
group_orders.each do |group_order|
group_order.update!(multi_group_order: multi_group_order)
@ -51,9 +62,19 @@ class MultiOrdersController < ApplicationController
redirect_to finance_order_index_path
rescue ActiveRecord::RecordInvalid => e
flash[:alert] = t('errors.general_msg', msg: e.message)
redirect_to finance_order_index_path
respond_to do |format|
format.js
format.html { redirect_to finance_order_index_path }
end
end
end
def destroy
@multi_order = MultiOrder.find(params[:id])
@multi_order.destroy
respond_to do |format|
format.html { redirect_to finance_order_index_path }
end
end
def generate_ordergroup_invoices
@ -65,6 +86,77 @@ class MultiOrdersController < ApplicationController
redirect_to finance_order_index_path, alert: t('errors.general_msg', msg: e.message)
end
def collective_direct_debit
if foodsoft_sepa_ready?
case params[:mode]
when 'all'
multi_group_orders = MultiGroupOrder.where(multi_order_id: params[:id])
when 'selected'
#TODO: !!! params and javascript
multi_group_orders = MultiGroupOrder.where(id: params[:multi_group_order_ids])
else
redirect_to finance_order_index_path, alert: I18n.t('orders.collective_direct_debit.alert', ordergroup_names: '')
end
@multi_order = MultiOrder.find(params[:id])
ordergroups = multi_group_orders.flat_map(&:group_orders).map(&:ordergroup)
export_allowed = !ordergroups.map(&:sepa_possible?).include?(false) && !multi_group_orders.map { |go| go.ordergroup_invoice.present? }.include?(false)
group_order_ids = multi_group_orders.map { |mgo| mgo.id if mgo.ordergroup_invoice.present? }
sepa_possible_ordergroup_names = ordergroups.map { |ordergroup| ordergroup.name if ordergroup.sepa_possible? }.compact_blank
sepa_not_possible_ordergroup_names = ordergroups.map(&:name) - sepa_possible_ordergroup_names
if export_allowed && multi_group_orders.present?
respond_to do |format|
format.html do
collective_debit = OrderCollectiveDirectDebitXml.new(multi_group_orders)
send_data collective_debit.xml_string, filename: @order.name + '_Sammellastschrift' + '.xml', type: 'text/xml'
multi_group_orders.map(&:ordergroup_invoice).each(&:mark_sepa_downloaded)
rescue SEPA::Error => e
multi_group_orders.map(&:ordergroup_invoice).each(&:unmark_sepa_downloaded)
redirect_to finance_order_index_path, alert: e.message
rescue StandardError => e
multi_group_orders.map(&:ordergroup_invoice).each(&:unmark_sepa_downloaded)
redirect_to finance_order_index_path, alert: I18n.t('orders.collective_direct_debit.alert', ordergroup_names: sepa_not_possible_ordergroup_names.join(', '), error: e.message)
end
format.xml do
multi_group_orders.map(&:ordergroup_invoice).each(&:mark_sepa_downloaded)
collective_debit = OrderCollectiveDirectDebitXml.new(multi_group_orders)
send_data collective_debit.xml_string, filename: @multi_order.orders.first.name + '_Sammellastschrift' + '.xml', type: 'text/xml'
rescue SEPA::Error => e
multi_group_orders.map(&:ordergroup_invoice).each(&:unmark_sepa_downloaded)
render json: { error: e.message }
rescue StandardError => e
multi_group_orders.map(&:ordergroup_invoice).each(&:unmark_sepa_downloaded)
render json: { error: I18n.t('orders.collective_direct_debit.alert', ordergroup_names: sepa_not_possible_ordergroup_names.join(', '), error: e.message) }
end
format.js
end
else
respond_to do |format|
format.html do
redirect_to finance_order_index_path, alert: I18n.t('orders.collective_direct_debit.alert', ordergroup_names: sepa_not_possible_ordergroup_names.join(', '), error: '')
end
format.xml do
render json: { error: I18n.t('orders.collective_direct_debit.alert', ordergroup_names: sepa_not_possible_ordergroup_names.join(', '), error: '') }
end
format.js
end
end
else
respond_to do |format|
format.html do
redirect_to finance_order_index_path, alert: "Wichtige SEPA Konfiguration in Administration >> Einstellungen >> Finanzen nicht gesetzt!"
end
format.xml do
redirect_to finance_order_index_path, alert: "Wichtige SEPA Konfiguration in Administration >> Einstellungen >> Finanzen nicht gesetzt!"
end
format.js
end
end
end
private
def set_multi_order
@ -72,6 +164,6 @@ class MultiOrdersController < ApplicationController
end
def multi_order_params
params.permit(:id, order_ids_for_multi_order: [], multi_order_ids_for_multi_multi_order: [])
params.permit(:id, :foodcoop, order_ids_for_multi_order: [], multi_order_ids_for_multi_multi_order: [])
end
end

135
app/controllers/ordergroup_invoices_controller.rb
View file

@ -1,3 +1,4 @@
class OrdergroupInvoicesController < ApplicationController
include Concerns::SendGroupOrderInvoicePdf
before_action :authenticate_finance
@ -27,9 +28,11 @@ class OrdergroupInvoicesController < ApplicationController
end
def create
gos = GroupOrder.where(id: params[:group_order_ids])
mgo = MultiGroupOrder.find(params[:multi_group_order_id])
@multi_order = mgo.multi_order
begin
OrdergroupInvoice.create!(group_order_ids: gos)
OrdergroupInvoice.create(multi_group_order_id: mgo.id)
respond_to do |format|
format.js
end
@ -38,19 +41,139 @@ class OrdergroupInvoicesController < ApplicationController
end
end
def destroy
oi = OrdergroupInvoice.find(params[:id])
@multi_order = oi.multi_group_order.multi_order
oi.destroy
respond_to do |format|
format.js
format.json { head :no_content }
end
end
def create_multiple
invoice_date = params[:ordergroup_invoce][:invoice_date]
multi_order_id = params[:ordergroup_invoce][:multi_order_id]
invoice_date = params[:ordergroup_invoice][:invoice_date]
multi_order_id = params[:ordergroup_invoice][:multi_order_id]
@multi_order = MultiOrder.find(multi_order_id)
multi_group_orders = MultiGroupOrder.where("multi_order_id = ?", multi_order_id)
mutli_group_orders.each do |multi_group_order|
multi_group_orders.each do |multi_group_order|
ordergroup_invoice = OrdergroupInvoice.find_or_create_by!(multi_group_order: multi_group_order)
ordergroup_invoice.invoice_date = invoice_date
ordergroup_invoice.invoice_number = ordergroup_invoice.generate_invoice_number(OrdergroupInvoice, 1)
ordergroup_invoice.invoice_number = ordergroup_invoice.generate_invoice_number(ordergroup_invoice, 1)
ordergroup_invoice.save!
end
respond_to do |format|
format.js
end
end
def select_sepa_sequence_type
@ordergroup_invoice = OrdergroupInvoice.find(params[:id])
@multi_group_order = @ordergroup_invoice.multi_group_order
return unless params[:sepa_sequence_type]
respond_to do |format|
@ordergroup_invoice.sepa_sequence_type = params[:sepa_sequence_type]
if @ordergroup_invoice.save!
format.js
else
format.json { render json: @ordergroup_invoice.errors, status: :unprocessable_entity }
end
end
end
def select_all_sepa_sequence_type
@multi_order= MultiOrder.find(params[:multi_order_id])
@ordergroup_invoices = @multi_order.multi_group_orders.map(&:ordergroup_invoice).compact
return unless params[:sepa_sequence_type]
@sepa_sequence_type = params[:sepa_sequence_type]
@ordergroup_invoices.each do |oi|
oi.sepa_sequence_type = params[:sepa_sequence_type]
oi.save!
end
respond_to do |format|
format.js
end
end
def toggle_paid
@ordergroup_invoice = OrdergroupInvoice.find(params[:id])
respond_to do |format|
@ordergroup_invoice.paid = !@ordergroup_invoice.paid
if @ordergroup_invoice.save!
format.js
else
format.json { render json: @ordergroup_invoice.errors, status: :unprocessable_entity }
end
end
end
def toggle_sepa_downloaded
@ordergroup_invoice = OrdergroupInvoice.find(params[:id])
@multi_order= @ordergroup_invoice.multi_group_order.multi_order
respond_to do |format|
@ordergroup_invoice.sepa_downloaded = !@ordergroup_invoice.sepa_downloaded
if @ordergroup_invoice.save!
format.js
else
format.json { render json: @ordergroup_invoice.errors, status: :unprocessable_entity }
end
end
end
def toggle_all_paid
@multi_order= MultiOrder.find(params[:multi_order_id])
@ordergroup_invoices = @multi_order.multi_group_orders.map(&:ordergroup_invoice).compact
@ordergroup_invoices.each do |oi|
oi.paid = !ActiveRecord::Type::Boolean.new.deserialize(params[:paid])
oi.save!
end
respond_to do |format|
format.js
end
end
def toggle_all_sepa_downloaded
@multi_order= MultiOrder.find(params[:multi_order_id])
@ordergroup_invoices = @multi_order.multi_group_orders.map(&:ordergroup_invoice).compact
@ordergroup_invoices.each do |goi|
goi.sepa_downloaded = !ActiveRecord::Type::Boolean.new.deserialize(params[:sepa_downloaded])
goi.save!
end
respond_to do |format|
format.js
end
end
def download_all
multi_order = MultiOrder.find(params[:multi_order_id])
invoices = multi_order.multi_group_orders.map(&:ordergroup_invoice)
pdf = {}
file_paths = []
temp_file = Tempfile.new("all_invoices_for_multi_order_#{multi_order.id}.zip")
Zip::File.open(temp_file.path, Zip::File::CREATE) do |zipfile|
invoices.each do |invoice|
pdf = create_invoice_pdf(invoice)
file_path = File.join("tmp", pdf.filename)
File.open(file_path, 'w:ASCII-8BIT') do |file|
file.write(pdf.to_pdf)
end
file_paths << file_path
zipfile.add(pdf.filename, file_path) unless zipfile.find_entry(pdf.filename)
end
end
zip_data = File.read(temp_file.path)
file_paths.each do |file_path|
File.delete(file_path)
end
respond_to do |format|
format.html do
send_data(zip_data, type: 'application/zip', filename: "#{l multi_order.ends, format: :file}-#{multi_order.orders.first.supplier.name}-#{multi_order.id}.zip", disposition: 'attachment')
end
end
end
end

9
app/documents/group_order_invoice_pdf.rb
View file

@ -11,7 +11,7 @@ class GroupOrderInvoicePdf < RenderPdf
def body
contact = FoodsoftConfig[:contact].symbolize_keys
ordergroup = @options[:ordergroup]
# TODO: group_by supplier, sort alphabetically
# From paragraph
bounding_box [margin_box.right - 200, margin_box.top - 20], width: 200 do
text I18n.t('documents.group_order_invoice_pdf.invoicer')
@ -69,8 +69,6 @@ class GroupOrderInvoicePdf < RenderPdf
#------------- Table Data -----------------------
@group_order = GroupOrder.find(@options[:group_order].id)
if FoodsoftConfig[:group_order_invoices][:vat_exempt]
body_for_vat_exempt
else
@ -82,7 +80,8 @@ class GroupOrderInvoicePdf < RenderPdf
total_gross = 0
data = [I18n.t('documents.group_order_invoice_pdf.vat_exempt_rows')]
move_down 10
group_order_articles = GroupOrderArticle.where(group_order_id: @group_order.id)
# no sinle group_order_id, capice? get all the articles.
group_order_articles = GroupOrderArticle.where(group_order_ids: @options.group_order_ids)
separate_deposits = FoodsoftConfig[:group_order_invoices]&.[](:separate_deposits)
group_order_articles.each do |goa|
# if no unit is received, nothing is to be charged
@ -173,7 +172,7 @@ class GroupOrderInvoicePdf < RenderPdf
else
[I18n.t('documents.group_order_invoice_pdf.price_markup_rows', marge: marge)]
end
goa_tax_hash = GroupOrderArticle.where(group_order_id: @group_order.id).find_each.group_by { |oat| oat.order_article.price.tax }
goa_tax_hash = GroupOrderArticle.where(group_order_id: @options[:group_order_ids]).find_each.group_by { |oat| oat.order_article.price.tax }
goa_tax_hash.each do |tax, group_order_articles|
group_order_articles.each do |goa|
# if no unit is received, nothing is to be charged

2
app/models/group_order.rb
View file

@ -11,7 +11,7 @@ class GroupOrder < ApplicationRecord
has_one :financial_transaction
has_one :group_order_invoice
belongs_to :ordergroup_invoice, optional: true
belongs_to :multi_group_order, optional: true
belongs_to :multi_group_order, optional: true, dependent: :destroy
belongs_to :multi_order, optional: true
belongs_to :updated_by, optional: true, class_name: 'User', foreign_key: 'updated_by_user_id'

24
app/models/multi_group_order.rb
View file

@ -1,21 +1,21 @@
class MultiGroupOrder < ApplicationRecord
belongs_to :multi_order
has_many :group_orders, dependent: :nullify
after_destroy :delete_ordergroup_invoices
def ordergroup_invoice
#TODO: delete if deleted
group_orders.joins(:ordergroup_invoice).first&.ordergroup_invoice
end
has_many :group_orders
has_one :ordergroup_invoice, dependent: :destroy
def ordergroup
ordergroup_invoice&.ordergroup
group_orders.first&.ordergroup
end
private
def price
group_orders.map(&:price).sum
end
def delete_ordergroup_invoices
ordergroup_invoice&.destroy
def group_order_invoice
ordergroup_invoice
end
def order
multi_order
end
end

10
app/models/multi_order.rb
View file

@ -2,9 +2,10 @@ class MultiOrder < ApplicationRecord
has_many :orders, dependent: :nullify
has_many :order_articles, through: :orders
has_many :multi_group_orders, dependent: :destroy
#TODO: diese association lösen
has_many :group_orders, through: :multi_group_orders
has_many :ordergroups, through: :group_orders
#TODO: wenn groupOrderInvoice existiert, dann fehler schmeißen..
# has_many :ordergroups, through: :group_orders
has_many :ordergroup_invoices, through: :group_orders
#make sure order has no multi_order_id
@ -33,6 +34,11 @@ class MultiOrder < ApplicationRecord
orders.map(&:foodcoop_result).compact_blank.sum
end
def supplier
#todo: who is this?
orders.map(&:supplier).compact.first
end
private
def check_orders
orders.each do |order|

30
app/models/ordergroup_invoice.rb
View file

@ -3,16 +3,27 @@ class OrdergroupInvoice < ApplicationRecord
belongs_to :multi_group_order, optional: true
has_many :group_orders, dependent: :nullify
# has_many :group_orders, through: :multi_group_order, dependent: :nullify
validates_presence_of :invoice_number
validates_uniqueness_of :invoice_number
validate :tax_number_set
after_initialize :init, unless: :persisted?
# accepts_nested_attributes_for :group_orders, :multi_group_order
enum sequence_type: {
FRST: "Erst-Lastschrift",
RCUR: "Folge-Lastschrift",
OOFF: "Einmalige Lastschrift",
FNAL: "Letztmalige Lastschrift"
}
def init
self.invoice_date = Time.now unless invoice_date
self.invoice_number = generate_invoice_number(self, 1) unless self.invoice_number
self.payment_method = group_orders.first&.financial_transaction&.financial_transaction_type&.name || FoodsoftConfig[:group_order_invoices]&.[](:payment_method) || I18n.t('activerecord.attributes.group_order_invoice.payment_method') unless self.payment_method
self.payment_method = multi_group_order.group_orders.first&.financial_transaction&.financial_transaction_type&.name || FoodsoftConfig[:ordergroup_invoices]&.[](:payment_method) || I18n.t('activerecord.attributes.ordergroup_invoice.payment_method') unless self.payment_method
end
def ordergroup
@ -27,13 +38,26 @@ class OrdergroupInvoice < ApplicationRecord
errors.add(:cumulative_invoice, "Keine Steuernummer in FoodsoftConfig :contact gesetzt")
end
def mark_sepa_downloaded
self.sepa_downloaded = true
self.save
end
def unmark_sepa_downloaded
self.sepa_downloaded = false
self.save
end
def name
I18n.t('activerecord.attributes.group_order_invoice.name') + "_#{invoice_number}"
I18n.t('activerecord.attributes.ordergroup_invoice.name') + "_#{invoice_number}"
end
def load_data_for_invoice
invoice_data = {}
group_orders = multi_group_order.group_orders
order = group_orders.map(&:order).first
#how to define one order?
invoice_data[:pickup] = order.pickup
invoice_data[:supplier] = order.supplier&.name
invoice_data[:ordergroup] = group_orders.first.ordergroup

16
app/views/finance/balancing/_multi_order_row.html.haml
View file

@ -1,6 +1,5 @@
%tr{:class => cycle("even","odd", :name => "multi_order"), 'data-multi_order_id' => multi_order.id}
%td
= check_box_tag "multi_order_ids_for_multi_multi_order[]", multi_order.id, false, class: "multi_order-checkbox", id: "multi_order_#{multi_order.id}_combine", data: { multi_order_id: multi_order.id }
%td
= "*Multi*"
-multi_order.orders.each do |order|
@ -9,14 +8,19 @@
%td=h format_time(multi_order.ends) unless multi_order.ends.nil?
%td= multi_order.closed? ? t('finance.balancing.orders.cleared', amount: number_to_currency(multi_order.foodcoop_result)) : t('finance.balancing.orders.ended')
%td= show_user(multi_order.updated_by)
%td{id: "group-multi_order-invoices-for-multi-order-#{multi_order.id}", class: 'expand-trigger'}
%td{id: "group-multi_order-invoices-for-multi-order-#{multi_order.id}"}
- if multi_order.closed?
-if FoodsoftConfig[:contact][:tax_number] && multi_order.group_orders.present?
= link_to I18n.t('activerecord.attributes.group_order_invoice.open_details_modal'), "#", remote: true, class: 'btn btn-small'
-if FoodsoftConfig[:contact][:tax_number] && multi_order.multi_group_orders.present?
= link_to I18n.t('activerecord.attributes.group_order_invoice.open_details_modal'), "#", remote: true, class: 'btn btn-small expand-trigger'
-else
= I18n.t('activerecord.attributes.group_order_invoice.tax_number_not_set')
- else
= t('orders.index.not_closed')
%tr{:class => 'expanded-row', :id => "expanded-row-#{multi_order.id}", :style => 'display: none;'}
%td{:colspan => '6'}
%td
= link_to multi_order, method: :delete, data: { confirm: I18n.t('ui.confirm_delete', name: "Multi Bestellung #{multi_order.name}" ) } do
Multi Bestellung auflösen
%i.icon-remove
%tr{:class => 'expanded-row hidden', :id => "expanded-multi-row-#{multi_order.id}"}
%td{:colspan => '7'}
= render partial: 'ordergroup_invoices/modal', locals: { multi_order: multi_order }

6
app/views/finance/balancing/_order_row.html.haml
View file

@ -5,10 +5,10 @@
%td=h format_time(order.ends) unless order.ends.nil?
%td= order.closed? ? t('finance.balancing.orders.cleared', amount: number_to_currency(order.foodcoop_result)) : t('finance.balancing.orders.ended')
%td= show_user(order.updated_by)
%td{id: "group-order-invoices-for-order-#{order.id}", class: 'expand-trigger'}
%td{id: "group-order-invoices-for-order-#{order.id}"}
- if order.closed?
-if FoodsoftConfig[:contact][:tax_number] && order.ordergroups.present?
= link_to I18n.t('activerecord.attributes.group_order_invoice.open_details_modal'), "#", remote: true, class: 'btn btn-small'
= link_to I18n.t('activerecord.attributes.group_order_invoice.open_details_modal'), "#", remote: true, class: 'btn btn-small expand-trigger'
-else
= I18n.t('activerecord.attributes.group_order_invoice.tax_number_not_set')
- else
@ -21,6 +21,6 @@
- else
= link_to t('orders.index.action_receive'), '#', class: 'btn btn-small disabled'
= link_to t('finance.balancing.orders.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-small btn-primary'
%tr{:class => 'expanded-row', :id => "expanded-row-#{order.id}", :style => 'display: none;'}
%tr{:class => 'expanded-row hidden', :id => "expanded-row-#{order.id}"}
%td{:colspan => '7'}
= render partial: 'group_order_invoices/modal', locals: { order: order }

41
app/views/finance/balancing/_orders.html.haml
View file

@ -1,27 +1,24 @@
- unless @orders.empty? && @multi_orders.empty?
- unless @results.empty?
- if Order.finished.count > 20
= items_per_page
= pagination_links_remote @orders
-# following posed a real problem, multiple submit buttons are within the same form, so only one of them will be submitted
-# convert to javascript
= form_with url: multi_orders_path, method: :post, local: true do |form|
%table.table.table-striped
%thead
%tr
%th=I18n.t('activerecord.attributes.group_order_invoice.links.combine')
%th= t('.name')
%th= t('.end')
%th= t('.state')
%th= heading_helper Order, :updated_by
%th= heading_helper GroupOrderInvoice, :name
%th
%th
%tbody
- @multi_orders.each do |multi_order|
= render partial: 'multi_order_row', locals: { multi_order: multi_order }
- @orders.each do |order|
= render partial: 'order_row', locals: { order: order }
= form.submit "Zusammenführen", class: 'btn btn-primary'
%table.table.table-striped
%thead
%tr
%th=I18n.t('activerecord.attributes.group_order_invoice.links.combine')
%th= t('.name')
%th= t('.end')
%th= t('.state')
%th= heading_helper Order, :updated_by
%th= heading_helper GroupOrderInvoice, :name
%th
%th
%tbody
- @results.each do |result|
- if result.class == Order
= render partial: 'order_row', locals: { order: result }
- else
= render partial: 'multi_order_row', locals: { multi_order: result }
= button_tag 'Zusammenführen', class: 'btn btn-primary merge-orders-btn', type: 'button', data: { url: multi_orders_path }
- else
%i= t('.no_closed_orders')

6
app/views/finance/balancing/index.js.haml
View file

@ -5,7 +5,11 @@ $('#ordersTable').html('#{j(render('orders'))}');
var orderId = $(this).closest('tr').data('order_id');
var expandedRow = $('#expanded-row-' + orderId);
// Toggle visibility of the expanded row
expandedRow.slideToggle();
expandedRow.toggleClass('hidden');
tableRow.toggleClass('border');
expandedRow.toggleClass('bordered');
return false; // Prevent the default behavior of the link
});

4
app/views/group_order_invoices/_links.html.haml
View file

@ -5,7 +5,7 @@
- if go.group_order_invoice.present?
- show_generate_with_date = false
- if show_generate_with_date
= form_for :group_order_invoice, url: url_for('group_order_invoice#create_multiple'), remote: true do |f|
= form_for :group_order_invoice, url: finance_group_order_invoice_path(foodcoop: FoodsoftConfig[:default_scope], protocol: :https), remote: true do |f|
= f.label :invoice_date, I18n.t('activerecord.attributes.group_order_invoice.links.invoice_date')
= f.date_field :invoice_date, {value: Date.today, max: Date.today, required: true}
= f.hidden_field :order_id, value: order.id
@ -37,6 +37,8 @@
=render :partial => 'group_order_invoices/select_sepa_sequence_type', locals:{ group_order_invoice: go.group_order_invoice, group_order: go }
%td
= check_box_tag "group_order_ids_for_order_#{order.id}", go.id, false, class: "group-order-checkbox", id: "group_order_#{go.id}_included_in_sepa", data: { order_id: go.id }
%td
%b= go.group_order_invoice.invoice_number
%td
= link_to I18n.t('activerecord.attributes.group_order_invoice.links.download'), group_order_invoice_path(go.group_order_invoice, :format => 'pdf'), class: 'btn btn-block'
= link_to I18n.t('activerecord.attributes.group_order_invoice.links.delete'), go.group_order_invoice, method: :delete, class: 'btn btn-block btn-danger', remote: true, data: { confirm: I18n.t('ui.confirm_delete', name: "Bestellgruppenrechnung für #{go.ordergroup.name}" ) }

1
app/views/group_order_invoices/create_multiple.js.erb
View file

@ -1,2 +1 @@
$("#order_<%= @order.id %>_modal").html("<%= escape_javascript(render partial: 'links', locals: {order: @order}) %>");

8
app/views/ordergroup_invoices/_collective_direct_debit.html.haml Normal file
View file

@ -0,0 +1,8 @@
- if foodsoft_sepa_ready?
= link_to 'Sammellastschrift für alle (.xml)', collective_direct_debit_multi_order_path(id: multi_order.id, mode: 'all'), class: 'btn btn-block', data: { turbolinks: false, multi_order_id: multi_order.id, supplier: FoodsoftConfig[:name] }, id: "collective-direct-debit-link-all-#{multi_order.id}"
= link_to 'Sammellastschrift für ausgewählt (.xml)', collective_direct_debit_multi_order_path(id: multi_order.id, mode: 'selected'), class: 'btn btn-block', data: { turbolinks: false, multi_order_id: multi_order.id, supplier: FoodsoftConfig[:name] }, id: "collective-direct-debit-link-selected-#{multi_order.id}"
- else
%i
= t('activerecord.attributes.group_order_invoice.links.sepa_not_ready')
-# solve hotfix: multi_order.orders.first.supplier&.name

87
app/views/ordergroup_invoices/_links.html.haml
View file

@ -5,7 +5,7 @@
- if mgo.ordergroup_invoice.present?
- show_generate_with_date = false
- if show_generate_with_date
= form_for :ordergroup_invoice, url: url_for('ordergroup_invoice#create_multiple'), remote: true do |f|
= form_for :ordergroup_invoice, url: finance_ordergroup_invoice_path(foodcoop: FoodsoftConfig[:default_scope], protocol: :https), remote: true do |f|
= f.label :invoice_date, I18n.t('activerecord.attributes.group_order_invoice.links.invoice_date')
= f.date_field :invoice_date, {value: Date.today, max: Date.today, required: true}
= f.hidden_field :multi_order_id, value: multi_order.id
@ -20,52 +20,55 @@
%th=I18n.t('activerecord.attributes.group_order_invoice.links.sepa_downloaded')
%th=I18n.t('activerecord.attributes.group_order_invoice.links.sepa_sequence_type')
%th=I18n.t('activerecord.attributes.group_order_invoice.links.sepa_select')
%th=I18n.t('activerecord.attributes.group_order_invoice.links.invoice_number')
%th
%tbody
- multi_order.multi_group_orders.each do |mgo|
-if mgo.ordergroup_invoice.present?
- if mgo.ordergroup_invoice
= mgo.ordergroup_invoice.invoice_number
%tr.order-row{id: "multi_group_order_#{mgo.id}"}
%td= link_to mgo.ordergroup&.name, edit_admin_ordergroup_path(mgo.ordergroup)
%td
= link_to mgo.ordergroup&.name, edit_admin_ordergroup_path(mgo.ordergroup)
%td
.div{id: "paid_multi_#{mgo.ordergroup_invoice.id}"}
= render :partial => "ordergroup_invoices/toggle_paid", locals: { ordergroup_invoice: mgo.ordergroup_invoice }
%td
.div{id: "sepa_downloaded_multi_#{mgo.ordergroup_invoice.id}"}
= render :partial => "ordergroup_invoices/toggle_sepa_downloaded", locals: { ordergroup_invoice: mgo.ordergroup_invoice }
%td
.div{id: "select_sepa_sequence_type_multi_#{mgo.ordergroup_invoice.id}"}
=render :partial => 'ordergroup_invoices/select_sepa_sequence_type', locals:{ ordergroup_invoice: mgo.ordergroup_invoice, multi_group_order: mgo }
%td
= check_box_tag "group_order_ids_for_multi_order_#{multi_order.id}", mgo.id, false, class: "group-order-checkbox", id: "group_order_#{mgo.id}_included_in_sepa", data: { multi_group_order_id: mgo.id }
%td
%b= mgo.ordergroup_invoice.invoice_number
%td
= link_to I18n.t('activerecord.attributes.group_order_invoice.links.delete'), mgo.ordergroup_invoice, method: :delete, class: 'btn btn-block btn-danger', remote: true, data: { confirm: I18n.t('ui.confirm_delete', name: "Bestellgruppenrechnung für #{mgo.ordergroup.name}" ) }
= link_to I18n.t('activerecord.attributes.group_order_invoice.links.download'), ordergroup_invoice_path(mgo.ordergroup_invoice, :format => 'pdf'), class: 'btn btn-block'
-# .div{id: "paid_#{mgo.ordergroup_invoice.id}"}
-# = render :partial => "group_order_invoices/toggle_paid", locals: { group_order_invoice: go.group_order_invoice }
-# %td
-# .div{id: "sepa_downloaded_#{go.group_order_invoice.id}"}
-# = render :partial => "group_order_invoices/toggle_sepa_downloaded", locals: { group_order_invoice: go.group_order_invoice }
-# %td
-# .div{id: "select_sepa_sequence_type_#{go.group_order_invoice.id}"}
-# =render :partial => 'group_order_invoices/select_sepa_sequence_type', locals:{ group_order_invoice: go.group_order_invoice, group_order: go }
-# %td
-# = check_box_tag "group_order_ids_for_order_#{multi_order.id}", go.id, false, class: "group-order-checkbox", id: "group_order_#{go.id}_included_in_sepa", data: { order_id: go.id }
-# = link_to I18n.t('activerecord.attributes.group_order_invoice.links.delete'), go.group_order_invoice, method: :delete, class: 'btn btn-block btn-danger', remote: true, data: { confirm: I18n.t('ui.confirm_delete', name: "Bestellgruppenrechnung für #{go.ordergroup.name}" ) }
-# - else
-# %tr
-# %td
-# = go.ordergroup&.name
-# = button_to I18n.t('activerecord.attributes.group_order_invoice.links.generate'), group_order_invoices_path(:method => :post, group_order: go) ,class: 'btn btn-small', params: {id: multi_order.id}, remote: true
-# %td
-# %td
-# %td
-# %td
-# %td
-# - if multi_order.group_orders.map(&:group_order_invoice).compact.present?
-# %tr.order-row
-# %td= I18n.t('activerecord.attributes.group_order_invoice.links.actions_for_all')
-# %td
-# .div{id: "toggle_all_paid_#{multi_order.id}"}
-# = render :partial => 'group_order_invoices/toggle_all_paid', locals: { order: order }
-# %td
-# .div{id: "toggle_all_sepa_downloaded_#{multi_order.id}"}
-# = render :partial => 'group_order_invoices/toggle_all_sepa_downloaded', locals: { order: order }
-# %td
-# .div{id: "select_all_sepa_sequence_type_#{multi_order.id}"}
-# = render :partial => 'group_order_invoices/select_all_sepa_sequence_type', locals: { order: multi_order }
-# %td
-# .div{id: "select_all_sepa_#{multi_order.id}"}
-# = render :partial => 'group_order_invoices/collective_direct_debit', locals: { order: multi_order }
-# %td
-# = link_to I18n.t('activerecord.attributes.group_order_invoice.links.download_all_zip'), download_all_group_order_invoices_path(multi_order), class: 'btn btn-block'
- else
%tr
%td
= mgo.group_orders.first.ordergroup&.name
= button_to I18n.t('activerecord.attributes.group_order_invoice.links.generate'), ordergroup_invoices_path(:method => :post, multi_group_order_id: mgo) ,class: 'btn btn-small', remote: true
%td
%td
%td
%td
%td
- if multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.present?
%tr.order-row
%td= I18n.t('activerecord.attributes.group_order_invoice.links.actions_for_all')
%td
.div{id: "toggle_all_paid_multi_#{multi_order.id}"}
= render :partial => 'ordergroup_invoices/toggle_all_paid', locals: { multi_order: multi_order }
%td
.div{id: "toggle_all_sepa_downloaded_multi_#{multi_order.id}"}
= render :partial => 'ordergroup_invoices/toggle_all_sepa_downloaded', locals: { multi_order: multi_order }
%td
.div{id: "select_all_sepa_sequence_type_multi_#{multi_order.id}"}
= render :partial => 'ordergroup_invoices/select_all_sepa_sequence_type', locals: { multi_order: multi_order }
%td
.div{id: "select_all_sepa_#{multi_order.id}"}
= render :partial => 'ordergroup_invoices/collective_direct_debit', locals: { multi_order: multi_order }
%td
= link_to I18n.t('activerecord.attributes.group_order_invoice.links.download_all_zip'), download_all_ordergroup_invoices_path(multi_order), class: 'btn btn-block'

2
app/views/ordergroup_invoices/_select_all_sepa_sequence_type.html.haml Normal file
View file

@ -0,0 +1,2 @@
= link_to select_all_sepa_sequence_type_ordergroup_invoices_path(multi_order_id: multi_order.id), remote: true, method: :patch, class: "ajax-update-all-link-#{multi_order.id}" , data: { turbolinks: false } do
= select_tag 'sepa_sequence_type', options_for_select(OrdergroupInvoice.sequence_types.keys.map { |st| [I18n.t("activerecord.attributes.group_order_invoice.sequence_type.#{st}"), st] }, selected: @sequence_type || multi_order.multi_group_orders.map(&:ordergroup_invoice)&.compact&.first&.sepa_sequence_type), class: 'form-control', id: "all_sepa_sequence_type_multi_#{multi_order.id}"

2
app/views/ordergroup_invoices/_select_sepa_sequence_type.html.haml Normal file
View file

@ -0,0 +1,2 @@
= link_to select_sepa_sequence_type_ordergroup_invoice_path(ordergroup_invoice), remote: true, method: :patch, class: "ajax-update-link-#{multi_group_order.id}", data: { turbolinks: false } do
= select_tag 'sepa_sequence_type', options_for_select(OrdergroupInvoice.sequence_types.keys.map { |st| [I18n.t("activerecord.attributes.group_order_invoice.sequence_type.#{st}"), st] }, selected: ordergroup_invoice.sepa_sequence_type ), class: 'form-control', id: "sepa_sequence_type_multi_#{multi_group_order.id}"

2
app/views/ordergroup_invoices/_toggle_all_paid.html.haml Normal file
View file

@ -0,0 +1,2 @@
= link_to toggle_all_paid_ordergroup_invoices_path(multi_order_id: multi_order.id, paid: multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.map(&:paid)&.all? ), remote: true, method: :patch, data: { confirm: I18n.t('ui.confirm_mark_all', name: multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.map(&:paid)&.all? ? I18n.t('activerecord.attributes.group_order_invoice.links.not_paid'): I18n.t('activerecord.attributes.group_order_invoice.links.paid') ) } do
= check_box_tag :paid, '1', multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.map(&:paid)&.all? , class: 'form-check-input', id: "paid_all_multi_#{multi_order.id}"

2
app/views/ordergroup_invoices/_toggle_all_sepa_downloaded.html.haml Normal file
View file

@ -0,0 +1,2 @@
= link_to toggle_all_sepa_downloaded_ordergroup_invoices_path(multi_order_id: multi_order.id, sepa_downloaded: multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.map(&:sepa_downloaded)&.all? ), remote: true, method: :patch, data: { confirm: I18n.t('ui.confirm_mark_all', name: multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.map(&:sepa_downloaded)&.all? ? I18n.t('activerecord.attributes.group_order_invoice.links.sepa_not_downloaded') : I18n.t('activerecord.attributes.group_order_invoice.links.sepa_downloaded')) } do
= check_box_tag :sepa_downloaded, '1', multi_order.multi_group_orders.map(&:ordergroup_invoice).compact.map(&:sepa_downloaded)&.all? , class: 'form-check-input', id: "sepa_downloaded_all_multi_#{multi_order.id}"

2
app/views/ordergroup_invoices/_toggle_paid.html.haml Normal file
View file

@ -0,0 +1,2 @@
= link_to toggle_paid_ordergroup_invoice_path(ordergroup_invoice), remote: true, method: :patch, data: { turbolinks: false } do
= check_box_tag 'paid', '1', ordergroup_invoice.paid , class: 'form-check-input', id: "paid_multi_#{ordergroup_invoice.id}"

2
app/views/ordergroup_invoices/_toggle_sepa_downloaded.html.haml Normal file
View file

@ -0,0 +1,2 @@
= link_to toggle_sepa_downloaded_ordergroup_invoice_path(ordergroup_invoice), remote: true, method: :patch do
= check_box_tag 'sepa_downloaded', '1', ordergroup_invoice.sepa_downloaded , class: 'form-check-input', id: "sepa_downloaded_multii_#{ordergroup_invoice.id}"

1
app/views/ordergroup_invoices/create.js.erb Normal file
View file

@ -0,0 +1 @@
$("#multi_order_<%= @multi_order.id %>_modal").html("<%= escape_javascript(render partial: 'links', locals: {multi_order: @multi_order}) %>");

1
app/views/ordergroup_invoices/create_multiple.js.erb Normal file
View file

@ -0,0 +1 @@
$("#multi_order_<%= @multi_order.id %>_modal").html("<%= escape_javascript(render partial: 'links', locals: {multi_order: @multi_order}) %>");

1
app/views/ordergroup_invoices/destroy.js.erb Normal file
View file

@ -0,0 +1 @@
$("#multi_order_<%= @multi_order.id %>_modal").html("<%= escape_javascript(render partial: 'links', locals: {multi_order: @multi_order}) %>");

1
app/views/ordergroup_invoices/select_all_sepa_sequence_type.js.erb Normal file
View file

@ -0,0 +1 @@
$("#multi_order_<%= @multi_order.id %>_modal").html("<%= escape_javascript(render partial: 'modal', locals: { multi_order: @multi_order, sequence_type: @sequence_type }) %>");

1
app/views/ordergroup_invoices/select_sepa_sequence_type.js.erb Normal file
View file

@ -0,0 +1 @@
$("#select_sepa_sequence_type_multi_<%= @ordergroup_invoice.id %>").html("<%= j(render partial: 'select_sepa_sequence_type', locals: {ordergroup_invoice: @ordergroup_invoice, multi_group_order: @multi_group_order}) %>");

4
app/views/ordergroup_invoices/toggle_all_paid.js.erb Normal file
View file

@ -0,0 +1,4 @@
<% @ordergroup_invoices.each do |ordergroup_invoice| %>
$("#paid_multi_<%= ordergroup_invoice.id %>").html("<%= escape_javascript(render partial: 'toggle_paid', locals: { ordergroup_invoice: ordergroup_invoice }) %>");
<% end %>
$("#toggle_all_paid_multi_<%= @multi_order.id %>").html("<%= escape_javascript(render partial: 'toggle_all_paid', locals: { multi_order: @multi_order }) %>");

4
app/views/ordergroup_invoices/toggle_all_sepa_downloaded.js.erb Normal file
View file

@ -0,0 +1,4 @@
<% @ordergroup_invoices.each do |ordergroup_invoice| %>
$("#sepa_downloaded_multi_<%= ordergroup_invoice.id %>").html("<%= escape_javascript(render partial: 'toggle_sepa_downloaded', locals: { ordergroup_invoice: ordergroup_invoice }) %>");
<% end %>
$("#toggle_all_sepa_downloaded_multi_<%= @multi_order.id %>").html("<%= escape_javascript(render partial: 'toggle_all_sepa_downloaded', locals: { multi_order: @multi_order }) %>");

1
app/views/ordergroup_invoices/toggle_paid.js.erb Normal file
View file

@ -0,0 +1 @@
$("#paid_multi_<%= @ordergroup_invoice.id %>").html("<%= escape_javascript(render partial: 'toggle_paid', locals: {ordergroup_invoice: @ordergroup_invoice}) %>");

1
app/views/ordergroup_invoices/toggle_sepa_downloaded.js.erb Normal file
View file

@ -0,0 +1 @@
$("#sepa_downloaded_multi_<%= @ordergroup_invoice.id %>").html("<%= escape_javascript(render partial: 'toggle_sepa_downloaded', locals: {ordergroup_invoice: @ordergroup_invoice}) %>");