TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Jay_Makwana
2019-11-19 20:39:30 +05:30
parent 98579040cc e63836e1d7
commit 6378d77cfa
7 changed files with 14 additions and 191258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/js/bootstrap.js vendored
View File

@ -92,8 +92,7 @@ global.axios.interceptors.response.use(undefined, function (err) {
if (err.response.data.error === 'invalid_credentials') {
window.toastr['error']('Invalid Credentials')
}
if (err.response.data && err.response.statusText === 'Unauthorized') {
if (err.response.data && (err.response.statusText === 'Unauthorized' || err.response.data === ' Unauthorized.')) {
store.dispatch('auth/logout', true)
} else {
throw err

4
resources/assets/js/plugins/en.js
View File

@ -581,7 +581,7 @@ export default {
from_name: 'From Mail Name',
from_mail: 'From Mail Address',
encryption: 'Mail Encryption',
mail_config_desc: 'Below details will be used to update the mail environment. Also you can change the details anytime after logging in.'
mail_config_desc: 'Below is the form for Configuring Email driver for sending emails from the app. You can also configure third party providers like Sendgrid, SES etc.'
},
pdf: {
title: 'PDF Setting',
@ -757,7 +757,7 @@ export default {
from_name: 'From Mail Name',
from_mail: 'From Mail Address',
encryption: 'Mail Encryption',
mail_config_desc: 'Below details will be used to update the mail environment. Also you can change the details anytime after logging in.'
mail_config_desc: 'Below is the form for Configuring Email driver for sending emails from the app. You can also configure third party providers like Sendgrid, SES etc.'
},
req: {
system_req: 'System Requirements',

1
resources/assets/js/views/wizard/EmailConfiguration.vue
View File

@ -14,6 +14,7 @@
</form>
</div>
</template>
<script>
import MultiSelect from 'vue-multiselect'
import { validationMixin } from 'vuelidate'