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

fix ordergroup create & ordergroup deleted for real destroy finances view

Browse source
This commit is contained in:
viehlieb 2024-02-22 21:06:02 +01:00
parent fc46281de8
commit caa5adbfe2
3 changed files with 48 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -22,7 +22,7 @@ RUN buildDeps='libmagic-dev' && \
apt-get update && \ apt-get update && \
apt-get install --no-install-recommends -y $buildDeps && \ apt-get install --no-install-recommends -y $buildDeps && \
echo 'gem: --no-document' >> ~/.gemrc && \ echo 'gem: --no-document' >> ~/.gemrc && \
gem install bundler && \ gem install bundler -v 2.4.22 && \
bundle config build.nokogiri "--use-system-libraries" && \ bundle config build.nokogiri "--use-system-libraries" && \
bundle install --deployment --without development test -j 4 && \ bundle install --deployment --without development test -j 4 && \
apt-get purge -y --auto-remove $buildDeps && \ apt-get purge -y --auto-remove $buildDeps && \

1
app/views/admin/ordergroups/_form.html.haml
View file

@ -6,6 +6,7 @@
= f.input :contact_person = f.input :contact_person
= f.input :contact_phone = f.input :contact_phone
= f.input :contact_address = f.input :contact_address
- unless @ordergroup.new_record?
= render 'sepa_account_holder', f: f = render 'sepa_account_holder', f: f
= render 'shared/custom_form_fields', f: f, type: :ordergroup = render 'shared/custom_form_fields', f: f, type: :ordergroup
.fold-line .fold-line

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

@ -23,9 +23,10 @@
%th %th
%tbody %tbody
- order.group_orders.includes([:group_order_invoice, :ordergroup]).each do |go| - order.group_orders.includes([:group_order_invoice, :ordergroup]).each do |go|
-if go.ordergroup.present?
- if go.group_order_invoice - if go.group_order_invoice
%tr.order-row{id: "group_order_#{go.id}"} %tr.order-row{id: "group_order_#{go.id}"}
%td= link_to go.ordergroup.name, edit_admin_ordergroup_path(go.ordergroup) %td= link_to go.ordergroup&.name, edit_admin_ordergroup_path(go.ordergroup)
%td %td
.div{id: "paid_#{go.group_order_invoice.id}"} .div{id: "paid_#{go.group_order_invoice.id}"}
= render :partial => "group_order_invoices/toggle_paid", locals: { group_order_invoice: go.group_order_invoice } = render :partial => "group_order_invoices/toggle_paid", locals: { group_order_invoice: go.group_order_invoice }
@ -43,7 +44,7 @@
- else - else
%tr %tr
%td %td
= go.ordergroup.name = 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: order.id}, remote: true = 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: order.id}, remote: true
%td %td
%td %td