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

fixed #284

Browse Source
This commit is contained in:
denisdulici 2018-03-30 17:46:50 +03:00
parent 778006d2a4
commit a57f446d92
11 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/css/app.css vendored
View File

@ -505,6 +505,12 @@ ul.add-new.nav.navbar-nav.pull-left {
} }
} }
@media only screen and (min-width : 768px) {
.amount-space {
padding-right: 30px !important;
}
}
.text-disabled { .text-disabled {
opacity: 0.4; opacity: 0.4;
} }

4
resources/views/banking/accounts/index.blade.php
View File

@ -33,7 +33,7 @@
<tr> <tr>
<th class="col-md-4">@sortablelink('name', trans('general.name'))</th> <th class="col-md-4">@sortablelink('name', trans('general.name'))</th>
<th class="col-md-3 hidden-xs">@sortablelink('number', trans('accounts.number'))</th> <th class="col-md-3 hidden-xs">@sortablelink('number', trans('accounts.number'))</th>
<th class="col-md-3">@sortablelink('opening_balance', trans('accounts.current_balance'))</th> <th class="col-md-3 text-right amount-space">@sortablelink('opening_balance', trans('accounts.current_balance'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th> <th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th> <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
@ -43,7 +43,7 @@
<tr> <tr>
<td><a href="{{ url('banking/accounts/' . $item->id . '/edit') }}">{{ $item->name }}</a></td> <td><a href="{{ url('banking/accounts/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ $item->number }}</td> <td class="hidden-xs">{{ $item->number }}</td>
<td>@money($item->balance, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->balance, $item->currency_code, true)</td>
<td class="hidden-xs"> <td class="hidden-xs">
@if ($item->enabled) @if ($item->enabled)
<span class="label label-success">{{ trans('general.enabled') }}</span> <span class="label label-success">{{ trans('general.enabled') }}</span>

4
resources/views/banking/transactions/index.blade.php
View File

@ -32,7 +32,7 @@
<th class="col-md-2">@sortablelink('type', trans_choice('general.types', 1))</th> <th class="col-md-2">@sortablelink('type', trans_choice('general.types', 1))</th>
<th class="col-md-2">@sortablelink('category_name', trans_choice('general.categories', 1))</th> <th class="col-md-2">@sortablelink('category_name', trans_choice('general.categories', 1))</th>
<th class="col-md-2">@sortablelink('description', trans('general.description'))</th> <th class="col-md-2">@sortablelink('description', trans('general.description'))</th>
<th class="col-md-2">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -43,7 +43,7 @@
<td>{{ $item->type }}</td> <td>{{ $item->type }}</td>
<td>{{ $item->category_name }}</td> <td>{{ $item->category_name }}</td>
<td>{{ $item->description }}</td> <td>{{ $item->description }}</td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

4
resources/views/banking/transfers/index.blade.php
View File

@ -35,7 +35,7 @@
<th class="col-md-3">@sortablelink('payment.paid_at', trans('general.date'))</th> <th class="col-md-3">@sortablelink('payment.paid_at', trans('general.date'))</th>
<th class="col-md-3">@sortablelink('payment.name', trans('transfers.from_account'))</th> <th class="col-md-3">@sortablelink('payment.name', trans('transfers.from_account'))</th>
<th class="col-md-3">@sortablelink('revenue.name', trans('transfers.to_account'))</th> <th class="col-md-3">@sortablelink('revenue.name', trans('transfers.to_account'))</th>
<th class="col-md-3">@sortablelink('payment.amount', trans('general.amount'))</th> <th class="col-md-3 text-right amount-space">@sortablelink('payment.amount', trans('general.amount'))</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -44,7 +44,7 @@
<td>{{ Date::parse($item->paid_at)->format($date_format) }}</td> <td>{{ Date::parse($item->paid_at)->format($date_format) }}</td>
<td>{{ $item->from_account }}</td> <td>{{ $item->from_account }}</td>
<td>{{ $item->to_account }}</td> <td>{{ $item->to_account }}</td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

6
resources/views/expenses/bills/index.blade.php
View File

@ -35,8 +35,8 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-2">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th> <th class="col-md-2">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-3">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th> <th class="col-md-2">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th>
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('billed_at', trans('bills.bill_date'))</th> <th class="col-md-2">@sortablelink('billed_at', trans('bills.bill_date'))</th>
<th class="col-md-2">@sortablelink('due_at', trans('bills.due_date'))</th> <th class="col-md-2">@sortablelink('due_at', trans('bills.due_date'))</th>
<th class="col-md-1">@sortablelink('bill_status_code', trans_choice('general.statuses', 1))</th> <th class="col-md-1">@sortablelink('bill_status_code', trans_choice('general.statuses', 1))</th>
@ -48,7 +48,7 @@
<tr> <tr>
<td><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td> <td><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
<td>{{ $item->vendor_name }}</td> <td>{{ $item->vendor_name }}</td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td>{{ Date::parse($item->billed_at)->format($date_format) }}</td> <td>{{ Date::parse($item->billed_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->due_at)->format($date_format) }}</td> <td>{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td><span class="label {{ $item->status->label }}">{{ $item->status->name }}</span></td> <td><span class="label {{ $item->status->label }}">{{ $item->status->name }}</span></td>

4
resources/views/expenses/payments/index.blade.php
View File

@ -35,7 +35,7 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-2">@sortablelink('paid_at', trans('general.date'))</th> <th class="col-md-2">@sortablelink('paid_at', trans('general.date'))</th>
<th class="col-md-2">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-3 hidden-xs">@sortablelink('vendor.name', trans_choice('general.vendors', 1))</th> <th class="col-md-3 hidden-xs">@sortablelink('vendor.name', trans_choice('general.vendors', 1))</th>
<th class="col-md-2 hidden-xs">@sortablelink('category.name', trans_choice('general.categories', 1))</th> <th class="col-md-2 hidden-xs">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th class="col-md-2 hidden-xs">@sortablelink('account.name', trans_choice('general.accounts', 1))</th> <th class="col-md-2 hidden-xs">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
@ -46,7 +46,7 @@
@foreach($payments as $item) @foreach($payments as $item)
<tr> <tr>
<td><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td> <td><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td class="hidden-xs">{{ !empty($item->vendor->name) ? $item->vendor->name : trans('general.na') }}</td> <td class="hidden-xs">{{ !empty($item->vendor->name) ? $item->vendor->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->category->name }}</td> <td class="hidden-xs">{{ $item->category->name }}</td>
<td class="hidden-xs">{{ $item->account->name }}</td> <td class="hidden-xs">{{ $item->account->name }}</td>

6
resources/views/incomes/invoices/index.blade.php
View File

@ -34,8 +34,8 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-2">@sortablelink('invoice_number', trans_choice('general.numbers', 1))</th> <th class="col-md-2">@sortablelink('invoice_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-3">@sortablelink('customer_name', trans_choice('general.customers', 1))</th> <th class="col-md-2">@sortablelink('customer_name', trans_choice('general.customers', 1))</th>
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th> <th class="col-md-2">@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
<th class="col-md-2">@sortablelink('due_at', trans('invoices.due_date'))</th> <th class="col-md-2">@sortablelink('due_at', trans('invoices.due_date'))</th>
<th class="col-md-1">@sortablelink('invoice_status_code', trans_choice('general.statuses', 1))</th> <th class="col-md-1">@sortablelink('invoice_status_code', trans_choice('general.statuses', 1))</th>
@ -47,7 +47,7 @@
<tr> <tr>
<td><a href="{{ url('incomes/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td> <td><a href="{{ url('incomes/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td>
<td>{{ $item->customer_name }}</td> <td>{{ $item->customer_name }}</td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td>{{ Date::parse($item->invoiced_at)->format($date_format) }}</td> <td>{{ Date::parse($item->invoiced_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->due_at)->format($date_format) }}</td> <td>{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td><span class="label {{ $item->status->label }}">{{ $item->status->name }}</span></td> <td><span class="label {{ $item->status->label }}">{{ $item->status->name }}</span></td>

4
resources/views/incomes/revenues/index.blade.php
View File

@ -35,7 +35,7 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-2">@sortablelink('paid_at', trans('general.date'))</th> <th class="col-md-2">@sortablelink('paid_at', trans('general.date'))</th>
<th class="col-md-2">@sortablelink('amount', trans('general.amount'))</th> <th class="col-md-2 text-right amount-space">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-3 hidden-xs">@sortablelink('customer.name', trans_choice('general.customers', 1))</th> <th class="col-md-3 hidden-xs">@sortablelink('customer.name', trans_choice('general.customers', 1))</th>
<th class="col-md-2 hidden-xs">@sortablelink('category.name', trans_choice('general.categories', 1))</th> <th class="col-md-2 hidden-xs">@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th class="col-md-2 hidden-xs">@sortablelink('account.name', trans_choice('general.accounts', 1))</th> <th class="col-md-2 hidden-xs">@sortablelink('account.name', trans_choice('general.accounts', 1))</th>
@ -46,7 +46,7 @@
@foreach($revenues as $item) @foreach($revenues as $item)
<tr> <tr>
<td><a href="{{ url('incomes/revenues/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td> <td><a href="{{ url('incomes/revenues/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td class="hidden-xs">{{ !empty($item->customer->name) ? $item->customer->name : trans('general.na') }}</td> <td class="hidden-xs">{{ !empty($item->customer->name) ? $item->customer->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->category->name }}</td> <td class="hidden-xs">{{ $item->category->name }}</td>
<td class="hidden-xs">{{ $item->account->name }}</td> <td class="hidden-xs">{{ $item->account->name }}</td>

8
resources/views/items/items/index.blade.php
View File

@ -37,8 +37,8 @@
<th class="col-md-3">@sortablelink('name', trans('general.name'))</th> <th class="col-md-3">@sortablelink('name', trans('general.name'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('category', trans_choice('general.categories', 1))</th> <th class="col-md-1 hidden-xs">@sortablelink('category', trans_choice('general.categories', 1))</th>
<th class="col-md-1 hidden-xs">@sortablelink('quantity', trans_choice('items.quantities', 1))</th> <th class="col-md-1 hidden-xs">@sortablelink('quantity', trans_choice('items.quantities', 1))</th>
<th class="col-md-2">@sortablelink('sale_price', trans('items.sales_price'))</th> <th class="col-md-2 text-right amount-space">@sortablelink('sale_price', trans('items.sales_price'))</th>
<th class="col-md-2 hidden-xs">@sortablelink('purchase_price', trans('items.purchase_price'))</th> <th class="col-md-2 hidden-xs text-right amount-space">@sortablelink('purchase_price', trans('items.purchase_price'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th> <th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th> <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
@ -50,8 +50,8 @@
<td><a href="{{ url('items/items/' . $item->id . '/edit') }}">{{ $item->name }}</a></td> <td><a href="{{ url('items/items/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ $item->category ? $item->category->name : trans('general.na') }}</td> <td class="hidden-xs">{{ $item->category ? $item->category->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->quantity }}</td> <td class="hidden-xs">{{ $item->quantity }}</td>
<td>{{ money($item->sale_price, setting('general.default_currency'), true) }}</td> <td class="text-right amount-space">{{ money($item->sale_price, setting('general.default_currency'), true) }}</td>
<td class="hidden-xs">{{ money($item->purchase_price, setting('general.default_currency'), true) }}</td> <td class="hidden-xs text-right amount-space">{{ money($item->purchase_price, setting('general.default_currency'), true) }}</td>
<td class="hidden-xs"> <td class="hidden-xs">
@if ($item->enabled) @if ($item->enabled)
<span class="label label-success">{{ trans('general.enabled') }}</span> <span class="label label-success">{{ trans('general.enabled') }}</span>

6
resources/views/partials/admin/head.blade.php
View File

@ -19,13 +19,13 @@
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}">
@else @else
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-black.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-black.min.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.0') }}"> <link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.2') }}">
@endif @endif
<!-- Select2 --> <!-- Select2 -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
<!-- App style --> <!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.0') }}"> <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2') }}">
<link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.0') }}"> <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
<link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}"> <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">

6
resources/views/partials/customer/head.blade.php
View File

@ -19,15 +19,15 @@
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}">
@else @else
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-black.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-black.min.css') }}">
<link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.0') }}"> <link rel="stylesheet" href="{{ asset('public/css/skin-black.css?v=1.2') }}">
@endif @endif
<!-- Data Tables --> <!-- Data Tables -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css') }}">
<!-- Select2 --> <!-- Select2 -->
<link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
<!-- App style --> <!-- App style -->
<link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.0') }}"> <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2') }}">
<link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.0') }}"> <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
<link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}"> <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">