@freteclick/quasar-financial-ui 1.0.98 → 1.0.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/components/invoice/client/details/InvoiceInvoice.vue +1 -1
- package/src/components/invoice/client/details/InvoiceOrders.vue +17 -1
- package/src/components/invoice/receive/details/InvoiceInvoice.vue +1 -1
- package/src/router/routes.js +15 -15
- package/src/store/modules/invoice/comission/actions.js +1 -1
- package/src/store/modules/invoice/expense/actions.js +1 -1
- package/src/store/modules/invoice/pay/actions.js +1 -1
- package/src/store/modules/invoice/receive/actions.js +1 -1
- package/src/store/modules/invoice/receive/actionsBkp.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@freteclick/quasar-financial-ui",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.100",
|
|
4
4
|
"author": "FreteClick",
|
|
5
5
|
"description": "FreteClick financial Quasar UI Component",
|
|
6
6
|
"license": "MIT",
|
|
@@ -15,4 +15,4 @@
|
|
|
15
15
|
"browserslist": [
|
|
16
16
|
"last 1 version, not dead, ie >= 11"
|
|
17
17
|
]
|
|
18
|
-
}
|
|
18
|
+
}
|
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
<script>
|
|
123
123
|
import {mapActions, mapGetters} from 'vuex';
|
|
124
124
|
import axios from 'axios';
|
|
125
|
-
import {ENTRYPOINT} from '
|
|
125
|
+
import {ENTRYPOINT} from '@freteclick/../../src/config/entrypoint';
|
|
126
126
|
|
|
127
127
|
export default {
|
|
128
128
|
props: {
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
{{ props.row.transportadora }}
|
|
24
24
|
</q-td>
|
|
25
25
|
<q-td key="preco" :props="props">{{ props.cols[8].value }}</q-td>
|
|
26
|
+
<q-td key="precoReal" :props="props">{{ props.cols[9].value }}</q-td>
|
|
26
27
|
</q-tr>
|
|
27
28
|
</template>
|
|
28
29
|
</q-table>
|
|
@@ -44,6 +45,7 @@ const SETTINGS = {
|
|
|
44
45
|
'entrega',
|
|
45
46
|
'transportadora',
|
|
46
47
|
'preco',
|
|
48
|
+
'precoReal'
|
|
47
49
|
],
|
|
48
50
|
columns: [
|
|
49
51
|
{
|
|
@@ -124,6 +126,19 @@ const SETTINGS = {
|
|
|
124
126
|
},
|
|
125
127
|
label: 'Preço'
|
|
126
128
|
},
|
|
129
|
+
{
|
|
130
|
+
name: "precoReal",
|
|
131
|
+
field: "precoReal",
|
|
132
|
+
align: "left",
|
|
133
|
+
format: (val, row) => {
|
|
134
|
+
if (isNaN(val)) {
|
|
135
|
+
return val;
|
|
136
|
+
} else {
|
|
137
|
+
return formatMoney(val, "BRL", "pt-br");
|
|
138
|
+
}
|
|
139
|
+
},
|
|
140
|
+
label: "Preço Real",
|
|
141
|
+
},
|
|
127
142
|
],
|
|
128
143
|
};
|
|
129
144
|
|
|
@@ -233,6 +248,7 @@ export default {
|
|
|
233
248
|
'localEntrega': item.quote !== null ? `${item.quote.cityDestination.city} / ${item.quote.cityDestination.state.uf}` : '',
|
|
234
249
|
'transportadora': item.quote !== null ? item.quote.carrier.name : '',
|
|
235
250
|
'preco': item.price,
|
|
251
|
+
'precoReal': item.realPrice == null || item.realPrice == 0 ? "-----" : item.realPrice,
|
|
236
252
|
});
|
|
237
253
|
}
|
|
238
254
|
|
|
@@ -325,4 +341,4 @@ export default {
|
|
|
325
341
|
},
|
|
326
342
|
},
|
|
327
343
|
};
|
|
328
|
-
</script>
|
|
344
|
+
</script>
|
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
<script>
|
|
123
123
|
import {mapActions, mapGetters} from 'vuex';
|
|
124
124
|
import axios from 'axios';
|
|
125
|
-
import {ENTRYPOINT} from '
|
|
125
|
+
import {ENTRYPOINT} from '@freteclick/../../src/config/entrypoint';
|
|
126
126
|
|
|
127
127
|
export default {
|
|
128
128
|
props: {
|
package/src/router/routes.js
CHANGED
|
@@ -2,29 +2,29 @@
|
|
|
2
2
|
export const routes = [
|
|
3
3
|
{
|
|
4
4
|
path : '/finance/',
|
|
5
|
-
component: () => import('
|
|
5
|
+
component: () => import('@freteclick/../../src/layouts/AdminLayout.vue'),
|
|
6
6
|
children : [
|
|
7
7
|
{ name: 'ClientInvoiceIndex', path: 'client', component: () => import('../pages/Invoice/Client/Index.vue') },
|
|
8
8
|
{ name: 'ClientInvoiceDetails', path: 'client/id/:id', component: () => import('../pages/Invoice/Client/Details.vue') },
|
|
9
|
-
|
|
10
|
-
{
|
|
11
|
-
name: 'FinancePayIndex',
|
|
12
|
-
path: 'pay',
|
|
9
|
+
|
|
10
|
+
{
|
|
11
|
+
name: 'FinancePayIndex',
|
|
12
|
+
path: 'pay',
|
|
13
13
|
component: () => import('../pages/Invoice/Pay/Index.vue')
|
|
14
14
|
},
|
|
15
|
-
{
|
|
16
|
-
name: 'PayDetails',
|
|
17
|
-
path: 'pay/id/:id',
|
|
18
|
-
component: () => import('../pages/Invoice/Pay/Details.vue')
|
|
15
|
+
{
|
|
16
|
+
name: 'PayDetails',
|
|
17
|
+
path: 'pay/id/:id',
|
|
18
|
+
component: () => import('../pages/Invoice/Pay/Details.vue')
|
|
19
19
|
},
|
|
20
|
-
{
|
|
21
|
-
name: 'FinanceReceiveIndex',
|
|
22
|
-
path: 'receive',
|
|
20
|
+
{
|
|
21
|
+
name: 'FinanceReceiveIndex',
|
|
22
|
+
path: 'receive',
|
|
23
23
|
component: () => import('../pages/Invoice/Receive/Index.vue')
|
|
24
24
|
},
|
|
25
|
-
{
|
|
26
|
-
name: 'ReceiveDetails',
|
|
27
|
-
path: 'receive/id/:id',
|
|
25
|
+
{
|
|
26
|
+
name: 'ReceiveDetails',
|
|
27
|
+
path: 'receive/id/:id',
|
|
28
28
|
component: () => import('../pages/Invoice/Receive/Details.vue')
|
|
29
29
|
},
|
|
30
30
|
]
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
|
|
2
|
-
import { fetch } from '
|
|
2
|
+
import { fetch } from '@freteclick/../../src/boot/myapi';
|
|
3
3
|
import * as types from './mutation_types';
|
|
4
4
|
|
|
5
5
|
const RESOURCE_ENDPOINT = '/finance/comission';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
|
|
2
|
-
import { fetch }
|
|
2
|
+
import { fetch } from '@freteclick/../../src/boot/myapi';
|
|
3
3
|
import * as types from './mutation_types';
|
|
4
4
|
|
|
5
5
|
const RESOURCE_ENDPOINT = '/finance/pay';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
|
|
2
|
-
import { fetch }
|
|
2
|
+
import { fetch } from '@freteclick/../../src/boot/myapi';
|
|
3
3
|
import * as types from './mutation_types';
|
|
4
4
|
|
|
5
5
|
const RESOURCE_ENDPOINT = '/finance/receive';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
|
|
2
|
-
import { fetch } from '
|
|
2
|
+
import { fetch } from '@freteclick/../../src/boot/myapi';
|
|
3
3
|
import * as types from './mutation_types';
|
|
4
4
|
|
|
5
5
|
const RESOURCE_ENDPOINT = '/finance/receive';
|