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

modal forgotten styles and transactions added

Browse Source
This commit is contained in:
batuhanbas 2020-02-02 17:21:09 +03:00
parent 7dff77604c
commit a5794bef30
11 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/components/AkauntingModal.vue
View File

@ -17,10 +17,10 @@
</slot> </slot>
</div> </div>
<slot name="modal-body"> <slot name="modal-body">
<div class="modal-body" v-html="message"> <div class="modal-body pb-0" v-html="message">
</div> </div>
</slot> </slot>
<div class="card-footer border-top-0"> <div class="card-footer border-top-0 pt-0">
<slot name="card-footer"> <slot name="card-footer">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-icon btn-outline-secondary" @click="onCancel"> <button type="button" class="btn btn-icon btn-outline-secondary" @click="onCancel">

6
resources/assets/js/components/AkauntingModalAddNew.vue
View File

@ -17,14 +17,14 @@
</slot> </slot>
</div> </div>
<slot name="modal-body"> <slot name="modal-body">
<div class="modal-body" v-if="!is_component" v-html="message"> <div class="modal-body pb-0" v-if="!is_component" v-html="message">
</div> </div>
<div class="modal-body" v-else> <div class="modal-body pb-0" v-else>
<form id="form-create" method="POST" action="#"/> <form id="form-create" method="POST" action="#"/>
<component v-bind:is="component"></component> <component v-bind:is="component"></component>
</div> </div>
</slot> </slot>
<div class="card-footer border-top-0"> <div class="card-footer border-top-0 pt-0">
<slot name="card-footer"> <slot name="card-footer">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-icon" :class="buttons.cancel.class" @click="onCancel"> <button type="button" class="btn btn-icon" :class="buttons.cancel.class" @click="onCancel">

1
resources/lang/en-GB/general.php
View File

@ -76,6 +76,7 @@ return [
'edit' => 'Edit', 'edit' => 'Edit',
'delete' => 'Delete', 'delete' => 'Delete',
'send' => 'Send', 'send' => 'Send',
'share' => 'Share',
'download' => 'Download', 'download' => 'Download',
'delete_confirm' => 'Confirm delete :name :type?', 'delete_confirm' => 'Confirm delete :name :type?',
'name' => 'Name', 'name' => 'Name',

8
resources/views/modals/bills/payment.blade.php
View File

@ -19,13 +19,7 @@
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }} {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }}
@stack('currency_code_input_start') @stack('currency_code_input_start')
<div class="form-group col-md-6 required"> {{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'disabled', 'v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")'], $currencies[$bill->currency_code]) }}
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-exchange"></i></div>
{!! Form::text('currency', $currencies[$bill->currency_code], ['v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")','id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
</div>
</div>
@stack('currency_code_input_end') @stack('currency_code_input_end')
{{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3', 'v-model' => 'transaction_form.description', 'v-error' => 'payment.errors.get("description")', 'v-error-message' => 'payment.errors.get("description")']) }} {{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3', 'v-model' => 'transaction_form.description', 'v-error' => 'payment.errors.get("description")', 'v-error-message' => 'payment.errors.get("description")']) }}

2
resources/views/modals/categories/create.blade.php
View File

@ -8,7 +8,7 @@
'novalidate' => true 'novalidate' => true
]) !!} ]) !!}
<div class="row"> <div class="row">
{{ Form::textGroup('name', trans('general.name'), 'id-card-o') }} {{ Form::textGroup('name', trans('general.name'), 'font') }}
@stack('color_input_start') @stack('color_input_start')
<div class="form-group col-md-6 required {{ $errors->has('color') ? 'has-error' : ''}}"> <div class="form-group col-md-6 required {{ $errors->has('color') ? 'has-error' : ''}}">

10
resources/views/modals/invoices/payment.blade.php
View File

@ -1,4 +1,4 @@
<div class="modal-body"> <div class="modal-body pb-0">
{!! Form::open([ {!! Form::open([
'url' => 'modals/invoices/' . $invoice->id . '/transactions', 'url' => 'modals/invoices/' . $invoice->id . '/transactions',
'id' => 'transaction', 'id' => 'transaction',
@ -19,13 +19,7 @@
{{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }} {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }}
@stack('currency_code_input_start') @stack('currency_code_input_start')
<div class="form-group col-md-6 required"> {{ Form::textGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', ['disabled' => 'disabled', 'v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")'], $currencies[$invoice->currency_code]) }}
{!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!}
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-exchange"></i></div>
{!! Form::text('currency', $currencies[$invoice->currency_code], ['v-model' => 'transaction_form.currency', 'v-error' => 'payment.errors.get("currency")', 'v-error-message' => 'payment.errors.get("currency")','id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
</div>
</div>
@stack('currency_code_input_end') @stack('currency_code_input_end')
{{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3', 'v-model' => 'transaction_form.description', 'v-error' => 'payment.errors.get("description")', 'v-error-message' => 'payment.errors.get("description")']) }} {{ Form::textareaGroup('description', trans('general.description'), '', null, ['rows' => '3', 'v-model' => 'transaction_form.description', 'v-error' => 'payment.errors.get("description")', 'v-error-message' => 'payment.errors.get("description")']) }}

2
resources/views/modals/settings/invoice_template.blade.php
View File

@ -1,4 +1,4 @@
<div class="modal-body"> <div class="modal-body pb-0">
{!! Form::open([ {!! Form::open([
'route' => 'modals.invoice-templates.update', 'route' => 'modals.invoice-templates.update',
'method' => 'PATCH', 'method' => 'PATCH',

4
resources/views/modals/taxes/create.blade.php
View File

@ -3,12 +3,12 @@
'@submit.prevent' => 'onSubmit', '@submit.prevent' => 'onSubmit',
'@keydown' => 'form.errors.clear($event.target.name)', '@keydown' => 'form.errors.clear($event.target.name)',
'role' => 'form', 'role' => 'form',
'class' => 'form-loading-button', 'class' => 'form-loading-button m--3',
'route' => 'taxes.store', 'route' => 'taxes.store',
'novalidate' => true 'novalidate' => true
]) !!} ]) !!}
<div class="row"> <div class="row">
{{ Form::textGroup('name', trans('general.name'), 'id-card-o') }} {{ Form::textGroup('name', trans('general.name'), 'font') }}
{{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }} {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}

4
resources/views/modals/vendors/create.blade.php vendored
View File

@ -8,13 +8,13 @@
'novalidate' => true 'novalidate' => true
]) !!} ]) !!}
<div class="row"> <div class="row">
{{ Form::textGroup('name', trans('general.name'), 'id-card-o') }} {{ Form::textGroup('name', trans('general.name'), 'font') }}
{{ Form::textGroup('email', trans('general.email'), 'envelope', []) }} {{ Form::textGroup('email', trans('general.email'), 'envelope', []) }}
{{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }} {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
{{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('default.currency')) }} {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency')) }}
{{ Form::textareaGroup('address', trans('general.address')) }} {{ Form::textareaGroup('address', trans('general.address')) }}

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

@ -447,7 +447,7 @@
@stack('button_pay_start') @stack('button_pay_start')
@if($bill->status != 'paid') @if($bill->status != 'paid')
@if(empty($bill->paid) || ($bill->paid != $bill->amount)) @if(empty($bill->paid) || ($bill->paid != $bill->amount))
<a class="dropdown-item" href="#" id="button-payment">{{ trans('bills.add_payment') }}</a> <button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button>
@endif @endif
@permission('update-purchases-bills') @permission('update-purchases-bills')
@if($bill->status == 'draft') @if($bill->status == 'draft')
@ -592,6 +592,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)]) }}'"
@ -622,3 +623,4 @@
@push('scripts_start') @push('scripts_start')
<script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
@endpush @endpush

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

@ -467,7 +467,7 @@
@stack('button_share_start') @stack('button_share_start')
<a href="{{ $signed_url }}" target="_blank" class="btn btn-white header-button-top"> <a href="{{ $signed_url }}" target="_blank" class="btn btn-white header-button-top">
<i class="fa fa-share"></i>&nbsp; Share <i class="fa fa-share"></i>&nbsp; {{ trans('general.share') }}
</a> </a>
@stack('button_share_end') @stack('button_share_end')