diff --git a/resources/assets/js/views/purchases/vendors.js b/resources/assets/js/views/purchases/vendors.js index c7af0931b..7f945307a 100644 --- a/resources/assets/js/views/purchases/vendors.js +++ b/resources/assets/js/views/purchases/vendors.js @@ -4,31 +4,31 @@ * building robust, powerful web applications using Vue and Laravel. */ -require('./../../bootstrap'); + require('./../../bootstrap'); -import Vue from 'vue'; - -import DashboardPlugin from './../../plugins/dashboard-plugin'; - -import Global from './../../mixins/global'; - -import Form from './../../plugins/form'; -import BulkAction from './../../plugins/bulk-action'; - -// plugin setup -Vue.use(DashboardPlugin); - -const app = new Vue({ - el: '#app', - - mixins: [ - Global - ], - - data: function () { - return { - form: new Form('vendor'), - bulk_action: new BulkAction('vendors') - } - } -}); + import Vue from 'vue'; + + import DashboardPlugin from './../../plugins/dashboard-plugin'; + + import Global from './../../mixins/global'; + + import Form from './../../plugins/form'; + import BulkAction from './../../plugins/bulk-action'; + + // plugin setup + Vue.use(DashboardPlugin); + + const app = new Vue({ + el: '#main-body', + + mixins: [ + Global + ], + data: function () { + return { + form: new Form('vendor'), + bulk_action: new BulkAction('vendors') + } + } + }); + \ No newline at end of file diff --git a/resources/assets/js/views/sales/customers.js b/resources/assets/js/views/sales/customers.js index 3b34a2d0e..07e369961 100644 --- a/resources/assets/js/views/sales/customers.js +++ b/resources/assets/js/views/sales/customers.js @@ -4,94 +4,95 @@ * building robust, powerful web applications using Vue and Laravel. */ -require('./../../bootstrap'); + require('./../../bootstrap'); -import Vue from 'vue'; - -import DashboardPlugin from './../../plugins/dashboard-plugin'; - -import Global from './../../mixins/global'; - -import Form from './../../plugins/form'; -import BulkAction from './../../plugins/bulk-action'; - -// plugin setup -Vue.use(DashboardPlugin); - -const app = new Vue({ - el: '#app', - - mixins: [ - Global - ], - - data: function () { - return { - form: new Form('customer'), - bulk_action: new BulkAction('customers'), - can_login : false - } - }, - - mounted() { - this.form.create_user = false; - }, - - methods:{ - onCanLogin(event) { - if (event.target.checked) { - if (this.form.email) { - axios.get(url + '/auth/users/autocomplete', { - params: { - column: 'email', - value : this.form.email - } - }) - .then(response => { - if (response.data.errors) { - if (response.data.data) { - this.form.errors.set('email', { - 0: response.data.data - }); - - return false; - } - - this.can_login = true; - this.form.create_user = true; - return true; - } - - if (response.data.success) { - this.form.errors.set('email', { - 0: can_login_errors.email - }); - - this.can_login = false; - this.form.create_user = false; - return false; - } - }) - .catch(error => { - }); - } else { - this.form.errors.set('email', { - 0: can_login_errors.valid - }); - - this.can_login = false; - this.form.create_user = false; - return false; - } - - return false; - } else { - this.form.errors.clear('email'); - - this.can_login = false; - this.form.create_user = false; - return false; - } - } - } -}); + import Vue from 'vue'; + + import DashboardPlugin from './../../plugins/dashboard-plugin'; + + import Global from './../../mixins/global'; + + import Form from './../../plugins/form'; + import BulkAction from './../../plugins/bulk-action'; + + // plugin setup + Vue.use(DashboardPlugin); + + const app = new Vue({ + el: '#main-body', + + mixins: [ + Global + ], + + data: function () { + return { + form: new Form('customer'), + bulk_action: new BulkAction('customers'), + can_login : false + } + }, + + mounted() { + this.form.create_user = false; + }, + + methods:{ + onCanLogin(event) { + if (event.target.checked) { + if (this.form.email) { + axios.get(url + '/auth/users/autocomplete', { + params: { + column: 'email', + value : this.form.email + } + }) + .then(response => { + if (response.data.errors) { + if (response.data.data) { + this.form.errors.set('email', { + 0: response.data.data + }); + + return false; + } + + this.can_login = true; + this.form.create_user = true; + return true; + } + + if (response.data.success) { + this.form.errors.set('email', { + 0: can_login_errors.email + }); + + this.can_login = false; + this.form.create_user = false; + return false; + } + }) + .catch(error => { + }); + } else { + this.form.errors.set('email', { + 0: can_login_errors.valid + }); + + this.can_login = false; + this.form.create_user = false; + return false; + } + + return false; + } else { + this.form.errors.clear('email'); + + this.can_login = false; + this.form.create_user = false; + return false; + } + } + } + }); + \ No newline at end of file diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php index 566a5f6c2..0ff1146b6 100644 --- a/resources/views/purchases/payments/create.blade.php +++ b/resources/views/purchases/payments/create.blade.php @@ -26,7 +26,7 @@ {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }} - {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, null, ['path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index')]) }} + {{ Form::selectRemoteAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, old('contact.id', old('contact_id', null)), ['path' => route('modals.vendors.create'), 'remote_action' => route('vendors.index')]) }} {{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php index 3d1b84f9d..1c0e427f0 100644 --- a/resources/views/purchases/vendors/show.blade.php +++ b/resources/views/purchases/vendors/show.blade.php @@ -12,7 +12,7 @@ @stack('button_dropdown_start') @stack('duplicate_button_start') - @can('create-purchases-bills') + @can('create-purchases-vendors') {{ trans('general.duplicate') }} @@ -21,21 +21,21 @@ - @stack('invoice_button_start') + @stack('bill_button_start') @can('create-purchases-bills') {{ trans('bills.create_bill') }} @endcan - @stack('invoice_button_end') + @stack('bill_button_end') - @stack('revenue_button_start') - @can('create-purchases-payments') + @stack('payment_button_start') + @can('create-purchases-vendors') {{ trans('payments.create_payment') }} @endcan - @stack('revenue_button_end') + @stack('payment_button_end')