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

Setting email editor issue solved.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2019-11-22 15:16:57 +03:00
parent 9b86b70c91
commit 346c208e63
6 changed files with 13691 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Providers/Form.php
View File

@ -71,6 +71,10 @@ class Form extends Provider
'name', 'text', 'icon', 'value' => null, 'attributes' => ['rows' => '3'], 'col' => 'col-md-12', 'group_class' => null
]);
Facade::component('textEditorGroup', 'partials.form.text_editor_group', [
'name', 'text', 'icon', 'value' => null, 'attributes' => ['rows' => '3'], 'col' => 'col-md-12', 'group_class' => null
]);
Facade::component('radioGroup', 'partials.form.radio_group', [
'name', 'text', 'value' => null, 'enable' => trans('general.yes'), 'disable' => trans('general.no'), 'attributes' => [], 'col' => 'col-md-6',
]);

13648
public/0.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

7
resources/assets/js/views/settings/settings.js vendored
View File

@ -12,12 +12,19 @@ import Global from './../../mixins/global';
import Form from './../../plugins/form';
import BulkAction from './../../plugins/bulk-action';
import HtmlEditor from './../../components/Inputs/HtmlEditor';
const app = new Vue({
el: '#app',
mixins: [
Global
],
components: {
HtmlEditor
},
data: function () {
return {
form: new Form('setting'),

2
resources/views/partials/admin/scripts.blade.php
View File

@ -9,6 +9,8 @@
<script src="{{ asset('public/js/common/search.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/0.js?v=' . version('short')) }}"></script>
<script src="https://unpkg.com/vue"></script>
@stack('charts')

19
resources/views/partials/form/text_editor_group.blade.php Normal file
View File

@ -0,0 +1,19 @@
@stack($name . '_input_start')
<div
class="form-group {{ $col }} {{ isset($attributes['required']) ? 'required' : '' }}"
:class="[{'has-error': {{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.get("' . $name . '")' }} }]">
{!! Form::label($name, $text, ['class' => 'form-control-label']) !!}
<html-editor
:name="'{{ $name }}'"
:value="form.{{ $name }} = '{{ $value }}'"
@input="form.{{ $name }} = $event"></html-editor>
<div class="invalid-feedback d-block"
v-if="{{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.has("' . $name . '")' }}"
v-html="{{ isset($attributes['v-error-message']) ? $attributes['v-error-message'] : 'form.errors.get("' . $name . '")' }}">
</div>
</div>
@stack($name . '_input_end')

22
resources/views/settings/email/edit.blade.php
View File

@ -29,7 +29,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_new_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_new_customer_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_new_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_new_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
@ -54,7 +54,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_remind_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_remind_customer_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_remind_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
@ -79,7 +79,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_remind_admin_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
@ -104,7 +104,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_recur_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_recur_customer_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_recur_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
@ -129,7 +129,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_recur_admin_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
@ -154,7 +154,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_payment_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_payment_customer_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_payment_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
@ -179,7 +179,7 @@
<div class="row">
{{ Form::textGroup('template_invoice_payment_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_invoice_payment_admin_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_invoice_payment_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
@ -204,7 +204,7 @@
<div class="row">
{{ Form::textGroup('template_bill_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_bill_remind_admin_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_bill_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
@ -229,7 +229,7 @@
<div class="row">
{{ Form::textGroup('template_bill_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
{{ Form::textareaGroup('template_bill_recur_admin_body', trans('settings.email.templates.body'), null, null, ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
{{ Form::textEditorGroup('template_bill_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
<div class="col-md-12">
<small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
@ -254,7 +254,7 @@
<div class="row">
{{ Form::selectGroup('protocol', trans('settings.email.protocol'), 'share', $email_protocols, !empty($setting['protocol']) ? $setting['protocol'] : null, []) }}
{{ Form::textGroup('sendmail_path', trans('settings.email.sendmail_path'), 'road', [':disabled' => '(form.protocol == "smtp")|| (form.protocol != "sendmail") ? true : false']) }}
{{ Form::textGroup('sendmail_path', trans('settings.email.sendmail_path'), 'road', [':disabled' => '(form.protocol == "smtp") || (form.protocol != "sendmail") ? true : false']) }}
{{ Form::textGroup('smtp_host', trans('settings.email.smtp.host'), 'paper-plane', [':disabled' => '(form.protocol != "smtp") ? true : false']) }}
@ -262,7 +262,7 @@
{{ Form::textGroup('smtp_username', trans('settings.email.smtp.username'), 'paper-plane', [':disabled' => '(form.protocol != "smtp") ? true : false']) }}
{{ Form::textGroup('smtp_password', trans('settings.email.smtp.password'), 'paper-plane', ['type' => 'password',':disabled' => '(form.protocol != "smtp") ? true : false']) }}
{{ Form::textGroup('smtp_password', trans('settings.email.smtp.password'), 'paper-plane', ['type' => 'password', ':disabled' => '(form.protocol != "smtp") ? true : false']) }}
{{ Form::selectGroup('smtp_encryption', trans('settings.email.smtp.encryption'), 'paper-plane', ['' => trans('settings.email.smtp.none'), 'ssl' => 'SSL', 'tls' => 'TLS'], !empty($setting['smtp_encryption']) ? $setting['smtp_encryption'] : null, [':disabled' => '(form.protocol != "smtp") ? true : false']) }}
</div>