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

Merge pull request #1194 from batuhawk/master

Browse Source 
Payment modals updated
This commit is contained in:
Batuhan Baş 2020-01-28 19:56:48 +03:00 committed by GitHub
commit ecd095cbb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/css/custom.css vendored
View File

@ -436,6 +436,11 @@ button:focus
.btn-delete{ .btn-delete{
width: 73.10px; width: 73.10px;
} }
.btn-confirm
{
width: 86px;
}
/*--------Akaunting Loader Finish--------*/ /*--------Akaunting Loader Finish--------*/
@ -677,12 +682,25 @@ table .align-items-center td span.badge {
} }
/*--------Empty Page Image Finish--------*/ /*--------Empty Page Image Finish--------*/
/*--------Text Pre Nowrap--------*/
.text-pre-nowrap .text-pre-nowrap
{ {
white-space: pre-wrap !important; white-space: pre-wrap !important;
} }
/*--------Text Pre Nowrap Finish--------*/
/*--------Modal Dialog Resizing--------*/
@media (min-width: 576px)
{
.modal-payment .modal-dialog
{
max-width: 559px !important;
}
}
/*--------Modal Dialog Resizing Finish--------*/
/*----------------RESPONSIVE START LINE----------------*/ /*----------------RESPONSIVE START LINE----------------*/
/*--------Xs Breakpoint--------*/ /*--------Xs Breakpoint--------*/

4
resources/assets/js/views/purchases/bills.js vendored
View File

@ -213,6 +213,10 @@ const app = new Vue({
this.transaction_form.submit(); this.transaction_form.submit();
this.payment.errors = this.transaction_form.errors; this.payment.errors = this.transaction_form.errors;
this.form.loading = true;
this.$emit("confirm");
}, },
closePayment() { closePayment() {

4
resources/assets/js/views/sales/invoices.js vendored
View File

@ -213,6 +213,10 @@ const app = new Vue({
this.transaction_form.submit(); this.transaction_form.submit();
this.payment.errors = this.transaction_form.errors; this.payment.errors = this.transaction_form.errors;
this.form.loading = true;
this.$emit("confirm");
}, },
closePayment() { closePayment() {

12
resources/views/purchases/bills/show.blade.php
View File

@ -604,13 +604,15 @@
<template #card-footer> <template #card-footer>
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-outline-secondary" @click="closePayment"> <button type="button" class="btn btn-icon btn-outline-secondary header-button-top" @click="closePayment">
<span>{{ trans('general.cancel') }}</span> <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</button> </button>
<button type="button" class="btn btn-success button-submit" @click="addPayment"> <button :disabled="form.loading" type="button" class="btn btn-icon btn-success button-submit header-button-top" @click="addPayment">
<div class="aka-loader d-none"></div> <div v-if="form.loading" class="aka-loader-frame btn-confirm"><div class="aka-loader"></div></div>
<span>{{ trans('general.confirm') }}</span> <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('general.confirm') }}</span>
</button> </button>
</div> </div>
</template> </template>

18
resources/views/sales/invoices/show.blade.php
View File

@ -649,6 +649,7 @@
@push('content_content_end') @push('content_content_end')
<akaunting-modal <akaunting-modal
class="modal-payment"
:show="payment.modal" :show="payment.modal"
@cancel="payment.modal = false" @cancel="payment.modal = false"
:title="'{{ trans('general.title.new', ['type' => trans_choice('general.payments', 1)]) }}'" :title="'{{ trans('general.title.new', ['type' => trans_choice('general.payments', 1)]) }}'"
@ -661,17 +662,20 @@
<template #card-footer> <template #card-footer>
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-outline-secondary" @click="closePayment"> <button type="button" class="btn btn-icon btn-outline-secondary header-button-top" @click="closePayment">
<span>{{ trans('general.cancel') }}</span> <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</button> </button>
<a href="{{ url('apps/categories/payment-method') }}" class="btn btn-white"> <a href="{{ url('apps/categories/payment-method') }}" class="btn btn-icon btn-white header-button-top long-texts">
<span class="fa fa-money"></span> &nbsp;{{ trans('invoices.accept_payments') }} <span class="btn-inner--icon"><i class="fas fa-credit-card"></i></span>
<span class="btn-inner--text">{{ trans('invoices.accept_payments') }}</span>
</a> </a>
<button type="button" class="btn btn-success button-submit" @click="addPayment"> <button :disabled="form.loading" type="button" class="btn btn-icon btn-success button-submit header-button-top" @click="addPayment">
<div class="aka-loader d-none"></div> <div v-if="form.loading" class="aka-loader-frame btn-confirm"><div class="aka-loader"></div></div>
<span>{{ trans('general.confirm') }}</span> <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('general.confirm') }}</span>
</button> </button>
</div> </div>
</template> </template>