diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 80047a964..5bbb139a5 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -170,89 +170,91 @@ -
-
-
-

{{ trans('bills.histories') }}

+
+
+
+
+

{{ trans('bills.histories') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - @foreach($bill->histories as $history) +
+
+
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ - - - + + + - @endforeach - -
{{ Date::parse($bill->created_at)->format($date_format) }}{{ $bill->status->name }}{{ $bill->description }}{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ + + @foreach($bill->histories as $history) + + {{ Date::parse($bill->created_at)->format($date_format) }} + {{ $bill->status->name }} + {{ $bill->description }} + + @endforeach + + +
-
-
-
-
-

{{ trans('bills.payments') }}

+
+
+
+

{{ trans('bills.payments') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - - @foreach($bill->payments as $payment) +
+
+
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ - - - - + + + + - @endforeach - -
{{ Date::parse($payment->paid_at)->format($date_format) }}@money($payment->amount, $payment->currency_code, true){{ $payment->account->name }} - - - {!! Form::open([ - 'id' => 'bill-payment-' . $payment->id, - 'method' => 'DELETE', - 'url' => ['expenses/bills/payment', $payment->id], - 'style' => 'display:inline' - ]) !!} - {!! Form::button(' ' . trans('general.delete'), array( - 'type' => 'button', - 'class' => 'btn btn-danger btn-xs', - 'title' => trans('general.delete'), - 'onclick' => 'confirmDelete("' . '#bill-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' - )) !!} - {!! Form::close() !!} - {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ + + @foreach($bill->payments as $payment) + + {{ Date::parse($payment->paid_at)->format($date_format) }} + @money($payment->amount, $payment->currency_code, true) + {{ $payment->account->name }} + + + + {!! Form::open([ + 'id' => 'bill-payment-' . $payment->id, + 'method' => 'DELETE', + 'url' => ['expenses/bills/payment', $payment->id], + 'style' => 'display:inline' + ]) !!} + {!! Form::button(' ' . trans('general.delete'), array( + 'type' => 'button', + 'class' => 'btn btn-danger btn-xs', + 'title' => trans('general.delete'), + 'onclick' => 'confirmDelete("' . '#bill-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' + )) !!} + {!! Form::close() !!} + + + @endforeach + + +
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 7d88541a0..181487204 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -175,89 +175,91 @@
-
-
-
-

{{ trans('invoices.histories') }}

+
+
+
+
+

{{ trans('invoices.histories') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - @foreach($invoice->histories as $history) +
+
+
{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ - - - + + + - @endforeach - -
{{ Date::parse($history->created_at)->format($date_format) }}{{ $history->status->name }}{{ $history->description }}{{ trans('general.date') }}{{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}
+ + + @foreach($invoice->histories as $history) + + {{ Date::parse($history->created_at)->format($date_format) }} + {{ $history->status->name }} + {{ $history->description }} + + @endforeach + + +
-
-
-
-
-

{{ trans('invoices.payments') }}

+
+
+
+

{{ trans('invoices.payments') }}

-
- +
+ +
+
- -
-
-
- - - - - - - - - - - @foreach($invoice->payments as $payment) +
+
+
{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ - - - - + + + + - @endforeach - -
{{ Date::parse($payment->paid_at)->format($date_format) }}@money($payment->amount, $payment->currency_code, true){{ $payment->account->name }} - - - {!! Form::open([ - 'id' => 'invoice-payment-' . $payment->id, - 'method' => 'DELETE', - 'url' => ['incomes/invoices/payment', $payment->id], - 'style' => 'display:inline' - ]) !!} - {!! Form::button(' ' . trans('general.delete'), array( - 'type' => 'button', - 'class' => 'btn btn-danger btn-xs', - 'title' => trans('general.delete'), - 'onclick' => 'confirmDelete("' . '#invoice-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' - )) !!} - {!! Form::close() !!} - {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.actions') }}
+ + + @foreach($invoice->payments as $payment) + + {{ Date::parse($payment->paid_at)->format($date_format) }} + @money($payment->amount, $payment->currency_code, true) + {{ $payment->account->name }} + + + + {!! Form::open([ + 'id' => 'invoice-payment-' . $payment->id, + 'method' => 'DELETE', + 'url' => ['incomes/invoices/payment', $payment->id], + 'style' => 'display:inline' + ]) !!} + {!! Form::button(' ' . trans('general.delete'), array( + 'type' => 'button', + 'class' => 'btn btn-danger btn-xs', + 'title' => trans('general.delete'), + 'onclick' => 'confirmDelete("' . '#invoice-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' + )) !!} + {!! Form::close() !!} + + + @endforeach + + +