From 27e027c5648e0f997bb8fb8610f7818524d05e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 12 Feb 2020 16:09:44 +0300 Subject: [PATCH] moneygroup fixes. --- .../assets/js/components/AkauntingMoney.vue | 8 ++++---- resources/assets/js/mixins/global.js | 3 ++- resources/assets/js/views/purchases/bills.js | 6 ------ resources/assets/js/views/purchases/payments.js | 16 ++++++++-------- resources/assets/js/views/sales/invoices.js | 6 ------ resources/assets/js/views/sales/revenues.js | 8 +------- 6 files changed, 15 insertions(+), 32 deletions(-) diff --git a/resources/assets/js/components/AkauntingMoney.vue b/resources/assets/js/components/AkauntingMoney.vue index f8355f3ff..5fa32cabe 100644 --- a/resources/assets/js/components/AkauntingMoney.vue +++ b/resources/assets/js/components/AkauntingMoney.vue @@ -137,8 +137,8 @@ export default { input(event) { this.model = event; - this.$emit('change', this.model); - this.$emit('interface', this.model); + //this.$emit('change', this.model); + //this.$emit('interface', this.model); } }, @@ -157,8 +157,8 @@ export default { this.model = value; }, model: function (model) { - //this.$emit('change', this.model); - //this.$emit('interface', this.model); + this.$emit('change', this.model); + this.$emit('interface', this.model); } }, } diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index b00cc374d..242521118 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -14,7 +14,7 @@ import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; import NProgressAxios from './../plugins/nprogress-axios'; -import { Select, Option, Steps, Step, Button, Link } from 'element-ui'; +import { Select, Option, Steps, Step, Button, Link, Tooltip } from 'element-ui'; import Form from './../plugins/form'; @@ -35,6 +35,7 @@ export default { [Step.name]: Step, [Button.name]: Button, [Link.name]: Link, + [Tooltip.name]: Tooltip, }, data: function () { diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js index 0ddccef7b..9fd6e325f 100644 --- a/resources/assets/js/views/purchases/bills.js +++ b/resources/assets/js/views/purchases/bills.js @@ -342,12 +342,6 @@ const app = new Vue({ this.transaction_form.currency = response.data.currency_name; this.transaction_form.currency_code = response.data.currency_code; this.transaction_form.currency_rate = response.data.currency_rate; - - this.money.decimal = response.data.decimal_mark; - this.money.thousands = response.data.thousands_separator; - this.money.prefix = (response.data.symbol_first) ? response.data.symbol : ''; - this.money.suffix = !(response.data.symbol_first) ? response.data.symbol : ''; - this.money.precision = response.data.precision; }) .catch(error => { }); diff --git a/resources/assets/js/views/purchases/payments.js b/resources/assets/js/views/purchases/payments.js index d92777094..0b1832541 100644 --- a/resources/assets/js/views/purchases/payments.js +++ b/resources/assets/js/views/purchases/payments.js @@ -15,18 +15,12 @@ import Global from './../../mixins/global'; import Form from './../../plugins/form'; import BulkAction from './../../plugins/bulk-action'; -import {Tooltip} from 'element-ui'; - // plugin setup -Vue.use(DashboardPlugin, Tooltip); +Vue.use(DashboardPlugin); const app = new Vue({ el: '#app', - components: { - [Tooltip.name]: Tooltip, - }, - mixins: [ Global ], @@ -34,7 +28,13 @@ const app = new Vue({ data: function () { return { form: new Form('payment'), - bulk_action: new BulkAction('payments') + bulk_action: new BulkAction('payments'), + currency: null, + } + }, + + methods: { + onCalcualte() { } } }); diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js index 517aa1236..e12d1c6e6 100644 --- a/resources/assets/js/views/sales/invoices.js +++ b/resources/assets/js/views/sales/invoices.js @@ -342,12 +342,6 @@ const app = new Vue({ this.transaction_form.currency = response.data.currency_name; this.transaction_form.currency_code = response.data.currency_code; this.transaction_form.currency_rate = response.data.currency_rate; - - this.money.decimal = response.data.decimal_mark; - this.money.thousands = response.data.thousands_separator; - this.money.prefix = (response.data.symbol_first) ? response.data.symbol : ''; - this.money.suffix = !(response.data.symbol_first) ? response.data.symbol : ''; - this.money.precision = response.data.precision; }) .catch(error => { }); diff --git a/resources/assets/js/views/sales/revenues.js b/resources/assets/js/views/sales/revenues.js index 64cf1b4a1..5a7b41c58 100644 --- a/resources/assets/js/views/sales/revenues.js +++ b/resources/assets/js/views/sales/revenues.js @@ -15,18 +15,12 @@ import Global from './../../mixins/global'; import Form from './../../plugins/form'; import BulkAction from './../../plugins/bulk-action'; -import {Tooltip} from 'element-ui'; - // plugin setup -Vue.use(DashboardPlugin, Tooltip); +Vue.use(DashboardPlugin); const app = new Vue({ el: '#app', - components: { - [Tooltip.name]: Tooltip, - }, - mixins: [ Global ],