From 6b8fd9f2676a751c889d6bfa2d3afbee5cf4a44d Mon Sep 17 00:00:00 2001 From: raishvaria Date: Mon, 11 Nov 2019 18:25:00 +0530 Subject: [PATCH 1/3] fix wizard and item select issue --- resources/assets/js/plugins/en.js | 1 + resources/assets/js/views/estimates/Item.vue | 6 ++- resources/assets/js/views/invoices/Item.vue | 6 ++- .../js/views/wizard/EmailConfiguration.vue | 37 ++++++++++++------- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js index 1121fb12..e9530099 100644 --- a/resources/assets/js/plugins/en.js +++ b/resources/assets/js/plugins/en.js @@ -678,6 +678,7 @@ export default { username: 'Username', next: 'Next', continue: 'Continue', + skip: 'Skip', database: { database: 'Site URL & Database', connection: 'Database Connection', diff --git a/resources/assets/js/views/estimates/Item.vue b/resources/assets/js/views/estimates/Item.vue index 7be0d0f1..1a137dcf 100644 --- a/resources/assets/js/views/estimates/Item.vue +++ b/resources/assets/js/views/estimates/Item.vue @@ -313,7 +313,11 @@ export default { }, created () { window.hub.$on('checkItems', this.validateItem) - window.hub.$on('newItem', this.onSelectItem) + window.hub.$on('newItem', (val) => { + if (this.item.item_id) { + this.onSelectItem(val) + } + }) }, methods: { updateTax (data) { diff --git a/resources/assets/js/views/invoices/Item.vue b/resources/assets/js/views/invoices/Item.vue index 83e00997..c1ef3b0b 100644 --- a/resources/assets/js/views/invoices/Item.vue +++ b/resources/assets/js/views/invoices/Item.vue @@ -314,7 +314,11 @@ export default { }, created () { window.hub.$on('checkItems', this.validateItem) - window.hub.$on('newItem', this.onSelectItem) + window.hub.$on('newItem', (val) => { + if (this.item.item_id) { + this.onSelectItem(val) + } + }) }, methods: { updateTax (data) { diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue index ba384107..f90c6a04 100644 --- a/resources/assets/js/views/wizard/EmailConfiguration.vue +++ b/resources/assets/js/views/wizard/EmailConfiguration.vue @@ -109,15 +109,26 @@ - - {{ $t('wizard.save_cont') }} - +
+ + {{ $t('wizard.save_cont') }} + + + {{ $t('wizard.skip') }} + +
@@ -137,10 +148,10 @@ export default { mailConfigData: { mail_driver: 'smtp', mail_host: 'mailtrap.io', - mail_port: 2525, - mail_username: 'cc3c64516febd4', - mail_password: 'e6a0176301f587', - mail_encryption: 'tls' + mail_port: null, + mail_username: null, + mail_password: null, + mail_encryption: null }, loading: false, mail_drivers: [] From 418ad8908751c786996e743ed4d16e85813f1b3f Mon Sep 17 00:00:00 2001 From: raishvaria Date: Tue, 12 Nov 2019 10:20:57 +0530 Subject: [PATCH 2/3] fix item selection issue --- resources/assets/js/views/estimates/Item.vue | 14 ++++++++++++-- resources/assets/js/views/estimates/ItemSelect.vue | 1 + resources/assets/js/views/invoices/Item.vue | 14 ++++++++++++-- resources/assets/js/views/invoices/ItemSelect.vue | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/views/estimates/Item.vue b/resources/assets/js/views/estimates/Item.vue index 1a137dcf..15a3ae1b 100644 --- a/resources/assets/js/views/estimates/Item.vue +++ b/resources/assets/js/views/estimates/Item.vue @@ -28,6 +28,7 @@ @select="onSelectItem" @deselect="deselectItem" @onDesriptionInput="$v.item.description.$touch()" + @onSelectItem="isSelected = true" /> @@ -193,13 +194,17 @@ export default { prefix: '$ ', precision: 2, masked: false - } + }, + isSelected: false } }, computed: { ...mapGetters('item', [ 'items' ]), + ...mapGetters('modal', [ + 'modalActive' + ]), ...mapGetters('currency', [ 'defaultCurrencyForInput' ]), @@ -284,6 +289,11 @@ export default { if (this.item.discount_type === 'percentage') { this.item.discount_val = (this.item.discount * newValue) / 100 } + }, + modalActive (val) { + if (!val) { + this.isSelected = false + } } }, validations () { @@ -314,7 +324,7 @@ export default { created () { window.hub.$on('checkItems', this.validateItem) window.hub.$on('newItem', (val) => { - if (this.item.item_id) { + if (!this.item.item_id && this.modalActive && this.isSelected) { this.onSelectItem(val) } }) diff --git a/resources/assets/js/views/estimates/ItemSelect.vue b/resources/assets/js/views/estimates/ItemSelect.vue index db1aa2b5..bc769c56 100644 --- a/resources/assets/js/views/estimates/ItemSelect.vue +++ b/resources/assets/js/views/estimates/ItemSelect.vue @@ -126,6 +126,7 @@ export default { this.$emit('search', val) }, openItemModal () { + this.$emit('onSelectItem') this.openModal({ 'title': 'Add Item', 'componentName': 'ItemModal' diff --git a/resources/assets/js/views/invoices/Item.vue b/resources/assets/js/views/invoices/Item.vue index c1ef3b0b..c5dab726 100644 --- a/resources/assets/js/views/invoices/Item.vue +++ b/resources/assets/js/views/invoices/Item.vue @@ -28,6 +28,7 @@ @select="onSelectItem" @deselect="deselectItem" @onDesriptionInput="$v.item.description.$touch()" + @onSelectItem="isSelected = true" /> @@ -194,13 +195,17 @@ export default { prefix: '$ ', precision: 2, masked: false - } + }, + isSelected: false } }, computed: { ...mapGetters('item', [ 'items' ]), + ...mapGetters('modal', [ + 'modalActive' + ]), ...mapGetters('currency', [ 'defaultCurrencyForInput' ]), @@ -285,6 +290,11 @@ export default { if (this.item.discount_type === 'percentage') { this.item.discount_val = (this.item.discount * newValue) / 100 } + }, + modalActive (val) { + if (!val) { + this.isSelected = false + } } }, validations () { @@ -315,7 +325,7 @@ export default { created () { window.hub.$on('checkItems', this.validateItem) window.hub.$on('newItem', (val) => { - if (this.item.item_id) { + if (!this.item.item_id && this.modalActive && this.isSelected) { this.onSelectItem(val) } }) diff --git a/resources/assets/js/views/invoices/ItemSelect.vue b/resources/assets/js/views/invoices/ItemSelect.vue index 4c66b0f4..c88a6946 100644 --- a/resources/assets/js/views/invoices/ItemSelect.vue +++ b/resources/assets/js/views/invoices/ItemSelect.vue @@ -115,6 +115,7 @@ export default { this.$emit('search', val) }, openItemModal () { + this.$emit('onSelectItem') this.openModal({ 'title': 'Add Item', 'componentName': 'ItemModal' From cb328f86aeb6e4dc15a28270ca9f564d06d16b94 Mon Sep 17 00:00:00 2001 From: raishvaria Date: Tue, 12 Nov 2019 14:32:43 +0530 Subject: [PATCH 3/3] fix taxtypes issue --- app/Http/Controllers/ItemsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ItemsController.php b/app/Http/Controllers/ItemsController.php index 42ed43d5..fa9ea089 100644 --- a/app/Http/Controllers/ItemsController.php +++ b/app/Http/Controllers/ItemsController.php @@ -79,7 +79,7 @@ class ItemsController extends Controller foreach ($request->taxes as $tax) { $item->taxes()->updateOrCreate( ['tax_type_id' => $tax['tax_type_id']], - ['amount' => $tax['amount'], 'percent' => $tax['percent'], 'percent' => $tax['name']] + ['amount' => $tax['amount'], 'percent' => $tax['percent'], 'name' => $tax['name']] ); } }