From b0a1b4a5fa79456f29d37a774343c94e32dadb1f Mon Sep 17 00:00:00 2001 From: Jay_Makwana Date: Wed, 13 Nov 2019 17:28:40 +0530 Subject: [PATCH 1/2] refactor reports in downloading on diffrent os --- resources/assets/js/views/reports/ExpensesReport.vue | 9 ++++++++- .../assets/js/views/reports/ProfitLossReport.vue | 9 ++++++++- resources/assets/js/views/reports/SalesReports.vue | 9 ++++++++- resources/assets/js/views/reports/TaxReport.vue | 11 +++++++++-- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/views/reports/ExpensesReport.vue b/resources/assets/js/views/reports/ExpensesReport.vue index ea94af8b..f1b89ba5 100644 --- a/resources/assets/js/views/reports/ExpensesReport.vue +++ b/resources/assets/js/views/reports/ExpensesReport.vue @@ -196,7 +196,14 @@ export default { return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.getReportUrl + '&download=true') + } setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) diff --git a/resources/assets/js/views/reports/ProfitLossReport.vue b/resources/assets/js/views/reports/ProfitLossReport.vue index c63c6678..2b6b5cc5 100644 --- a/resources/assets/js/views/reports/ProfitLossReport.vue +++ b/resources/assets/js/views/reports/ProfitLossReport.vue @@ -200,7 +200,14 @@ export default { return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.getReportUrl + '&download=true') + } setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) diff --git a/resources/assets/js/views/reports/SalesReports.vue b/resources/assets/js/views/reports/SalesReports.vue index cdf8d96a..7778d56c 100644 --- a/resources/assets/js/views/reports/SalesReports.vue +++ b/resources/assets/js/views/reports/SalesReports.vue @@ -238,7 +238,14 @@ export default { return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.getReportUrl + '&download=true') + } setTimeout(() => { if (this.selectedType === 'By Customer') { this.url = `${this.customerSiteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` diff --git a/resources/assets/js/views/reports/TaxReport.vue b/resources/assets/js/views/reports/TaxReport.vue index 02a2a240..3a9aded5 100644 --- a/resources/assets/js/views/reports/TaxReport.vue +++ b/resources/assets/js/views/reports/TaxReport.vue @@ -189,14 +189,21 @@ export default { this.$v.formData.$touch() if (this.$v.$invalid) { - return true + return false } this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.url + '&download=true') + } setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) From 441b6bb370bb6113ac4447043327a2c345c691d4 Mon Sep 17 00:00:00 2001 From: Jay_Makwana Date: Wed, 13 Nov 2019 21:08:15 +0530 Subject: [PATCH 2/2] add update app on settings --- resources/assets/js/plugins/en.js | 8 ++- resources/assets/js/router.js | 6 ++ .../assets/js/views/settings/UpdateApp.vue | 55 +++++++++++++++++++ .../assets/js/views/settings/layout/Index.vue | 6 ++ .../assets/plugins/vue-font-awesome/index.js | 6 +- .../assets/sass/pages/estimates/index.scss | 4 +- .../assets/sass/pages/invoices/index.scss | 4 +- 7 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 resources/assets/js/views/settings/UpdateApp.vue diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js index 76e4f6eb..404bebda 100644 --- a/resources/assets/js/plugins/en.js +++ b/resources/assets/js/plugins/en.js @@ -528,7 +528,8 @@ export default { preferences: 'Preferences', notifications: 'Notifications', tax_types: 'Tax Types', - expense_category: 'Expense Categories' + expense_category: 'Expense Categories', + update_app: 'Update App' }, title: 'Settings', setting: 'Settings | Settings', @@ -664,6 +665,11 @@ export default { select_time_zone: 'select Time Zone', select_date_formate: 'select Date Formate', select_financial_year: 'select financial year' + }, + update_app: { + title: 'Update App', + description: 'update app description', + update: 'Update' } }, wizard: { diff --git a/resources/assets/js/router.js b/resources/assets/js/router.js index 5fb1a243..279a620d 100644 --- a/resources/assets/js/router.js +++ b/resources/assets/js/router.js @@ -72,6 +72,7 @@ import UserProfile from './views/settings/UserProfile.vue' import TaxTypes from './views/settings/TaxTypes.vue' import ExpenseCategory from './views/settings/ExpenseCategory.vue' import MailConfig from './views/settings/MailConfig.vue' +import UpdateApp from './views/settings/UpdateApp.vue' import Wizard from './views/wizard/Index.vue' @@ -337,6 +338,11 @@ const routes = [ path: 'notifications', name: 'notifications', component: Notifications + }, + { + path: 'update-app', + name: 'updateapp', + component: UpdateApp } ] } diff --git a/resources/assets/js/views/settings/UpdateApp.vue b/resources/assets/js/views/settings/UpdateApp.vue new file mode 100644 index 00000000..4c3183d2 --- /dev/null +++ b/resources/assets/js/views/settings/UpdateApp.vue @@ -0,0 +1,55 @@ + + diff --git a/resources/assets/js/views/settings/layout/Index.vue b/resources/assets/js/views/settings/layout/Index.vue index 0bb6bca3..797ac1f6 100644 --- a/resources/assets/js/views/settings/layout/Index.vue +++ b/resources/assets/js/views/settings/layout/Index.vue @@ -74,6 +74,12 @@ export default { title: 'settings.menu_title.notifications', icon: 'bell', iconType: 'far' + }, + { + link: '/admin/settings/update-app', + title: 'settings.menu_title.update_app', + icon: 'sync-alt', + iconType: 'fas' } ] } diff --git a/resources/assets/plugins/vue-font-awesome/index.js b/resources/assets/plugins/vue-font-awesome/index.js index fd85606a..be90c9cd 100644 --- a/resources/assets/plugins/vue-font-awesome/index.js +++ b/resources/assets/plugins/vue-font-awesome/index.js @@ -50,7 +50,8 @@ import { faShare, faEllipsisH, faCopy, - faPaperPlane + faPaperPlane, + faSyncAlt } from '@fortawesome/free-solid-svg-icons' import { far } from '@fortawesome/free-regular-svg-icons' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' @@ -111,7 +112,8 @@ library.add( faShare, faEllipsisH, faCopy, - faPaperPlane + faPaperPlane, + faSyncAlt ) Vue.component('font-awesome-icon', FontAwesomeIcon) diff --git a/resources/assets/sass/pages/estimates/index.scss b/resources/assets/sass/pages/estimates/index.scss index 3ccd353f..cf8f1753 100644 --- a/resources/assets/sass/pages/estimates/index.scss +++ b/resources/assets/sass/pages/estimates/index.scss @@ -38,7 +38,7 @@ } .filter-date { - flex: 1; + flex: 2; display: flex; margin-right: 40px; align-items: center; @@ -60,7 +60,7 @@ margin-top: 28px; } - @media(max-width: $medium-breakpoint ) { + @media(max-width: $large-breakpoint ) { .filter-container { flex-direction: column; } diff --git a/resources/assets/sass/pages/invoices/index.scss b/resources/assets/sass/pages/invoices/index.scss index 88f18b5e..3c85a131 100644 --- a/resources/assets/sass/pages/invoices/index.scss +++ b/resources/assets/sass/pages/invoices/index.scss @@ -33,7 +33,7 @@ } .filter-date { - flex: 1; + flex: 2; display: flex; margin-right: 40px; align-items: center; @@ -55,7 +55,7 @@ margin-top: 28px; } - @media(max-width: $medium-breakpoint ) { + @media(max-width: $large-breakpoint ) { .filter-container { flex-direction: column; }