From a271631cd03b6dc2b14ec80cd6b4f54f38a88455 Mon Sep 17 00:00:00 2001 From: batuhanbas Date: Mon, 10 Feb 2020 16:13:14 +0300 Subject: [PATCH] invoice and bill status reflected --- public/css/element.css | 75 +++++++++++++++++++ .../assets/js/views/purchases/payments.js | 8 +- resources/assets/js/views/sales/revenues.js | 8 +- .../views/purchases/payments/index.blade.php | 26 ++++++- .../views/sales/revenues/index.blade.php | 27 ++++++- 5 files changed, 140 insertions(+), 4 deletions(-) diff --git a/public/css/element.css b/public/css/element.css index 84ce305ec..4b4a88649 100644 --- a/public/css/element.css +++ b/public/css/element.css @@ -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 } diff --git a/resources/assets/js/views/purchases/payments.js b/resources/assets/js/views/purchases/payments.js index a9692f8a3..d92777094 100644 --- a/resources/assets/js/views/purchases/payments.js +++ b/resources/assets/js/views/purchases/payments.js @@ -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 ], diff --git a/resources/assets/js/views/sales/revenues.js b/resources/assets/js/views/sales/revenues.js index 5a7b41c58..64cf1b4a1 100644 --- a/resources/assets/js/views/sales/revenues.js +++ b/resources/assets/js/views/sales/revenues.js @@ -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 ], diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index b936aa6fa..1a699225b 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -55,7 +55,31 @@ @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ $item->contact->name }} + + {{ $item->contact->name }} + + @if($item->bill) + @if ($item->bill->status == 'paid') + + + + + + @elseif ($item->bill->status == 'partials') + + + + + + @endif + @endif + {{ $item->category->name }} {{ $item->account->name }} diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index b1e9c8b37..2bee3d9ca 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -55,7 +55,32 @@ @date($item->paid_at) @endif @money($item->amount, $item->currency_code, true) - {{ $item->contact->name }} + + + {{ $item->contact->name }} + + @if($item->invoice) + @if ($item->invoice->status == 'paid') + + + + + + @elseif ($item->invoice->status == 'partials') + + + + + + @endif + @endif + {{ $item->category->name }} {{ $item->account->name }}