diff --git a/app/Models/Sale/Invoice.php b/app/Models/Sale/Invoice.php
index 40207dca4..2006c1139 100644
--- a/app/Models/Sale/Invoice.php
+++ b/app/Models/Sale/Invoice.php
@@ -11,7 +11,6 @@ use App\Traits\Media;
use App\Traits\Recurring;
use App\Traits\Sales;
use Bkwld\Cloner\Cloneable;
-use Date;
class Invoice extends Model
{
diff --git a/public/css/custom.css b/public/css/custom.css
index e553429f1..b25bf599a 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -678,7 +678,7 @@ table .align-items-center td span.badge {
.print-edge
{
- width: 147px;
+ width: 140px;
}
/*--------Print Template Finish--------*/
diff --git a/public/css/element.css b/public/css/element.css
index d1e718ef4..74a3e2a04 100644
--- a/public/css/element.css
+++ b/public/css/element.css
@@ -15326,8 +15326,7 @@
.el-color-dropdown.el-color-picker__panel
{
- top: 360px !important;
- left: 580px !important;
+ left: 341px !important;
}
.el-color-picker__color
@@ -15394,7 +15393,6 @@
margin-top: 10px !important;
}
-
/*--------El Select Icon--------*/
.select-icon-position
{
diff --git a/resources/assets/js/views/settings/categories.js b/resources/assets/js/views/settings/categories.js
index dcf8d3f2f..c2a7ac02b 100644
--- a/resources/assets/js/views/settings/categories.js
+++ b/resources/assets/js/views/settings/categories.js
@@ -41,7 +41,7 @@ const app = new Vue({
return {
form: new Form('category'),
bulk_action: new BulkAction('categories'),
- color: '#6DA252',
+ color: '#55588b',
predefineColors: [
'#3c3f72',
'#55588b',
diff --git a/resources/assets/js/views/settings/settings.js b/resources/assets/js/views/settings/settings.js
index 3f21b2999..0e3058ec5 100644
--- a/resources/assets/js/views/settings/settings.js
+++ b/resources/assets/js/views/settings/settings.js
@@ -15,9 +15,10 @@ import Global from './../../mixins/global';
import Form from './../../plugins/form';
import BulkAction from './../../plugins/bulk-action';
import HtmlEditor from './../../components/Inputs/HtmlEditor';
+import {ColorPicker} from 'element-ui';
// plugin setup
-Vue.use(DashboardPlugin);
+Vue.use(DashboardPlugin, ColorPicker);
const app = new Vue({
el: '#app',
@@ -27,7 +28,13 @@ const app = new Vue({
],
components: {
- HtmlEditor
+ HtmlEditor,
+ [ColorPicker.name]: ColorPicker,
+ },
+
+ mounted() {
+ this.onChangeProtocol(this.form.protocol);
+ this.color = this.form.color;
},
data: function () {
@@ -42,6 +49,7 @@ const app = new Vue({
smtpPassword:true,
smtpEncryption:true,
},
+
invoice_form: new Form('template'),
template: {
modal: false,
@@ -49,17 +57,24 @@ const app = new Vue({
message: '',
html: '',
errors: new Error()
- }
+ },
+
+ color: '#55588b',
+ predefineColors:[
+ '#3c3f72',
+ '#55588b',
+ '#e5e5e5',
+ '#328aef',
+ '#efad32',
+ '#ef3232',
+ '#efef32'
+ ],
}
},
- mounted(){
- this.onChangeProtocol(this.form.protocol);
- },
-
methods:{
- onChangeProtocol(protocol){
- switch(protocol){
+ onChangeProtocol(protocol) {
+ switch(protocol) {
case "smtp":
this.email.sendmailPath = true;
this.email.smtpHost = false;
@@ -68,6 +83,7 @@ const app = new Vue({
this.email.smtpPassword = false;
this.email.smtpEncryption = false;
break;
+
case "sendmail":
this.email.sendmailPath = false;
this.email.smtpHost = true;
@@ -76,6 +92,7 @@ const app = new Vue({
this.email.smtpPassword = true;
this.email.smtpEncryption = true;
break;
+
default:
this.email.sendmailPath = true;
this.email.smtpHost = true;
@@ -97,6 +114,7 @@ const app = new Vue({
addTemplate() {
if (this.invoice_form.template != 1) {
+
this.invoice_form.submit();
this.template.errors = this.invoice_form.errors;
@@ -111,5 +129,13 @@ const app = new Vue({
errors: this.invoice_form.errors
};
},
+
+ onChangeColor() {
+ this.form.color = this.color;
+ },
+
+ onChangeColorInput() {
+ this.color = this.form.color;
+ }
}
});
diff --git a/resources/views/modals/settings/invoice_template.blade.php b/resources/views/modals/settings/invoice_template.blade.php
index 52f76206d..877c51640 100644
--- a/resources/views/modals/settings/invoice_template.blade.php
+++ b/resources/views/modals/settings/invoice_template.blade.php
@@ -11,7 +11,7 @@
'novalidate' => true
]) !!}
-
+
-
+
+
+ @stack('color_input_start')
+
+ @stack('color_input_end')
+
+
+
{!! Form::hidden('_template', $setting['template']) !!}
{!! Form::hidden('_prefix', 'invoice') !!}
{!! Form::close() !!}
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index 9df21e6b0..27371fff1 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -35,8 +35,8 @@
-
-
+
+
@@ -53,8 +53,8 @@
-
-
+
+
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index 90a83db89..96a47ce31 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -114,7 +114,9 @@
-
+ @foreach($invoice as $item)
+
+ @endforeach
@stack('name_th_start')
{{ trans_choice($text_override['items'], 2) }} |
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index d763e9fd5..3d320cb7e 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -3,7 +3,7 @@
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('content')
-
+

@@ -12,7 +12,7 @@
{{ setting('company.name') }}
-
+
@@ -43,7 +43,7 @@
@stack('name_input_start')
{{ $invoice->contact_name }}
@stack('name_input_end')
-
+
@stack('address_input_start')
{!! nl2br($invoice->contact_address) !!}
@stack('address_input_end')
@@ -53,7 +53,7 @@
{{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}
@endif
@stack('tax_number_input_end')
-
+
@stack('phone_input_start')
@if ($invoice->contact_phone)
{{ $invoice->contact_phone }}
@@ -105,7 +105,7 @@
-
+
@stack('name_th_start')
{{ trans_choice($text_override['items'], 2) }} |
@@ -168,7 +168,7 @@
@stack('notes_input_end')
-
+
@foreach ($invoice->totals as $total)
@@ -194,7 +194,7 @@
@if ($invoice->footer)
-
+
{!! $invoice->footer !!}
diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php
index c27847776..a167a0c14 100644
--- a/resources/views/settings/categories/create.blade.php
+++ b/resources/views/settings/categories/create.blade.php
@@ -30,7 +30,7 @@
- {!! Form::text('color', '#6DA252', ['v-model' => 'form.color', '@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!}
+ {!! Form::text('color', '#55588b', ['v-model' => 'form.color', '@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!}
{!! $errors->first('color', '
:message
') !!}