adapt financial transaction type for online payment provider
This commit is contained in:
parent
66bbafcd4d
commit
82f0935d65
10 changed files with 66 additions and 23 deletions
|
|
@ -45,7 +45,7 @@
|
|||
= t.note
|
||||
- FinancialTransactionClass.sorted.each do |c|
|
||||
%td.numeric{style: 'width:5em'}
|
||||
- if t.financial_transaction_type.financial_transaction_class == c
|
||||
- if t.financial_transaction_type.financial_transaction_class == c && t.amount
|
||||
= format_currency t.amount
|
||||
- if with_hidden
|
||||
%td.actions{style: 'width:1em'}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
%td= format_date(ft.created_on)
|
||||
%td= ft.ordergroup_name
|
||||
%td= ft.note
|
||||
%td.numeric= format_currency ft.amount
|
||||
%td.numeric= ft.amount ? format_currency(ft.amount) : '-'
|
||||
.span6
|
||||
%h2
|
||||
= t('.open_transactions')
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
%th= heading_helper Order, :name
|
||||
%th= t '.end'
|
||||
%th.numeric= t('.amount_fc')
|
||||
%th
|
||||
%th
|
||||
%tbody
|
||||
- @orders.each do |order|
|
||||
%tr
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
= link_to my_ordergroup_path do
|
||||
= t '.my_ordergroup.transactions.view'
|
||||
%i.icon.icon-chevron-right
|
||||
- '<dashboard_ordergroup_mark>'
|
||||
%table.table.table-striped
|
||||
%tr
|
||||
%th= heading_helper FinancialTransaction, :created_on
|
||||
|
|
@ -83,7 +84,7 @@
|
|||
- FinancialTransactionClass.sorted.each do |fc|
|
||||
%td.numeric{style: 'width:5em'}
|
||||
- if ft.financial_transaction_type.financial_transaction_class == fc
|
||||
= format_currency ft.amount
|
||||
= ft.amount ? format_currency(ft.amount) : '-'
|
||||
|
||||
-# placeholder deface to add content using erb[silent]:contains()
|
||||
- '<dashboard_bottom_mark>'
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
= @ordergroup.memberships.map{|m| show_user m.user}.join(', ')
|
||||
- unless FoodsoftConfig[:disable_invite]
|
||||
= link_to t('.invite'), new_invite_path(:id => @ordergroup), :remote => true, class: 'btn btn-primary'
|
||||
- '<home_ordergroup_well_mark>'
|
||||
.span8
|
||||
%h2= t('.account_summary')
|
||||
.well.well-small
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue