fix wizard and item select issue

This commit is contained in:
raishvaria
2019-11-11 18:25:00 +05:30
parent 80a761dbe0
commit 6b8fd9f267
4 changed files with 35 additions and 15 deletions

View File

@ -678,6 +678,7 @@ export default {
username: 'Username', username: 'Username',
next: 'Next', next: 'Next',
continue: 'Continue', continue: 'Continue',
skip: 'Skip',
database: { database: {
database: 'Site URL & Database', database: 'Site URL & Database',
connection: 'Database Connection', connection: 'Database Connection',

View File

@ -313,7 +313,11 @@ export default {
}, },
created () { created () {
window.hub.$on('checkItems', this.validateItem) 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: { methods: {
updateTax (data) { updateTax (data) {

View File

@ -314,7 +314,11 @@ export default {
}, },
created () { created () {
window.hub.$on('checkItems', this.validateItem) 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: { methods: {
updateTax (data) { updateTax (data) {

View File

@ -109,15 +109,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row mt-5">
<base-button <base-button
:loading="loading" :loading="loading"
class="pull-right mt-5" class="pull-right"
icon="save" icon="save"
color="theme" color="theme"
type="submit" type="submit"
> >
{{ $t('wizard.save_cont') }} {{ $t('wizard.save_cont') }}
</base-button> </base-button>
<base-button
:loading="loading"
class="pull-right ml-4"
outline
color="theme"
@click="$emit('next')"
>
{{ $t('wizard.skip') }}
</base-button>
</div>
</form> </form>
</div> </div>
</template> </template>
@ -137,10 +148,10 @@ export default {
mailConfigData: { mailConfigData: {
mail_driver: 'smtp', mail_driver: 'smtp',
mail_host: 'mailtrap.io', mail_host: 'mailtrap.io',
mail_port: 2525, mail_port: null,
mail_username: 'cc3c64516febd4', mail_username: null,
mail_password: 'e6a0176301f587', mail_password: null,
mail_encryption: 'tls' mail_encryption: null
}, },
loading: false, loading: false,
mail_drivers: [] mail_drivers: []