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

Merge pull request #1244 from batuhawk/master

Browse Source 
Invoice/bill status reflected
This commit is contained in:
Batuhan Baş 2020-02-10 16:15:14 +03:00 committed by GitHub
commit 29b65de7e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 140 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
public/css/element.css vendored
View File

@ -6246,6 +6246,17 @@
border-left-color: #000000
}
.el-tooltip__popper.is-success {
background: #6da252;
color: #FFF
}
.el-tooltip__popper.is-info {
background: #328aef;
color: #FFF
}
.el-tooltip__popper.is-dark {
background: #000000;
color: #FFF
@ -6256,6 +6267,70 @@
border: 1px solid #FFF
}
.el-tooltip__popper.is-success[x-placement^=top] .popper__arrow {
border-top-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=top] .popper__arrow::after {
border-top-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=bottom] .popper__arrow {
border-bottom-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=bottom] .popper__arrow::after {
border-bottom-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=left] .popper__arrow {
border-left-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=left] .popper__arrow::after {
border-left-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=right] .popper__arrow {
border-right-color: #6da252
}
.el-tooltip__popper.is-success[x-placement^=right] .popper__arrow::after {
border-right-color: #6da252
}
.el-tooltip__popper.is-info[x-placement^=top] .popper__arrow {
border-top-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=top] .popper__arrow::after {
border-top-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=bottom] .popper__arrow {
border-bottom-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=bottom] .popper__arrow::after {
border-bottom-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=left] .popper__arrow {
border-left-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=left] .popper__arrow::after {
border-left-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=right] .popper__arrow {
border-right-color: #328aef
}
.el-tooltip__popper.is-info[x-placement^=right] .popper__arrow::after {
border-right-color: #328aef
}
.el-tooltip__popper.is-light[x-placement^=top] .popper__arrow {
border-top-color: #FFF
}

8
resources/assets/js/views/purchases/payments.js vendored
View File

@ -15,12 +15,18 @@ import Global from './../../mixins/global';
import Form from './../../plugins/form';
import BulkAction from './../../plugins/bulk-action';
import {Tooltip} from 'element-ui';
// plugin setup
Vue.use(DashboardPlugin);
Vue.use(DashboardPlugin, Tooltip);
const app = new Vue({
el: '#app',
components: {
[Tooltip.name]: Tooltip,
},
mixins: [
Global
],

8
resources/assets/js/views/sales/revenues.js vendored
View File

@ -15,12 +15,18 @@ import Global from './../../mixins/global';
import Form from './../../plugins/form';
import BulkAction from './../../plugins/bulk-action';
import {Tooltip} from 'element-ui';
// plugin setup
Vue.use(DashboardPlugin);
Vue.use(DashboardPlugin, Tooltip);
const app = new Vue({
el: '#app',
components: {
[Tooltip.name]: Tooltip,
},
mixins: [
Global
],

26
resources/views/purchases/payments/index.blade.php
View File

@ -55,7 +55,31 @@
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
@endif
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">{{ $item->contact->name }}</td>
<td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">
{{ $item->contact->name }}
@if($item->bill)
@if ($item->bill->status == 'paid')
<el-tooltip content="{{ $item->bill->bill_number }} / {{ trans('bills.statuses.paid') }}"
effect="success"
:open-delay="100"
placement="top">
<span class="badge badge-dot pl-2">
<i class="bg-success"></i>
</span>
</el-tooltip>
@elseif ($item->bill->status == 'partials')
<el-tooltip content="{{ $item->bill->bill_number }} / {{ trans('bills.statuses.partial') }}"
effect="info"
:open-delay="100"
placement="top">
<span class="badge badge-dot pl-2">
<i class="bg-info"></i>
</span>
</el-tooltip>
@endif
@endif
</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
<td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">

27
resources/views/sales/revenues/index.blade.php
View File

@ -55,7 +55,32 @@
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
@endif
<td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">{{ $item->contact->name }}</td>
<td class="col-md-2 col-lg-2 col-xl-4 d-none d-md-block text-left">
{{ $item->contact->name }}
@if($item->invoice)
@if ($item->invoice->status == 'paid')
<el-tooltip content="{{ $item->invoice->invoice_number }} / {{ trans('invoices.statuses.paid') }}"
effect="success"
:open-delay="100"
placement="top">
<span class="badge badge-dot pl-2">
<i class="bg-success"></i>
</span>
</el-tooltip>
@elseif ($item->invoice->status == 'partials')
<el-tooltip content="{{ $item->invoice->invoice_number }} / {{ trans('invoices.statuses.partial') }}"
effect="info"
:open-delay="100"
placement="top">
<span class="badge badge-dot pl-2">
<i class="bg-info"></i>
</span>
</el-tooltip>
@endif
@endif
</td>
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
<td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">