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

Merge pull request #1009 from batuhawk/master

Browse Source 
History and transaction tables style updated
This commit is contained in:
Batuhan Baş 2019-12-17 15:56:46 +03:00 committed by GitHub
commit ccdfa1ecb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
resources/views/expenses/bills/show.blade.php
View File

@ -483,18 +483,18 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table">
<thead class="thead-light"> <thead class="thead-light">
<tr class="table-head-line"> <tr class="row table-head-line">
<th>{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-4">{{ trans('general.date') }}</th>
<th class="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="text-left">{{ trans('general.description') }}</th> <th class="col-xs-4 col-sm-4 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> <tr class="row align-items-center">
<td>@date($history->created_at)</td> <td class="col-xs-4 col-sm-4">@date($history->created_at)</td>
<td class="text-center">{{ $history->status->name }}</td> <td class="col-xs-4 col-sm-4 text-center">{{ $history->status->name }}</td>
<td class="text-left">{{ $history->description }}</td> <td class="col-xs-4 col-sm-4 text-left long-texts">{{ $history->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@ -515,23 +515,23 @@
</div> </div>
<div id="collapseTwo" class="collapse hide" aria-labelledby="headingTwo"> <div id="collapseTwo" class="collapse hide" aria-labelledby="headingTwo">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-flush table-hover">
<thead class="thead-light"> <thead class="thead-light">
<tr class="table-head-line"> <tr class="row table-head-line">
<th>{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-3">{{ trans('general.date') }}</th>
<th>{{ trans('general.amount') }}</th> <th class="col-xs-4 col-sm-3">{{ trans('general.amount') }}</th>
<th>{{ trans_choice('general.accounts', 1) }}</th> <th class="col-sm-3 d-none d-sm-block">{{ trans_choice('general.accounts', 1) }}</th>
<th>{{ trans('general.actions') }}</th> <th class="col-xs-4 col-sm-3">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if ($bill->transactions->count()) @if ($bill->transactions->count())
@foreach($bill->transactions as $transaction) @foreach($bill->transactions as $transaction)
<tr> <tr class="row align-items-center border-top-1">
<td>@date($item->paid_at)</td> <td class="col-xs-4 col-sm-3">@date($item->paid_at)</td>
<td>@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>{{ $transaction->account->name }}</td> <td class="col-sm-3 d-none d-sm-block">{{ $transaction->account->name }}</td>
<td> <td class="col-xs-4 col-sm-3">
@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') }}

38
resources/views/incomes/invoices/show.blade.php
View File

@ -529,18 +529,18 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table">
<thead class="thead-light"> <thead class="thead-light">
<tr class="table-head-line"> <tr class="row table-head-line">
<th>{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-4">{{ trans('general.date') }}</th>
<th class="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="text-left">{{ trans('general.description') }}</th> <th class="col-xs-4 col-sm-4 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> <tr class="row align-items-center">
<td>@date($history->created_at)</td> <td class="col-xs-4 col-sm-4">@date($history->created_at)</td>
<td class="text-center">{{ $history->status->name }}</td> <td class="col-xs-4 col-sm-4 text-center">{{ $history->status->name }}</td>
<td class="text-left">{{ $history->description }}</td> <td class="col-xs-4 col-sm-4 text-left long-texts">{{ $history->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@ -561,23 +561,23 @@
</div> </div>
<div id="collapseTwo" class="collapse hide" aria-labelledby="headingTwo"> <div id="collapseTwo" class="collapse hide" aria-labelledby="headingTwo">
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table table-flush table-hover">
<thead class="thead-light"> <thead class="thead-light">
<tr class="table-head-line"> <tr class="row table-head-line">
<th>{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-3">{{ trans('general.date') }}</th>
<th>{{ trans('general.amount') }}</th> <th class="col-xs-4 col-sm-3">{{ trans('general.amount') }}</th>
<th>{{ trans_choice('general.accounts', 1) }}</th> <th class="col-sm-3 d-none d-sm-block">{{ trans_choice('general.accounts', 1) }}</th>
<th>{{ trans('general.actions') }}</th> <th class="col-xs-4 col-sm-3">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if ($invoice->transactions->count()) @if ($invoice->transactions->count())
@foreach($invoice->transactions as $transaction) @foreach($invoice->transactions as $transaction)
<tr> <tr class="row align-items-center border-top-1">
<td>@date($transaction->paid_at)</td> <td class="col-xs-4 col-sm-3">@date($transaction->paid_at)</td>
<td>@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>{{ $transaction->account->name }}</td> <td class="col-sm-3 d-none d-sm-block">{{ $transaction->account->name }}</td>
<td> <td class="col-xs-4 col-sm-3">
@if ($transaction->reconciled) @if ($transaction->reconciled)
<button type="button" class="btn btn-default btn-xs"> <button type="button" class="btn btn-default btn-xs">
<i class="fa fa-check"></i> {{ trans('reconciliations.reconciled') }} <i class="fa fa-check"></i> {{ trans('reconciliations.reconciled') }}