raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2346 from oeoeaio/subs-totals

Browse Source 
Subs: totals in backend are consistent and include fee breakdown
This commit is contained in:
Maikel
2018-08-07 18:17:13 +10:00
committed by GitHub
parent 32846af230 f0be8ff290
commit 03468efa7e
8 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/subscriptions/_orders_panel.html.haml
View File

@@ -19,7 +19,7 @@
%div{ ng: { bind: "::orderCycleCloses(proxyOrder.order_cycle_id)" } }
%td.text-center
%span.state{ ng: { class: "proxyOrder.state", bind: 'stateText(proxyOrder.state)' } }
%td.text-center{ ng: { bind: 'proxyOrder.total | currency' } }
%td.text-center{ ng: { bind: '(proxyOrder.total || subscription.estimatedTotal()) | currency' } }
%td.actions
%a.edit-order.icon-edit.no-text{ href: '{{::proxyOrder.edit_path}}', target: '_blank', 'ofn-with-tip' => t(:edit_order), confirm_order_edit: true }
%a.cancel-order.icon-remove.no-text{ href: 'javascript:void(0)', ng: { hide: "proxyOrder.state == 'canceled'", click: "cancelOrder(proxyOrder)" }, 'ofn-with-tip' => t(:cancel_order) }

2
app/views/admin/subscriptions/_review.html.haml
View File

@@ -91,3 +91,5 @@
\:
%td.total.align-center
%span#order_form_total {{ subscription.estimatedTotal() | currency }}
%p.notice
= t "this_is_an_estimate", scope: 'admin.subscriptions.subscription_line_items'

13
app/views/admin/subscriptions/_subscription_line_items.html.haml
View File

@@ -29,7 +29,16 @@
= t(:subtotal)
\:
%td.total.align-center
%span {{ subscription.estimatedSubtotal() | currency }}
%span#order_subtotal {{ subscription.estimatedSubtotal() | currency }}
%td.actions
%tbody#fees.no-border-top{ ng: { show: "subscription.estimatedFees() > 0" } }
%tr#fees-row
%td{:colspan => "3"}
%b
= t(:fees)
\:
%td.total.align-center
%span#order_fees {{ subscription.estimatedFees() | currency }}
%td.actions
%tbody#order-total.grand-total.no-border-top{"data-hook" => "admin_order_form_total"}
%tr
@@ -40,3 +49,5 @@
%td.total.align-center
%span#order_form_total {{ subscription.estimatedTotal() | currency }}
%td.actions
%p.notice
= t ".this_is_an_estimate"

2
app/views/admin/subscriptions/setup_explanation.html.haml
View File

@@ -14,7 +14,7 @@
.steps
%div
= t('.enable_subscriptions_step_1_html',
enterprises_link: link_to(t('admin.enterprises.title'), main_app.admin_enterprises_path, target: '_blank'))
enterprises_link: link_to(t('admin.enterprises.index.title'), main_app.admin_enterprises_path, target: '_blank'))
%div= t('.enable_subscriptions_step_2')
.row.margin-bottom-20.todo{ class: shipping_and_payment_methods_ok?(@shop) ? 'done' : '' }