shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1174 from batuhawk/master

Browse Source 
Histories and transaction alignment updated
This commit is contained in:
Batuhan Baş 2020-01-23 15:27:59 +03:00 committed by GitHub
commit 66ccafb63c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/purchases/bills/show.blade.php
View File

@ -486,20 +486,20 @@
</div> </div>
<div id="collapseOne" class="collapse hide" aria-labelledby="headingOne"> <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-hover">
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <tr class="row table-head-line">
<th class="col-xs-4 col-sm-4">{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-2">{{ trans('general.date') }}</th>
<th class="col-xs-4 col-sm-4 text-center">{{ trans_choice('general.statuses', 1) }}</th> <th class="col-xs-4 col-sm-4 text-center">{{ trans_choice('general.statuses', 1) }}</th>
<th class="col-xs-4 col-sm-4 text-left long-texts">{{ trans('general.description') }}</th> <th class="col-xs-4 col-sm-6 text-left long-texts">{{ trans('general.description') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($bill->histories as $history) @foreach($bill->histories as $history)
<tr class="row align-items-center"> <tr class="row align-items-center">
<td class="col-xs-4 col-sm-4">@date($history->created_at)</td> <td class="col-xs-4 col-sm-2">@date($history->created_at)</td>
<td class="col-xs-4 col-sm-4 text-center">{{ trans('bills.statuses.' . $history->status) }}</td> <td class="col-xs-4 col-sm-4 text-center">{{ trans('bills.statuses.' . $history->status) }}</td>
<td class="col-xs-4 col-sm-4 text-left long-texts">{{ $history->description }}</td> <td class="col-xs-4 col-sm-6 text-left long-texts">{{ $history->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@ -533,10 +533,10 @@
@if ($bill->transactions->count()) @if ($bill->transactions->count())
@foreach($bill->transactions as $transaction) @foreach($bill->transactions as $transaction)
<tr class="row align-items-center border-top-1"> <tr class="row align-items-center border-top-1">
<td class="col-xs-4 col-sm-3">@date($item->paid_at)</td> <td class="col-xs-4 col-sm-3">@date($transaction->paid_at)</td>
<td class="col-xs-4 col-sm-3">@money($transaction->amount, $transaction->currency_code, true)</td> <td class="col-xs-4 col-sm-3">@money($transaction->amount, $transaction->currency_code, true)</td>
<td class="col-sm-3 d-none d-sm-block">{{ $transaction->account->name }}</td> <td class="col-sm-3 d-none d-sm-block">{{ $transaction->account->name }}</td>
<td class="col-xs-4 col-sm-3"> <td class="col-xs-4 col-sm-3 py-0">
@if ($transaction->reconciled) @if ($transaction->reconciled)
<button type="button" class="btn btn-secondary btn-sm"> <button type="button" class="btn btn-secondary btn-sm">
<i class="fa fa-check"></i> {{ trans('reconciliations.reconciled') }} <i class="fa fa-check"></i> {{ trans('reconciliations.reconciled') }}

18
resources/views/sales/invoices/show.blade.php
View File

@ -254,7 +254,7 @@
<tr> <tr>
<th> <th>
@stack('address_input_start') @stack('address_input_start')
{!! nl2br($invoice->contact_address) !!} {!! nl2br($invoice->contact_address) !!}
@stack('address_input_end') @stack('address_input_end')
</th> </th>
</tr> </tr>
@ -532,20 +532,20 @@
</div> </div>
<div id="collapseOne" class="collapse hide" aria-labelledby="headingOne"> <div id="collapseOne" class="collapse hide" aria-labelledby="headingOne">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-hover">
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <tr class="row table-head-line">
<th class="col-xs-4 col-sm-4">{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-2">{{ trans('general.date') }}</th>
<th class="col-xs-4 col-sm-4 text-center">{{ trans_choice('general.statuses', 1) }}</th> <th class="col-xs-4 col-sm-4 text-center">{{ trans_choice('general.statuses', 1) }}</th>
<th class="col-xs-4 col-sm-4 text-left long-texts">{{ trans('general.description') }}</th> <th class="col-xs-4 col-sm-6 text-left long-texts">{{ trans('general.description') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($invoice->histories as $history) @foreach($invoice->histories as $history)
<tr class="row align-items-center"> <tr class="row align-items-center">
<td class="col-xs-4 col-sm-4">@date($history->created_at)</td> <td class="col-xs-4 col-sm-2">@date($history->created_at)</td>
<td class="col-xs-4 col-sm-4 text-center">{{ trans('invoices.statuses.' . $history->status) }}</td> <td class="col-xs-4 col-sm-4 text-center">{{ trans('invoices.statuses.' . $history->status) }}</td>
<td class="col-xs-4 col-sm-4 text-left long-texts">{{ $history->description }}</td> <td class="col-xs-4 col-sm-6 text-left long-texts">{{ $history->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@ -582,10 +582,10 @@
<td class="col-xs-4 col-sm-3">@date($transaction->paid_at)</td> <td class="col-xs-4 col-sm-3">@date($transaction->paid_at)</td>
<td class="col-xs-4 col-sm-3">@money($transaction->amount, $transaction->currency_code, true)</td> <td class="col-xs-4 col-sm-3">@money($transaction->amount, $transaction->currency_code, true)</td>
<td class="col-sm-3 d-none d-sm-block">{{ $transaction->account->name }}</td> <td class="col-sm-3 d-none d-sm-block">{{ $transaction->account->name }}</td>
<td class="col-xs-4 col-sm-3"> <td class="col-xs-4 col-sm-3 py-0">
@if ($transaction->reconciled) @if ($transaction->reconciled)
<button type="button" class="btn btn-default btn-xs"> <button type="button" class="btn btn-default btn-sm">
<i class="fa fa-check"></i> {{ trans('reconciliations.reconciled') }} {{ trans('reconciliations.reconciled') }}
</button> </button>
@else @else
{!! Form::open([ {!! Form::open([