From 4698d503a06028bd4b37cd5a4a33230809f4e378 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 29 Nov 2019 16:40:19 +0300
Subject: [PATCH] reconciliations styles updated

---
 .../views/banking/reconciliations/create.blade.php   |  9 +++++++--
 .../views/banking/reconciliations/edit.blade.php     |  9 +++++++--
 .../views/banking/reconciliations/index.blade.php    | 12 ++++--------
 resources/views/portal/invoices/signed.blade.php     |  3 ++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php
index 175172223..ed9d69302 100644
--- a/resources/views/banking/reconciliations/create.blade.php
+++ b/resources/views/banking/reconciliations/create.blade.php
@@ -114,8 +114,13 @@
                         @if ($transactions->count())
                             <div class="float-right">
                                 <a href="{{ route('reconciliations.index') }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
-                                {!! Form::button('<span class="fa fa-check"></span> &nbsp;' . trans('reconciliations.reconcile'), ['type' => 'button', 'id' => 'button-reconcile', 'class' => 'btn btn-info button-submit header-button-top', 'data-loading-text' => trans('general.loading'), 'disabled' => 'disabled']) !!}
-                                {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
+                                {!! Form::button(
+                                    '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-check"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('reconciliations.reconcile') . '</span>',
+                                    [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-info button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
+
+                                {!! Form::button(
+                                    '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
+                                    [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
                             </div>
                         @else
                             <div class="text-sm text-muted" id="datatable-basic_info" role="status" aria-live="polite">
diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php
index 38191f4be..70ecddc65 100644
--- a/resources/views/banking/reconciliations/edit.blade.php
+++ b/resources/views/banking/reconciliations/edit.blade.php
@@ -79,8 +79,13 @@
                 <div class="row float-right">
                     @if ($transactions->count())
                         <a href="{{ route('reconciliations.index') }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
-                        {!! Form::button('<span class="fa fa-check"></span> &nbsp;' . trans('reconciliations.reconcile'), ['type' => 'button', 'id' => 'button-reconcile', 'class' => 'btn btn-info button-submit header-button-top', 'data-loading-text' => trans('general.loading'), 'disabled' => 'disabled']) !!}
-                        {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'submit', 'class' => 'btn btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
+                        {!! Form::button(
+                            '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-check"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('reconciliations.reconcile') . '</span>',
+                            [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-info button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
+
+                        {!! Form::button(
+                            '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
+                            [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
                     @else
                         <small>{{ trans('general.no_records') }}</small>
                     @endif
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php
index 71d2b8199..7df6a4d08 100644
--- a/resources/views/banking/reconciliations/index.blade.php
+++ b/resources/views/banking/reconciliations/index.blade.php
@@ -37,7 +37,7 @@
                         <th class="col-xs-4 col-sm-3 col-md-3 col-lg-3">@sortablelink('account_id', trans_choice('general.accounts', 1))</th>
                         <th class="col-lg-2 hidden-lg">{{ trans('general.period') }}</th>
                         <th class="col-md-2 col-lg-2 hidden-md text-right">@sortablelink('closing_balance', trans('reconciliations.closing_balance'))</th>
-                        <th class="col-xs-4 col-sm-2 col-md-2 col-lg-1">@sortablelink('enabled', trans('general.enabled'))</th>
+                        <th class="col-xs-4 col-sm-2 col-md-2 col-lg-1">@sortablelink('invoice_status_code', trans_choice('general.statuses', 1))</th>
                         <th class="col-xs-4 col-sm-2 col-md-2 col-lg-1 text-center">{{ trans('general.actions') }}</th>
                     </tr>
                 </thead>
@@ -51,14 +51,10 @@
                             <td class="col-lg-2 hidden-lg border-0">@date($item->started_at) - @date($item->ended_at)</td>
                             <td class="col-md-2 col-lg-2 hidden-md text-right">@money($item->closing_balance, $item->account->currency_code, true)</td>
                             <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1">
-                                @if (user()->can('update-banking-reconciliations'))
-                                    {{ Form::enabledGroup($item->id, $item->account->name, $item->enabled) }}
+                                @if ($item->reconciled)
+                                    <span class="badge badge-pill badge-success">{{ trans('reconciliations.reconciled') }}</span>
                                 @else
-                                    @if ($item->enabled)
-                                        <badge rounded type="success">{{ trans('general.enabled') }}</badge>
-                                    @else
-                                        <badge rounded type="danger">{{ trans('general.disabled') }}</badge>
-                                    @endif
+                                    <span class="badge badge-pill badge-danger">{{ trans('reconciliations.unreconciled') }}</span>
                                 @endif
                             </td>
                             <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 text-center">
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index 963bc9f25..b376f8b28 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -210,7 +210,8 @@
                                 'id' => 'invoice-payment',
                                 'role' => 'form',
                                 'autocomplete' => "off",
-                                'novalidate' => 'true'
+                                'novalidate' => 'true',
+                                'class' => 'mb-0',
                             ]) !!}
                                 {{ Form::selectGroup('payment_method', '', 'fas fa-wallet', $payment_methods, '', ['change' => 'onChangePaymentMethodSigned', 'id' => 'payment-method', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.payment_methods', 1)])], 'mb-0') }}
                                 {!! Form::hidden('invoice_id', $invoice->id, ['v-model' => 'form.invoice_id']) !!}