Compare commits
220 Commits
warmFix_re
...
dev
Author | SHA1 | Date |
---|---|---|
|
2d129dde01 | |
|
d142797b1f | |
|
2b5802a7fb | |
|
3549f172d6 | |
|
d6363e4b45 | |
|
22f1373c84 | |
|
488d48e9e9 | |
|
642589d054 | |
|
3fd3fef647 | |
|
582c7c8d40 | |
|
e8a3dc05dd | |
|
455fd72db4 | |
|
d4053d74d2 | |
|
eb5a0956a7 | |
|
406b25103d | |
|
12e4435709 | |
|
830f506f5b | |
|
c7f25d6909 | |
|
c89fd0580f | |
|
4db9adb20a | |
|
f9bf2e7a3e | |
|
a3d828498b | |
|
4f821c86c1 | |
|
4857962955 | |
|
624eac7094 | |
|
f50f747310 | |
|
5110a46328 | |
|
bcee01280c | |
|
3c4c27889e | |
|
b7625f06bd | |
|
8f3ec13ccc | |
|
5eee9965bf | |
|
e5f079121d | |
|
a5d3babf1f | |
|
f32d07ccaa | |
|
1f5e4bd771 | |
|
1a7a8dfc95 | |
|
21c3384509 | |
|
2992ac2d0d | |
|
9b337062c8 | |
|
6ef3df2322 | |
|
e9ef1c308e | |
|
e5005d08ed | |
|
7ef02c8797 | |
|
20ed8001bf | |
|
c700521b37 | |
|
b2ce75d2f6 | |
|
a5b27b3683 | |
|
daa3289b58 | |
|
8c132298bb | |
|
e444828e4e | |
|
ce72c78af7 | |
|
a472e35bcf | |
|
832646638b | |
|
cf05dc0d5b | |
|
5afc9ce983 | |
|
00ed955577 | |
|
a780786a2c | |
|
00e1e4441c | |
|
6fd01a4d09 | |
|
a4b710352d | |
|
4821390f22 | |
|
8b24874f72 | |
|
425e2adcdb | |
|
d7866f9bdb | |
|
6debb64b2b | |
|
4bdd8a6494 | |
|
9989e752bc | |
|
d3848a2343 | |
|
7deb9b1f16 | |
|
e4196e7176 | |
|
6aceda51f5 | |
|
7a7463ebf1 | |
|
b5fa2bb18e | |
|
1e1715df1a | |
|
736471bcbe | |
|
861bbb1574 | |
|
736f3e1c00 | |
|
0af42130c1 | |
|
74033a7bdf | |
|
87e56d9ff1 | |
|
2e6963d505 | |
|
4b6696fdc9 | |
|
e150ffd9fc | |
|
8bc40c74f2 | |
|
61ec951011 | |
|
22b57f850c | |
|
046b6f8f28 | |
|
a43ade9852 | |
|
9be4cdccc0 | |
|
f02fa732ee | |
|
8849b9ed97 | |
|
40cfe2a5cc | |
|
02a78c662b | |
|
588876952a | |
|
3c4cbf82d2 | |
|
da21c0aad6 | |
|
0863df25fe | |
|
26861e92b6 | |
|
fb3c015f89 | |
|
3ddc6dc310 | |
|
79fbe2cc72 | |
|
c9416b5286 | |
|
27ec560fc5 | |
|
49fafa2b34 | |
|
98a4ac450d | |
|
35886999e4 | |
|
79fdaffbc8 | |
|
8c9c156817 | |
|
b00d89a4be | |
|
e679282e57 | |
|
044c607405 | |
|
9f05984e80 | |
|
c4f895e060 | |
|
7c5ce312cc | |
|
7dd28393dd | |
|
3c68220903 | |
|
1d5509313a | |
|
d71029c7e9 | |
|
19121fbeb9 | |
|
dd739b1165 | |
|
0208debdbe | |
|
f392502673 | |
|
a81f8fcdaf | |
|
5ade9fd133 | |
|
f2a20ce4bf | |
|
9ef29e61bd | |
|
ae5465687e | |
|
801e9687f7 | |
|
cad78aedd0 | |
|
f8cc7b95ab | |
|
16cb224926 | |
|
ea59cf8b0d | |
|
6adf7a91cf | |
|
c03a56f69f | |
|
687bd54e64 | |
|
0b614f15d8 | |
|
3fc56700e4 | |
|
60899ef2d2 | |
|
dcd5d357ae | |
|
985e8663a3 | |
|
ea314073d2 | |
|
71c6741cf2 | |
|
696dbd4149 | |
|
d94dafd667 | |
|
446b679bca | |
|
e353f7916a | |
|
a3b1095952 | |
|
ae9cc49add | |
|
3783cdeed4 | |
|
4b1a648509 | |
|
943e0abb2a | |
|
6e7e28226a | |
|
1a284acdc5 | |
|
eb81b9b6ee | |
|
240d671701 | |
|
dc35377f13 | |
|
31e8229cd3 | |
|
96a3f52b79 | |
|
69d99350bc | |
|
76e9aab5ae | |
|
22a978098e | |
|
cf261828db | |
|
eb6ed49060 | |
|
838d5e24ce | |
|
0f9f9bf21d | |
|
b9f23dfb18 | |
|
4ee8c80340 | |
|
27d7a732b7 | |
|
04f1aae5a0 | |
|
83c0bfad0c | |
|
d01951a709 | |
|
31bfe6c44e | |
|
2fd9067096 | |
|
92566f6e53 | |
|
f1e334f1fc | |
|
31ff7de958 | |
|
5bb078540d | |
|
7d8f25ff7d | |
|
fcebf6f664 | |
|
e1b96d6a73 | |
|
d15144a98a | |
|
b51f99f5f1 | |
|
5c627dd489 | |
|
d199478c1d | |
|
5e782a1465 | |
|
42f898531d | |
|
1d34fc0287 | |
|
a6eb5dde8d | |
|
04543c8397 | |
|
ee96142f2d | |
|
d5486f89a5 | |
|
15159c1937 | |
|
4789c1d3cb | |
|
ca020fff80 | |
|
d302ee58c0 | |
|
e24600d1ad | |
|
1fcdd120c5 | |
|
6ab64453ab | |
|
ed615d7bbd | |
|
1a52a23712 | |
|
0491fa58b4 | |
|
d2be59ddbf | |
|
efaa8a517b | |
|
c7d26084aa | |
|
40875256ff | |
|
4ee7a5c4fb | |
|
36083b4e7a | |
|
cc55cd3822 | |
|
a250cc0eb5 | |
|
95f9917dc2 | |
|
28ae84a931 | |
|
f17b773cca | |
|
bfe302e9d4 | |
|
69f84e2fcd | |
|
d755c0c8ba | |
|
59ddd2377b | |
|
95e69ff79b | |
|
e797905764 | |
|
158c0f684a |
|
@ -1,6 +0,0 @@
|
||||||
/dist
|
|
||||||
/src-capacitor
|
|
||||||
/src-cordova
|
|
||||||
/.quasar
|
|
||||||
/node_modules
|
|
||||||
.eslintrc.js
|
|
75
.eslintrc.js
75
.eslintrc.js
|
@ -1,75 +0,0 @@
|
||||||
export default {
|
|
||||||
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
|
|
||||||
// This option interrupts the configuration hierarchy at this file
|
|
||||||
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
|
|
||||||
root: true,
|
|
||||||
|
|
||||||
parserOptions: {
|
|
||||||
ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
|
|
||||||
},
|
|
||||||
|
|
||||||
env: {
|
|
||||||
node: true,
|
|
||||||
browser: true,
|
|
||||||
'vue/setup-compiler-macros': true,
|
|
||||||
},
|
|
||||||
|
|
||||||
// Rules order is important, please avoid shuffling them
|
|
||||||
extends: [
|
|
||||||
// Base ESLint recommended rules
|
|
||||||
'eslint:recommended',
|
|
||||||
|
|
||||||
// Uncomment any of the lines below to choose desired strictness,
|
|
||||||
// but leave only one uncommented!
|
|
||||||
// See https://eslint.vuejs.org/rules/#available-rules
|
|
||||||
// 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
|
|
||||||
'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
|
|
||||||
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
|
|
||||||
|
|
||||||
// https://github.com/prettier/eslint-config-prettier#installation
|
|
||||||
// usage with Prettier, provided by 'eslint-config-prettier'.
|
|
||||||
'prettier',
|
|
||||||
],
|
|
||||||
|
|
||||||
plugins: [
|
|
||||||
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
|
|
||||||
// required to lint *.vue files
|
|
||||||
'vue',
|
|
||||||
|
|
||||||
// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
|
|
||||||
// Prettier has not been included as plugin to avoid performance impact
|
|
||||||
// add it as an extension for your IDE
|
|
||||||
],
|
|
||||||
|
|
||||||
globals: {
|
|
||||||
ga: 'readonly', // Google Analytics
|
|
||||||
cordova: 'readonly',
|
|
||||||
__statics: 'readonly',
|
|
||||||
__QUASAR_SSR__: 'readonly',
|
|
||||||
__QUASAR_SSR_SERVER__: 'readonly',
|
|
||||||
__QUASAR_SSR_CLIENT__: 'readonly',
|
|
||||||
__QUASAR_SSR_PWA__: 'readonly',
|
|
||||||
process: 'readonly',
|
|
||||||
Capacitor: 'readonly',
|
|
||||||
chrome: 'readonly',
|
|
||||||
},
|
|
||||||
|
|
||||||
// add your custom rules here
|
|
||||||
rules: {
|
|
||||||
'prefer-promise-reject-errors': 'off',
|
|
||||||
'no-unused-vars': 'warn',
|
|
||||||
'vue/no-multiple-template-root': 'off',
|
|
||||||
// allow debugger during development only
|
|
||||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
|
||||||
},
|
|
||||||
overrides: [
|
|
||||||
{
|
|
||||||
files: ['test/cypress/**/*.*'],
|
|
||||||
extends: [
|
|
||||||
// Add Cypress-specific lint rules, globals and Cypress plugin
|
|
||||||
// See https://github.com/cypress-io/eslint-plugin-cypress#rules
|
|
||||||
'plugin:cypress/recommended',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"extends": ["plugin:cypress/recommended"]
|
||||||
|
}
|
|
@ -125,8 +125,10 @@ pipeline {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
||||||
|
|
||||||
|
def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
|
||||||
|
echo "E2E MODULES: ${modules}"
|
||||||
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
||||||
sh 'sh test/cypress/cypressParallel.sh 1'
|
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -183,3 +185,4 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
import cypress from 'eslint-plugin-cypress';
|
||||||
|
import eslint from 'eslint-plugin-import';
|
||||||
|
import globals from 'globals';
|
||||||
|
import js from '@eslint/js';
|
||||||
|
import vue from 'eslint-plugin-vue';
|
||||||
|
export default {
|
||||||
|
plugins: { vue, eslint, cypress },
|
||||||
|
languageOptions: {
|
||||||
|
globals: {
|
||||||
|
...globals.node,
|
||||||
|
...globals.browser,
|
||||||
|
...vue.configs['vue3-strongly-recommended'].globals,
|
||||||
|
...cypress.environments.globals.globals,
|
||||||
|
ga: 'readonly',
|
||||||
|
cordova: 'readonly',
|
||||||
|
__statics: 'readonly',
|
||||||
|
__QUASAR_SSR__: 'readonly',
|
||||||
|
__QUASAR_SSR_SERVER__: 'readonly',
|
||||||
|
__QUASAR_SSR_CLIENT__: 'readonly',
|
||||||
|
__QUASAR_SSR_PWA__: 'readonly',
|
||||||
|
process: 'readonly',
|
||||||
|
Capacitor: 'readonly',
|
||||||
|
chrome: 'readonly',
|
||||||
|
},
|
||||||
|
|
||||||
|
ecmaVersion: 2020,
|
||||||
|
sourceType: 'module',
|
||||||
|
|
||||||
|
parserOptions: {
|
||||||
|
parser: '@babel/eslint-parser',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
...vue.rules['flat/strongly-recommended'],
|
||||||
|
...js.configs.recommended.rules,
|
||||||
|
semi: 'off',
|
||||||
|
'generator-star-spacing': 'warn',
|
||||||
|
'arrow-parens': 'warn',
|
||||||
|
'no-var': 'error',
|
||||||
|
'prefer-const': 'error',
|
||||||
|
'prefer-template': 'warn',
|
||||||
|
'prefer-destructuring': 'off',
|
||||||
|
'prefer-spread': 'warn',
|
||||||
|
'prefer-rest-params': 'warn',
|
||||||
|
'prefer-object-spread': 'warn',
|
||||||
|
'prefer-arrow-callback': 'warn',
|
||||||
|
'prefer-numeric-literals': 'warn',
|
||||||
|
'prefer-exponentiation-operator': 'warn',
|
||||||
|
'prefer-regex-literals': 'warn',
|
||||||
|
'one-var': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
let: 'never',
|
||||||
|
const: 'never',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
'no-void': 'off',
|
||||||
|
'prefer-promise-reject-errors': 'error',
|
||||||
|
'multiline-ternary': 'warn',
|
||||||
|
'no-restricted-imports': 'warn',
|
||||||
|
'no-import-assign': 'warn',
|
||||||
|
'no-duplicate-imports': 'warn',
|
||||||
|
'no-useless-rename': 'warn',
|
||||||
|
'eslint/no-named-as-default': 'warn',
|
||||||
|
'eslint/no-named-as-default-member': 'warn',
|
||||||
|
'no-unsafe-optional-chaining': 'warn',
|
||||||
|
'no-undef': 'error',
|
||||||
|
'no-unused-vars': 'error',
|
||||||
|
'no-console': 'error',
|
||||||
|
'no-debugger': 'error',
|
||||||
|
'no-useless-escape': 'error',
|
||||||
|
'no-prototype-builtins': 'error',
|
||||||
|
'no-async-promise-executor': 'error',
|
||||||
|
'no-irregular-whitespace': 'error',
|
||||||
|
'no-constant-condition': 'error',
|
||||||
|
'no-unsafe-finally': 'error',
|
||||||
|
'no-extend-native': 'error',
|
||||||
|
},
|
||||||
|
ignores: [
|
||||||
|
'/dist',
|
||||||
|
'/src-capacitor',
|
||||||
|
'/src-cordova',
|
||||||
|
'/.quasar',
|
||||||
|
'/node_modules',
|
||||||
|
'.eslintrc.js',
|
||||||
|
],
|
||||||
|
};
|
16
package.json
16
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.14.0",
|
"version": "25.16.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
@ -9,7 +9,8 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"resetDatabase": "cd ../salix && gulp docker",
|
"resetDatabase": "cd ../salix && gulp docker",
|
||||||
"lint": "eslint --ext .js,.vue ./",
|
"lint": "eslint \"**/*.{vue,js}\" ",
|
||||||
|
"lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
|
||||||
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
||||||
"test:e2e": "cypress open",
|
"test:e2e": "cypress open",
|
||||||
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
||||||
|
@ -31,22 +32,27 @@
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"chromium": "^3.0.3",
|
"chromium": "^3.0.3",
|
||||||
"croppie": "^2.6.5",
|
"croppie": "^2.6.5",
|
||||||
|
"es-module-lexer": "^1.6.0",
|
||||||
|
"fast-glob": "^3.3.3",
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"pinia": "^2.1.3",
|
"pinia": "^2.1.3",
|
||||||
"quasar": "^2.17.7",
|
"quasar": "^2.17.7",
|
||||||
"validator": "^13.9.0",
|
"validator": "^13.9.0",
|
||||||
"vue": "^3.5.13",
|
"vue": "^3.5.13",
|
||||||
"vue-i18n": "^9.3.0",
|
"vue-i18n": "^9.4.0",
|
||||||
"vue-router": "^4.2.5"
|
"vue-router": "^4.2.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/cli": "^19.2.1",
|
"@commitlint/cli": "^19.2.1",
|
||||||
"@commitlint/config-conventional": "^19.1.0",
|
"@commitlint/config-conventional": "^19.1.0",
|
||||||
"@intlify/unplugin-vue-i18n": "^0.8.2",
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@eslint/js": "^9.20.0",
|
||||||
|
"@intlify/unplugin-vue-i18n": "^4.0.0",
|
||||||
"@pinia/testing": "^0.1.2",
|
"@pinia/testing": "^0.1.2",
|
||||||
"@quasar/app-vite": "^2.0.8",
|
"@quasar/app-vite": "^2.0.8",
|
||||||
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
||||||
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
||||||
|
"@vue/compiler-sfc": "^3.5.13",
|
||||||
"@vue/test-utils": "^2.4.4",
|
"@vue/test-utils": "^2.4.4",
|
||||||
"autoprefixer": "^10.4.14",
|
"autoprefixer": "^10.4.14",
|
||||||
"cypress": "^14.1.0",
|
"cypress": "^14.1.0",
|
||||||
|
@ -54,7 +60,9 @@
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.18.0",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
"eslint-plugin-cypress": "^4.1.0",
|
"eslint-plugin-cypress": "^4.1.0",
|
||||||
|
"eslint-plugin-import": "^2.31.0",
|
||||||
"eslint-plugin-vue": "^9.32.0",
|
"eslint-plugin-vue": "^9.32.0",
|
||||||
|
"globals": "^16.0.0",
|
||||||
"husky": "^8.0.0",
|
"husky": "^8.0.0",
|
||||||
"junit-merge": "^2.0.0",
|
"junit-merge": "^2.0.0",
|
||||||
"mocha": "^11.1.0",
|
"mocha": "^11.1.0",
|
||||||
|
|
1041
pnpm-lock.yaml
1041
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
|
||||||
build: {
|
build: {
|
||||||
target: {
|
target: {
|
||||||
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
||||||
node: 'node18',
|
node: 'node20',
|
||||||
},
|
},
|
||||||
|
|
||||||
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
||||||
|
@ -92,6 +92,7 @@ export default configure(function (/* ctx */) {
|
||||||
vitePlugins: [
|
vitePlugins: [
|
||||||
[
|
[
|
||||||
VueI18nPlugin({
|
VueI18nPlugin({
|
||||||
|
strictMessage: false,
|
||||||
runtimeOnly: false,
|
runtimeOnly: false,
|
||||||
include: [
|
include: [
|
||||||
path.resolve(__dirname, './src/i18n/locale/**'),
|
path.resolve(__dirname, './src/i18n/locale/**'),
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* eslint-disable eslint/export */
|
||||||
export * from './defaults/qTable';
|
export * from './defaults/qTable';
|
||||||
export * from './defaults/qInput';
|
export * from './defaults/qInput';
|
||||||
export * from './defaults/qSelect';
|
export * from './defaults/qSelect';
|
||||||
|
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
||||||
v-model="address"
|
v-model="address"
|
||||||
is-outlined
|
is-outlined
|
||||||
autofocus
|
autofocus
|
||||||
data-cy="SendEmailNotifiactionDialogInput"
|
data-cy="SendEmailNotificationDialogInput"
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
@ -219,6 +219,7 @@ function filterByRecord(modelLog) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter(params = {}) {
|
async function applyFilter(params = {}) {
|
||||||
|
paginate.value.arrayData.resetPagination();
|
||||||
paginate.value.arrayData.applyFilter({
|
paginate.value.arrayData.applyFilter({
|
||||||
filter: {},
|
filter: {},
|
||||||
params: { originFk: route.params.id, ...params },
|
params: { originFk: route.params.id, ...params },
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
import FetchData from '../FetchData.vue';
|
import FetchData from '../FetchData.vue';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import { useCapitalize } from 'src/composables/useCapitalize';
|
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
|
import VnAvatar from '../ui/VnAvatar.vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
dataKey: {
|
dataKey: {
|
||||||
|
@ -99,7 +100,6 @@ function getActions() {
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:redirect="false"
|
:redirect="false"
|
||||||
:hiddenTags="['originFk', 'creationDate']"
|
:hiddenTags="['originFk', 'creationDate']"
|
||||||
:exprBuilder
|
|
||||||
search-url="logs"
|
search-url="logs"
|
||||||
:showTagChips="false"
|
:showTagChips="false"
|
||||||
>
|
>
|
||||||
|
|
|
@ -159,6 +159,7 @@ async function fetch() {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
|
align-items: start;
|
||||||
.label {
|
.label {
|
||||||
color: var(--vn-label-color);
|
color: var(--vn-label-color);
|
||||||
width: 9em;
|
width: 9em;
|
||||||
|
@ -169,9 +170,15 @@ async function fetch() {
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
&.ellipsis > .value {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.header {
|
.header {
|
||||||
|
@ -203,27 +210,21 @@ async function fetch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-group {
|
.vn-card-group {
|
||||||
display: flex;
|
display: grid;
|
||||||
flex-direction: column;
|
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||||
|
gap: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-content {
|
.vn-card-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
> div {
|
> div {
|
||||||
max-height: 70px;
|
max-height: 70px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 1010px) {
|
|
||||||
.vn-card-group {
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
.vn-card-content {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.summaryHeader .vn-label-value {
|
.summaryHeader .vn-label-value {
|
||||||
|
|
|
@ -252,6 +252,10 @@ const toModule = computed(() => {
|
||||||
content: ':';
|
content: ':';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
&.ellipsis > .value {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { dashIfEmpty } from 'src/filters';
|
||||||
|
|
||||||
defineProps({ email: { type: [String], default: null } });
|
defineProps({ email: { type: [String], default: null } });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<QBtn
|
||||||
|
class="q-pr-xs"
|
||||||
v-if="email"
|
v-if="email"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
|
||||||
:href="`mailto:${email}`"
|
:href="`mailto:${email}`"
|
||||||
@click.stop
|
@click.stop
|
||||||
/>
|
/>
|
||||||
|
<span>{{ dashIfEmpty(email) }}</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { parsePhone } from 'src/filters';
|
import { dashIfEmpty, parsePhone } from 'src/filters';
|
||||||
import useOpenURL from 'src/composables/useOpenURL';
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -12,38 +12,51 @@ const props = defineProps({
|
||||||
|
|
||||||
const phone = ref(props.phoneNumber);
|
const phone = ref(props.phoneNumber);
|
||||||
const config = reactive({
|
const config = reactive({
|
||||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
|
||||||
'say-simple': {
|
'say-simple': {
|
||||||
icon: 'vn:saysimple',
|
icon: 'vn:saysimple',
|
||||||
url: null,
|
url: null,
|
||||||
channel: props.channel,
|
channel: props.channel,
|
||||||
},
|
},
|
||||||
|
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||||
});
|
});
|
||||||
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
|
||||||
|
const attrs = useAttrs();
|
||||||
|
const types = Object.keys(config)
|
||||||
|
.filter((key) => key in attrs)
|
||||||
|
.sort();
|
||||||
|
const activeTypes = types.length ? types : ['sip'];
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
if (!phone.value) return;
|
if (!phone.value) return;
|
||||||
let { channel } = config[type];
|
|
||||||
|
|
||||||
|
for (const type of activeTypes) {
|
||||||
if (type === 'say-simple') {
|
if (type === 'say-simple') {
|
||||||
|
let { channel } = config[type];
|
||||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||||
.data;
|
.data;
|
||||||
if (!channel) channel = defaultChannel;
|
if (!channel) channel = defaultChannel;
|
||||||
|
|
||||||
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
phone.value = await parsePhone(
|
||||||
config[
|
props.phoneNumber,
|
||||||
type
|
props.country?.toLowerCase(),
|
||||||
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
);
|
||||||
|
config[type].url =
|
||||||
|
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleClick() {
|
function handleClick(type) {
|
||||||
if (config[type].url) useOpenURL(config[type].url);
|
if (config[type].url) useOpenURL(config[type].url);
|
||||||
else if (config[type].href) window.location.href = config[type].href;
|
else if (config[type].href) window.location.href = config[type].href;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<template v-for="type in activeTypes">
|
||||||
<QBtn
|
<QBtn
|
||||||
|
:key="type"
|
||||||
v-if="phone"
|
v-if="phone"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
@ -51,11 +64,13 @@ function handleClick() {
|
||||||
size="sm"
|
size="sm"
|
||||||
color="primary"
|
color="primary"
|
||||||
padding="none"
|
padding="none"
|
||||||
@click.stop="handleClick"
|
@click.stop="() => handleClick(type)"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ capitalize(type).replace('-', '') }}
|
{{ capitalize(type).replace('-', '') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn>
|
</QBtn></template
|
||||||
{{ phoneNumber }}
|
>
|
||||||
|
<span>{{ dashIfEmpty(phone) }}</span>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -30,9 +30,16 @@ export function useAcl() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasAcl(model, prop, accessType) {
|
||||||
|
const modelAcl = state.getAcls().value[model];
|
||||||
|
const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
|
||||||
|
return !!(propAcl?.[accessType] || propAcl?.['*']);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fetch,
|
fetch,
|
||||||
hasAny,
|
hasAny,
|
||||||
state,
|
state,
|
||||||
|
hasAcl,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ export function useRole() {
|
||||||
name: data.user.name,
|
name: data.user.name,
|
||||||
nickname: data.user.nickname,
|
nickname: data.user.nickname,
|
||||||
lang: data.user.lang || 'es',
|
lang: data.user.lang || 'es',
|
||||||
departmentFk: data.user.worker.department.departmentFk,
|
departmentFk: data.user?.worker?.department?.departmentFk,
|
||||||
};
|
};
|
||||||
state.setUser(userData);
|
state.setUser(userData);
|
||||||
state.setRoles(roles);
|
state.setRoles(roles);
|
||||||
|
|
|
@ -100,12 +100,8 @@ const onChangePass = (oldPass) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
hasitManagementAccess.value = useAcl().hasAny([
|
hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
|
||||||
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
|
hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
|
||||||
]);
|
|
||||||
hasSysadminAccess.value = useAcl().hasAny([
|
|
||||||
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
|
|
||||||
]);
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
@ -227,7 +223,7 @@ onMounted(() => {
|
||||||
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem
|
<QItem
|
||||||
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
|
v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
|
||||||
v-ripple
|
v-ripple
|
||||||
clickable
|
clickable
|
||||||
@click="showSyncDialog = true"
|
@click="showSyncDialog = true"
|
||||||
|
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
||||||
<QPopupProxy style="max-width: 10px">
|
<QPopupProxy style="max-width: 10px">
|
||||||
<AccountDescriptor
|
<AccountDescriptor
|
||||||
v-if="$attrs.id"
|
v-if="$attrs.id"
|
||||||
v-bind="$attrs.id"
|
v-bind="$attrs"
|
||||||
:summary="AccountSummary"
|
:summary="AccountSummary"
|
||||||
:proxy-render="true"
|
:proxy-render="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -25,7 +25,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
|
||||||
const { openConfirmationModal } = useVnConfirm();
|
const { openConfirmationModal } = useVnConfirm();
|
||||||
const { sendEmail, openReport } = usePrintService();
|
const { sendEmail, openReport } = usePrintService();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { hasAny } = useAcl();
|
const { hasAcl } = useAcl();
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -276,9 +276,7 @@ const showBalancePdf = ({ id }) => {
|
||||||
>
|
>
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="scope.value"
|
v-model="scope.value"
|
||||||
:disable="
|
:disable="!hasAcl('Receipt', '*', 'WRITE')"
|
||||||
!hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
|
|
||||||
"
|
|
||||||
@keypress.enter="scope.set"
|
@keypress.enter="scope.set"
|
||||||
autofocus
|
autofocus
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -3,7 +3,13 @@ import { computed, ref } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
|
import {
|
||||||
|
toCurrency,
|
||||||
|
toPercentage,
|
||||||
|
toDate,
|
||||||
|
dashOrCurrency,
|
||||||
|
dashIfEmpty,
|
||||||
|
} from 'src/filters';
|
||||||
import CardSummary from 'components/ui/CardSummary.vue';
|
import CardSummary from 'components/ui/CardSummary.vue';
|
||||||
import VnLv from 'src/components/ui/VnLv.vue';
|
import VnLv from 'src/components/ui/VnLv.vue';
|
||||||
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
|
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
|
||||||
|
@ -287,10 +293,14 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
<VnLv
|
<VnLv
|
||||||
v-if="entity.creditInsurance"
|
v-if="entity.creditInsurance"
|
||||||
:label="t('customer.summary.securedCredit')"
|
:label="t('customer.summary.securedCredit')"
|
||||||
:value="toCurrency(entity.creditInsurance)"
|
|
||||||
:info="t('customer.summary.securedCreditInfo')"
|
:info="t('customer.summary.securedCreditInfo')"
|
||||||
/>
|
>
|
||||||
|
<template #value>
|
||||||
|
{{ toCurrency(entity.creditInsurance) }}({{
|
||||||
|
dashIfEmpty(entity.classifications[0]?.insurances[0]?.grade)
|
||||||
|
}})
|
||||||
|
</template></VnLv
|
||||||
|
>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.balance')"
|
:label="t('customer.summary.balance')"
|
||||||
:value="toCurrency(sumRisk(entity)) || toCurrency(0)"
|
:value="toCurrency(sumRisk(entity)) || toCurrency(0)"
|
||||||
|
|
|
@ -72,6 +72,7 @@ const exprBuilder = (param, value) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
url="Departments"
|
url="Departments"
|
||||||
|
no-one="true"
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
@ -154,9 +155,9 @@ en:
|
||||||
city: City
|
city: City
|
||||||
phone: Phone
|
phone: Phone
|
||||||
email: Email
|
email: Email
|
||||||
|
departmentFk: Department
|
||||||
isToBeMailed: Mailed
|
isToBeMailed: Mailed
|
||||||
isEqualizated: Equailized
|
isEqualizated: Equailized
|
||||||
departmentFk: Department
|
|
||||||
businessTypeFk: Business type
|
businessTypeFk: Business type
|
||||||
sageTaxTypeFk: Sage Tax Type
|
sageTaxTypeFk: Sage Tax Type
|
||||||
sageTransactionTypeFk: Sage Tax Type
|
sageTransactionTypeFk: Sage Tax Type
|
||||||
|
|
|
@ -127,6 +127,7 @@ es:
|
||||||
Identifier: Identificador
|
Identifier: Identificador
|
||||||
Social name: Razón social
|
Social name: Razón social
|
||||||
Phone: Teléfono
|
Phone: Teléfono
|
||||||
|
Postcode: Código postal
|
||||||
City: Población
|
City: Población
|
||||||
Email: Email
|
Email: Email
|
||||||
Campaign consumption: Consumo campaña
|
Campaign consumption: Consumo campaña
|
||||||
|
|
|
@ -93,10 +93,26 @@ const updateAddressTicket = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateObservations = async (payload) => {
|
const updateObservations = async (payload) => {
|
||||||
await axios.post('AddressObservations/crud', payload);
|
await axios.post('AddressObservations/crud', cleanPayload(payload));
|
||||||
notes.value = [];
|
notes.value = [];
|
||||||
deletes.value = [];
|
deletes.value = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function cleanPayload(payload) {
|
||||||
|
['creates', 'deletes', 'updates'].forEach((prop) => {
|
||||||
|
if (prop === 'creates' || prop === 'updates') {
|
||||||
|
payload[prop] = payload[prop].filter(
|
||||||
|
(item) => item.description !== '' && item.observationTypeFk !== '',
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
payload[prop] = payload[prop].filter(
|
||||||
|
(item) => item !== null && item !== undefined,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return payload;
|
||||||
|
}
|
||||||
|
|
||||||
async function updateAll({ data, payload }) {
|
async function updateAll({ data, payload }) {
|
||||||
await updateObservations(payload);
|
await updateObservations(payload);
|
||||||
await updateAddress(data);
|
await updateAddress(data);
|
||||||
|
|
|
@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
|
||||||
:without-header="true"
|
:without-header="true"
|
||||||
auto-load
|
auto-load
|
||||||
:row-click="rowClick"
|
:row-click="rowClick"
|
||||||
order="shipped DESC, id"
|
order="shipped DESC, id DESC"
|
||||||
:disable-option="{ card: true, table: true }"
|
:disable-option="{ card: true, table: true }"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
:disable-infinite-scroll="true"
|
:disable-infinite-scroll="true"
|
||||||
|
|
|
@ -70,8 +70,8 @@ onMounted(async () => {
|
||||||
:url="`#/entry/${entityId}/basic-data`"
|
:url="`#/entry/${entityId}/basic-data`"
|
||||||
:text="t('globals.summary.basicData')"
|
:text="t('globals.summary.basicData')"
|
||||||
/>
|
/>
|
||||||
<div class="card-group">
|
<div class="vn-card-group">
|
||||||
<div class="card-content">
|
<div class="vn-card-content">
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('entry.summary.commission')"
|
:label="t('entry.summary.commission')"
|
||||||
:value="entry?.commission"
|
:value="entry?.commission"
|
||||||
|
@ -93,7 +93,7 @@ onMounted(async () => {
|
||||||
:value="entry?.invoiceNumber"
|
:value="entry?.invoiceNumber"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-content">
|
<div class="vn-card-content">
|
||||||
<VnCheckbox
|
<VnCheckbox
|
||||||
:label="t('entry.list.tableVisibleColumns.isOrdered')"
|
:label="t('entry.list.tableVisibleColumns.isOrdered')"
|
||||||
v-model="entry.isOrdered"
|
v-model="entry.isOrdered"
|
||||||
|
@ -130,8 +130,8 @@ onMounted(async () => {
|
||||||
:url="`#/travel/${entry.travel.id}/summary`"
|
:url="`#/travel/${entry.travel.id}/summary`"
|
||||||
:text="t('Travel')"
|
:text="t('Travel')"
|
||||||
/>
|
/>
|
||||||
<div class="card-group">
|
<div class="vn-card-group">
|
||||||
<div class="card-content">
|
<div class="vn-card-content">
|
||||||
<VnLv :label="t('entry.summary.travelReference')">
|
<VnLv :label="t('entry.summary.travelReference')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span class="link">
|
<span class="link">
|
||||||
|
@ -161,7 +161,7 @@ onMounted(async () => {
|
||||||
:value="entry.travel.warehouseIn?.name"
|
:value="entry.travel.warehouseIn?.name"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-content">
|
<div class="vn-card-content">
|
||||||
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
||||||
<VnCheckbox
|
<VnCheckbox
|
||||||
:label="t('entry.summary.travelDelivered')"
|
:label="t('entry.summary.travelDelivered')"
|
||||||
|
@ -193,31 +193,6 @@ onMounted(async () => {
|
||||||
</template>
|
</template>
|
||||||
</CardSummary>
|
</CardSummary>
|
||||||
</template>
|
</template>
|
||||||
<style lang="scss" scoped>
|
|
||||||
.card-group {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-content {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
> div {
|
|
||||||
max-height: 24px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 1010px) {
|
|
||||||
.card-group {
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
.card-content {
|
|
||||||
flex: 1;
|
|
||||||
margin-right: 16px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
Travel: Envío
|
Travel: Envío
|
||||||
|
|
|
@ -22,7 +22,7 @@ const routes = reactive({
|
||||||
getSupplier: (id) => {
|
getSupplier: (id) => {
|
||||||
return { name: 'SupplierCard', params: { id } };
|
return { name: 'SupplierCard', params: { id } };
|
||||||
},
|
},
|
||||||
getTickets: (id) => {
|
getInvoices: (id) => {
|
||||||
return {
|
return {
|
||||||
name: 'InvoiceInList',
|
name: 'InvoiceInList',
|
||||||
query: {
|
query: {
|
||||||
|
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
size="md"
|
size="md"
|
||||||
icon="vn:ticket"
|
icon="vn:invoice-in"
|
||||||
color="primary"
|
color="primary"
|
||||||
:to="routes.getTickets(entity.supplierFk)"
|
:to="routes.getInvoices(entity.supplierFk)"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('globals.ticketList') }}</QTooltip>
|
<QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="
|
v-if="
|
||||||
|
|
|
@ -15,6 +15,7 @@ invoiceIn:
|
||||||
amount: Amount
|
amount: Amount
|
||||||
descriptor:
|
descriptor:
|
||||||
ticketList: Ticket list
|
ticketList: Ticket list
|
||||||
|
invoices: Supplier invoices
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
book: Book
|
book: Book
|
||||||
unbook: Unbook
|
unbook: Unbook
|
||||||
|
|
|
@ -14,7 +14,7 @@ invoiceIn:
|
||||||
awb: AWB
|
awb: AWB
|
||||||
amount: Importe
|
amount: Importe
|
||||||
descriptor:
|
descriptor:
|
||||||
ticketList: Listado de tickets
|
invoices: Facturas de proveedor
|
||||||
descriptorMenu:
|
descriptorMenu:
|
||||||
book: Contabilizar
|
book: Contabilizar
|
||||||
unbook: Descontabilizar
|
unbook: Descontabilizar
|
||||||
|
|
|
@ -198,7 +198,7 @@ const getLocale = (label) => {
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
dense
|
dense
|
||||||
rounded
|
filled
|
||||||
:label="t('globals.params.packing')"
|
:label="t('globals.params.packing')"
|
||||||
v-model="params.packing"
|
v-model="params.packing"
|
||||||
url="ItemPackingTypes"
|
url="ItemPackingTypes"
|
||||||
|
|
|
@ -112,12 +112,9 @@ const filter = {
|
||||||
:label="t('Trailer Plate')"
|
:label="t('Trailer Plate')"
|
||||||
:value="dashIfEmpty(entity?.trailerPlate)"
|
:value="dashIfEmpty(entity?.trailerPlate)"
|
||||||
/>
|
/>
|
||||||
<VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
|
<VnLv :label="t('Phone')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<span>
|
|
||||||
{{ dashIfEmpty(entity?.phone) }}
|
|
||||||
<VnLinkPhone :phone-number="entity?.phone" />
|
<VnLinkPhone :phone-number="entity?.phone" />
|
||||||
</span>
|
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
|
|
@ -46,7 +46,6 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
isId: true,
|
isId: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
width: '25px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'workerFk',
|
name: 'workerFk',
|
||||||
|
@ -142,7 +141,6 @@ const columns = computed(() => [
|
||||||
label: 'm3',
|
label: 'm3',
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnClass: 'shrink',
|
columnClass: 'shrink',
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'started',
|
name: 'started',
|
||||||
|
@ -150,7 +148,6 @@ const columns = computed(() => [
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ started }) => toHour(started),
|
format: ({ started }) => toHour(started),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'finished',
|
name: 'finished',
|
||||||
|
@ -158,7 +155,6 @@ const columns = computed(() => [
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ finished }) => toHour(finished),
|
format: ({ finished }) => toHour(finished),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'right',
|
||||||
|
|
|
@ -46,7 +46,6 @@ const columns = computed(() => [
|
||||||
condition: () => true,
|
condition: () => true,
|
||||||
},
|
},
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
width: '25px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -57,7 +56,6 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
width: '100px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('globals.agency'),
|
label: t('globals.agency'),
|
||||||
|
@ -100,7 +98,6 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ started }) => toHour(started),
|
format: ({ started }) => toHour(started),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
@ -109,7 +106,6 @@ const columns = computed(() => [
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
format: ({ finished }) => toHour(finished),
|
format: ({ finished }) => toHour(finished),
|
||||||
width: '50px',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
|
|
@ -25,9 +25,7 @@ const { validate } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const canEditZone = useAcl().hasAny([
|
const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
|
||||||
{ model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
|
|
||||||
]);
|
|
||||||
|
|
||||||
const agencyFetchRef = ref();
|
const agencyFetchRef = ref();
|
||||||
const warehousesOptions = ref([]);
|
const warehousesOptions = ref([]);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, ref, computed, watch } from 'vue';
|
import { onMounted, ref, computed, watch, inject } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRouter, useRoute } from 'vue-router';
|
import { useRouter, useRoute } from 'vue-router';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||||
import TicketProblems from 'src/components/TicketProblems.vue';
|
import TicketProblems from 'src/components/TicketProblems.vue';
|
||||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
|
const app = inject('app');
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -196,13 +196,17 @@ const changeQuantity = async (sale) => {
|
||||||
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
||||||
return;
|
return;
|
||||||
else sale.originalQuantity = sale.quantity;
|
else sale.originalQuantity = sale.quantity;
|
||||||
if (!sale.id) return addSale(sale);
|
try {
|
||||||
|
if (!sale.id) await addSale(sale);
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (await isSalePrepared(sale)) {
|
if (await isSalePrepared(sale)) {
|
||||||
await confirmUpdate(() => updateQuantity(sale));
|
await confirmUpdate(() => updateQuantity(sale));
|
||||||
} else await updateQuantity(sale);
|
} else await updateQuantity(sale);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateQuantity = async (sale) => {
|
const updateQuantity = async (sale) => {
|
||||||
try {
|
try {
|
||||||
let { quantity, id } = sale;
|
let { quantity, id } = sale;
|
||||||
|
@ -215,7 +219,7 @@ const updateQuantity = async (sale) => {
|
||||||
(s) => s.id === sale.id,
|
(s) => s.id === sale.id,
|
||||||
);
|
);
|
||||||
sale.quantity = quantity;
|
sale.quantity = quantity;
|
||||||
throw e;
|
app.config.errorHandler(e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -224,7 +228,7 @@ const addSale = async (sale) => {
|
||||||
barcode: sale.itemFk,
|
barcode: sale.itemFk,
|
||||||
quantity: sale.quantity,
|
quantity: sale.quantity,
|
||||||
};
|
};
|
||||||
|
try {
|
||||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||||
|
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
|
@ -242,6 +246,9 @@ const addSale = async (sale) => {
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
sale.isNew = false;
|
sale.isNew = false;
|
||||||
resetChanges();
|
resetChanges();
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
const changeConcept = async (sale) => {
|
const changeConcept = async (sale) => {
|
||||||
if (await isSalePrepared(sale)) {
|
if (await isSalePrepared(sale)) {
|
||||||
|
@ -250,10 +257,14 @@ const changeConcept = async (sale) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateConcept = async (sale) => {
|
const updateConcept = async (sale) => {
|
||||||
|
try {
|
||||||
const data = { newConcept: sale.concept };
|
const data = { newConcept: sale.concept };
|
||||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const DEFAULT_EDIT = {
|
const DEFAULT_EDIT = {
|
||||||
|
@ -264,18 +275,6 @@ const DEFAULT_EDIT = {
|
||||||
oldQuantity: null,
|
oldQuantity: null,
|
||||||
};
|
};
|
||||||
const edit = ref({ ...DEFAULT_EDIT });
|
const edit = ref({ ...DEFAULT_EDIT });
|
||||||
const usesMana = ref(null);
|
|
||||||
|
|
||||||
const getUsesMana = async () => {
|
|
||||||
const { data } = await axios.get('Sales/usesMana');
|
|
||||||
usesMana.value = data;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getMana = async () => {
|
|
||||||
const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
|
|
||||||
mana.value = data;
|
|
||||||
await getUsesMana();
|
|
||||||
};
|
|
||||||
|
|
||||||
const selectedValidSales = computed(() => {
|
const selectedValidSales = computed(() => {
|
||||||
if (!sales.value) return;
|
if (!sales.value) return;
|
||||||
|
@ -312,11 +311,15 @@ const changePrice = async (sale) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const updatePrice = async (sale, newPrice) => {
|
const updatePrice = async (sale, newPrice) => {
|
||||||
|
try {
|
||||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||||
sale.price = newPrice;
|
sale.price = newPrice;
|
||||||
edit.value = { ...DEFAULT_EDIT };
|
edit.value = { ...DEFAULT_EDIT };
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeDiscount = async (sale) => {
|
const changeDiscount = async (sale) => {
|
||||||
|
@ -339,6 +342,7 @@ const updateDiscounts = async (sales, newDiscount) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateDiscount = async (sales, newDiscount = 0) => {
|
const updateDiscount = async (sales, newDiscount = 0) => {
|
||||||
|
try {
|
||||||
const salesIds = sales.map(({ id }) => id);
|
const salesIds = sales.map(({ id }) => id);
|
||||||
const params = {
|
const params = {
|
||||||
salesIds,
|
salesIds,
|
||||||
|
@ -348,6 +352,10 @@ const updateDiscount = async (sales, newDiscount = 0) => {
|
||||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const getNewPrice = computed(() => {
|
const getNewPrice = computed(() => {
|
||||||
|
@ -369,11 +377,15 @@ const getNewPrice = computed(() => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const newOrderFromTicket = async () => {
|
const newOrderFromTicket = async () => {
|
||||||
|
try {
|
||||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||||
ticketFk: Number(route.params.id),
|
ticketFk: Number(route.params.id),
|
||||||
});
|
});
|
||||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||||
window.open(routeData.href, '_blank');
|
window.open(routeData.href, '_blank');
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const goToLog = (saleId) => {
|
const goToLog = (saleId) => {
|
||||||
|
@ -390,11 +402,15 @@ const goToLog = (saleId) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeTicketState = async (val) => {
|
const changeTicketState = async (val) => {
|
||||||
|
try {
|
||||||
stateBtnDropdownRef.value.hide();
|
stateBtnDropdownRef.value.hide();
|
||||||
const params = { ticketFk: route.params.id, code: val };
|
const params = { ticketFk: route.params.id, code: val };
|
||||||
await axios.post('Tickets/state', params);
|
await axios.post('Tickets/state', params);
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const removeSelectedSales = () => {
|
const removeSelectedSales = () => {
|
||||||
|
@ -414,10 +430,14 @@ const removeSales = async () => {
|
||||||
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
||||||
|
|
||||||
if (params.sales.length == 0) return;
|
if (params.sales.length == 0) return;
|
||||||
|
try {
|
||||||
await axios.post('Sales/deleteSales', params);
|
await axios.post('Sales/deleteSales', params);
|
||||||
removeSelectedSales();
|
removeSelectedSales();
|
||||||
notify('globals.dataSaved', 'positive');
|
notify('globals.dataSaved', 'positive');
|
||||||
resetChanges();
|
resetChanges();
|
||||||
|
} catch (e) {
|
||||||
|
app.config.errorHandler(e);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const setTransferParams = async () => {
|
const setTransferParams = async () => {
|
||||||
|
|
|
@ -55,9 +55,7 @@ const isClaimable = computed(() => {
|
||||||
if (ticket.value) {
|
if (ticket.value) {
|
||||||
const landedPlusWeek = new Date(ticket.value.landed);
|
const landedPlusWeek = new Date(ticket.value.landed);
|
||||||
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
||||||
const createAfterDeadline = acl.hasAny([
|
const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
|
||||||
{ model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
|
|
||||||
]);
|
|
||||||
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
|
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -113,7 +113,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'shipped',
|
name: 'shippedDate',
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
label: t('ticketList.shipped'),
|
label: t('ticketList.shipped'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
|
@ -123,7 +123,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'shipped',
|
name: 'shippedHour',
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnFilter: false,
|
columnFilter: false,
|
||||||
label: t('ticketList.hour'),
|
label: t('ticketList.hour'),
|
||||||
|
|
|
@ -205,6 +205,7 @@ ticketList:
|
||||||
toLines: Go to lines
|
toLines: Go to lines
|
||||||
addressNickname: Address nickname
|
addressNickname: Address nickname
|
||||||
ref: Reference
|
ref: Reference
|
||||||
|
hour: Hour
|
||||||
rounding: Rounding
|
rounding: Rounding
|
||||||
noVerifiedData: No verified data
|
noVerifiedData: No verified data
|
||||||
purchaseRequest: Purchase request
|
purchaseRequest: Purchase request
|
||||||
|
|
|
@ -37,7 +37,7 @@ const cloneTravelWithEntries = async () => {
|
||||||
router.push({ name: 'TravelBasicData', params: { id: data.id } });
|
router.push({ name: 'TravelBasicData', params: { id: data.id } });
|
||||||
};
|
};
|
||||||
|
|
||||||
const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
|
const canDelete = computed(() => useAcl().hasAcl('Travel', '*', 'WRITE'));
|
||||||
|
|
||||||
const openDeleteEntryDialog = (id) => {
|
const openDeleteEntryDialog = (id) => {
|
||||||
quasar
|
quasar
|
||||||
|
|
|
@ -505,7 +505,6 @@ watch(route, () => {
|
||||||
:props="props"
|
:props="props"
|
||||||
@click="stopEventPropagation($event, col)"
|
@click="stopEventPropagation($event, col)"
|
||||||
:style="col.style"
|
:style="col.style"
|
||||||
style="padding-left: 5px"
|
|
||||||
>
|
>
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[col.name].component"
|
:is="tableColumnComponents[col.name].component"
|
||||||
|
@ -581,19 +580,20 @@ watch(route, () => {
|
||||||
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
||||||
<EntryDescriptorProxy :id="entry.id" />
|
<EntryDescriptorProxy :id="entry.id" />
|
||||||
</QTd>
|
</QTd>
|
||||||
<QTd>
|
<QTd :colspan="2">
|
||||||
<QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
|
<div style="display: flex">
|
||||||
|
<span class="link">
|
||||||
|
{{ entry.supplierName }}
|
||||||
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
||||||
</QTd>
|
</span>
|
||||||
<QTd class="text-center">
|
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="entry.isCustomInspectionRequired"
|
v-if="entry.isCustomInspectionRequired"
|
||||||
name="warning"
|
name="warning"
|
||||||
color="negative"
|
color="negative"
|
||||||
size="md"
|
size="md"
|
||||||
:title="t('extraCommunity.requiresInspection')"
|
:title="t('extraCommunity.requiresInspection')"
|
||||||
>
|
/>
|
||||||
</QIcon>
|
</div>
|
||||||
</QTd>
|
</QTd>
|
||||||
<QTd class="text-right">
|
<QTd class="text-right">
|
||||||
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
|
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
|
||||||
|
@ -639,9 +639,7 @@ watch(route, () => {
|
||||||
&:nth-child(1) {
|
&:nth-child(1) {
|
||||||
max-width: 65px;
|
max-width: 65px;
|
||||||
}
|
}
|
||||||
&:nth-child(4) {
|
padding: 0 5px 0;
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
thead > tr > th {
|
thead > tr > th {
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
|
|
|
@ -18,9 +18,7 @@ const router = useRouter();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const acl = useAcl();
|
const acl = useAcl();
|
||||||
const canSeeNotes = computed(() =>
|
const canSeeNotes = computed(() => acl.hasAcl('Worker', '__get__business', 'READ'));
|
||||||
acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
|
|
||||||
);
|
|
||||||
const workerIsFreelance = ref();
|
const workerIsFreelance = ref();
|
||||||
const WorkerFreelanceRef = ref();
|
const WorkerFreelanceRef = ref();
|
||||||
const workerCalendarFilterRef = ref(null);
|
const workerCalendarFilterRef = ref(null);
|
||||||
|
|
|
@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
|
||||||
<template #body="{ entity }">
|
<template #body="{ entity }">
|
||||||
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
|
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
|
||||||
<VnLv
|
<VnLv
|
||||||
class="ellipsis-text"
|
class="ellipsis"
|
||||||
:label="t('globals.params.email')"
|
:label="t('globals.params.email')"
|
||||||
:value="entity.user?.emailUser?.email"
|
:value="entity.user?.emailUser?.email"
|
||||||
copy
|
copy
|
||||||
|
@ -128,15 +128,13 @@ const handlePhotoUpdated = (evt = false) => {
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
|
|
||||||
<VnLv :value="entity.phone">
|
<VnLv :label="t('globals.phone')">
|
||||||
<template #label>
|
<template #value>
|
||||||
{{ t('globals.phone') }}
|
|
||||||
<VnLinkPhone :phone-number="entity.phone" />
|
<VnLinkPhone :phone-number="entity.phone" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :value="entity?.sip?.extension">
|
<VnLv :label="t('worker.summary.sipExtension')">
|
||||||
<template #label>
|
<template #value>
|
||||||
{{ t('worker.summary.sipExtension') }}
|
|
||||||
<VnLinkPhone :phone-number="entity?.sip?.extension" />
|
<VnLinkPhone :phone-number="entity?.sip?.extension" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
|
|
|
@ -9,7 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
|
||||||
const { hasAny } = useAcl();
|
const { hasAcl } = useAcl();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const fetchData = ref();
|
const fetchData = ref();
|
||||||
const originaLockerId = ref();
|
const originaLockerId = ref();
|
||||||
|
@ -58,11 +58,7 @@ const init = async (data) => {
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
hide-selected
|
hide-selected
|
||||||
:readonly="
|
:readonly="!hasAcl('Worker', '__get__locker', 'READ')"
|
||||||
!hasAny([
|
|
||||||
{ model: 'Worker', props: '__get__locker', accessType: 'READ' },
|
|
||||||
])
|
|
||||||
"
|
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -73,28 +73,25 @@ onBeforeMount(async () => {
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :value="worker.mobileExtension">
|
<VnLv :label="t('worker.summary.phoneExtension')">
|
||||||
<template #label>
|
<template #value>
|
||||||
{{ t('worker.summary.phoneExtension') }}
|
|
||||||
<VnLinkPhone :phone-number="worker.mobileExtension" />
|
<VnLinkPhone :phone-number="worker.mobileExtension" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :value="worker.phone">
|
<VnLv :label="t('worker.summary.entPhone')">
|
||||||
<template #label>
|
<template #value>
|
||||||
{{ t('worker.summary.entPhone') }}
|
|
||||||
<VnLinkPhone :phone-number="worker.phone" />
|
<VnLinkPhone :phone-number="worker.phone" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :value="advancedSummary?.client?.phone">
|
<VnLv :label="t('worker.summary.personalPhone')">
|
||||||
<template #label>
|
<template #value>
|
||||||
{{ t('worker.summary.personalPhone') }}
|
|
||||||
<VnLinkPhone
|
<VnLinkPhone
|
||||||
:phone-number="advancedSummary?.client?.phone"
|
:phone-number="advancedSummary?.client?.phone"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
</div>
|
</div>
|
||||||
<div class="vn-card-content">
|
<div class="vn-card-content" v-if="advancedSummary">
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('worker.summary.fiDueDate')"
|
:label="t('worker.summary.fiDueDate')"
|
||||||
:value="toDate(advancedSummary.fiDueDate)"
|
:value="toDate(advancedSummary.fiDueDate)"
|
||||||
|
@ -135,6 +132,7 @@ onBeforeMount(async () => {
|
||||||
<VnTitle :text="t('worker.summary.userData')" />
|
<VnTitle :text="t('worker.summary.userData')" />
|
||||||
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
|
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
|
||||||
<VnLv
|
<VnLv
|
||||||
|
class="ellipsis"
|
||||||
:label="t('globals.params.email')"
|
:label="t('globals.params.email')"
|
||||||
:value="worker.user?.emailUser?.email"
|
:value="worker.user?.emailUser?.email"
|
||||||
copy
|
copy
|
||||||
|
@ -147,9 +145,8 @@ onBeforeMount(async () => {
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :value="worker?.sip?.extension">
|
<VnLv :label="t('worker.summary.sipExtension')">
|
||||||
<template #label>
|
<template #value>
|
||||||
{{ t('worker.summary.sipExtension') }}
|
|
||||||
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
|
|
|
@ -68,13 +68,9 @@ const arrayData = useArrayData('Worker');
|
||||||
const acl = useAcl();
|
const acl = useAcl();
|
||||||
const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
|
const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
|
||||||
const worker = computed(() => arrayData.store?.data);
|
const worker = computed(() => arrayData.store?.data);
|
||||||
const canSend = computed(() =>
|
const canSend = computed(() => acl.hasAcl('WorkerTimeControl', 'sendMail', 'WRITE'));
|
||||||
acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }]),
|
|
||||||
);
|
|
||||||
const canUpdate = computed(() =>
|
const canUpdate = computed(() =>
|
||||||
acl.hasAny([
|
acl.hasAcl('WorkerTimeControl', 'updateMailState', 'WRITE'),
|
||||||
{ model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
|
|
||||||
]),
|
|
||||||
);
|
);
|
||||||
const isHimself = computed(() => user.value.id === Number(route.params.id));
|
const isHimself = computed(() => user.value.id === Number(route.params.id));
|
||||||
|
|
||||||
|
|
|
@ -75,13 +75,13 @@ onMounted(async () => {
|
||||||
<template #body="{ entity: zone }">
|
<template #body="{ entity: zone }">
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-one">
|
||||||
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
|
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
|
||||||
<div class="card-group">
|
<div class="vn-card-group">
|
||||||
<div class="card-content">
|
<div class="vn-card-content">
|
||||||
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
|
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
|
||||||
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
|
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
|
||||||
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
|
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
|
||||||
</div>
|
</div>
|
||||||
<div class="card-content">
|
<div class="vn-card-content">
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('summary.closeHour')"
|
:label="t('summary.closeHour')"
|
||||||
:value="toTimeFormat(zone.hour)"
|
:value="toTimeFormat(zone.hour)"
|
||||||
|
@ -98,7 +98,7 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-max">
|
||||||
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
|
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
@ -109,15 +109,3 @@ onMounted(async () => {
|
||||||
</template>
|
</template>
|
||||||
</CardSummary>
|
</CardSummary>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.card-group {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.card-content {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
find 'test/cypress/integration' \
|
|
||||||
-mindepth 1 \
|
|
||||||
-maxdepth 1 \
|
|
||||||
-type d | \
|
|
||||||
xargs -P "$1" -I {} sh -c '
|
|
||||||
echo "🔷 {}" &&
|
|
||||||
xvfb-run -a cypress run \
|
|
||||||
--headless \
|
|
||||||
--spec "{}" \
|
|
||||||
--quiet \
|
|
||||||
> /dev/null
|
|
||||||
'
|
|
||||||
wait
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo $2
|
||||||
|
if [ -z "$2" ]; then
|
||||||
|
TEST_DIRS=$(find 'test/cypress/integration' -mindepth 1 -maxdepth 1 -type d)
|
||||||
|
else
|
||||||
|
TEST_DIRS=$2
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo $TEST_DIRS x$1
|
||||||
|
|
||||||
|
echo "$TEST_DIRS" | xargs -P "$1" -I {} sh -c '
|
||||||
|
echo "🔷 {}" &&
|
||||||
|
xvfb-run -a cypress run \
|
||||||
|
--headless \
|
||||||
|
--spec "{}" \
|
||||||
|
--quiet \
|
||||||
|
> /dev/null
|
||||||
|
'
|
||||||
|
wait
|
|
@ -0,0 +1,52 @@
|
||||||
|
import fs from 'fs';
|
||||||
|
import { parse } from 'es-module-lexer';
|
||||||
|
import { parse as vueParse } from '@vue/compiler-sfc';
|
||||||
|
import glob from 'fast-glob';
|
||||||
|
import { resolveImportPath, toRelative } from './resolve-import-path.js';
|
||||||
|
|
||||||
|
const ROUTER_MODULES = 'src/router/modules/';
|
||||||
|
const files = await glob(['src/**/*.{vue,js,ts}'], { absolute: true });
|
||||||
|
const vueFiles = new Map();
|
||||||
|
|
||||||
|
export async function findImports(targetFile, visited = new Set(), identation = '') {
|
||||||
|
if (visited.has(targetFile)) return []; // Avoid infinite loops
|
||||||
|
visited.add(targetFile);
|
||||||
|
|
||||||
|
const usageFiles = files
|
||||||
|
.filter((file) => {
|
||||||
|
let content = fs.readFileSync(file, 'utf8');
|
||||||
|
if (file.endsWith('.vue')) {
|
||||||
|
if (vueFiles.has(file)) {
|
||||||
|
content = vueFiles.get(file);
|
||||||
|
} else {
|
||||||
|
const { descriptor } = vueParse(content);
|
||||||
|
content = descriptor?.scriptSetup?.content ?? '';
|
||||||
|
vueFiles.set(file, content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!content.trim()) return false;
|
||||||
|
|
||||||
|
return parse(content)[0].some((imp) => {
|
||||||
|
if (!imp?.n) return false;
|
||||||
|
return resolveImportPath(imp.n, targetFile) === targetFile;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.map((file) => toRelative(file));
|
||||||
|
|
||||||
|
let fullTree = [...usageFiles];
|
||||||
|
for (const file of usageFiles) {
|
||||||
|
if (file.startsWith(ROUTER_MODULES)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
fullTree = [
|
||||||
|
...fullTree,
|
||||||
|
...(await findImports(file, visited, identation + ' ')),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return getUniques(fullTree); // Remove duplicates
|
||||||
|
}
|
||||||
|
|
||||||
|
function getUniques(array) {
|
||||||
|
return Array.from(new Set(array));
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
import { execSync } from 'child_process';
|
||||||
|
import { findImports } from './find-imports.js';
|
||||||
|
import { getModules } from './get-modules.js';
|
||||||
|
const E2E_PATH = 'test/cypress/integration';
|
||||||
|
const FINDED_PATHS = ['src', E2E_PATH];
|
||||||
|
|
||||||
|
function getGitDiff(options) {
|
||||||
|
const TARGET_BRANCH = options[2] || 'dev';
|
||||||
|
const diff = execSync(`git diff --name-only origin/${TARGET_BRANCH}`, {
|
||||||
|
encoding: 'utf-8',
|
||||||
|
});
|
||||||
|
return diff.split('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getChangedModules() {
|
||||||
|
let changedModules = new Set();
|
||||||
|
const changes = getGitDiff(process.argv);
|
||||||
|
for (const change of changes) {
|
||||||
|
if (!change) continue;
|
||||||
|
if (!FINDED_PATHS.some((prefix) => change.startsWith(prefix))) return '';
|
||||||
|
const changedArray = [
|
||||||
|
...changedModules,
|
||||||
|
...new Set(getModules(await findImports(change))),
|
||||||
|
];
|
||||||
|
if (change.startsWith(E2E_PATH)) changedArray.push(change);
|
||||||
|
changedModules = new Set(changedArray);
|
||||||
|
}
|
||||||
|
return [...changedModules].join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
getChangedModules()
|
||||||
|
.then((modules) => console.log(modules)) // is return
|
||||||
|
.catch((e) => {
|
||||||
|
console.error(e);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
|
@ -0,0 +1,13 @@
|
||||||
|
export function getModules(files) {
|
||||||
|
const CYPRESS_PREFIX = 'test/cypress/integration/';
|
||||||
|
const CYPRESS_SUFIX = '/**/*.spec.js';
|
||||||
|
const modules = [];
|
||||||
|
for (const file of files) {
|
||||||
|
if (file.startsWith('src/page')) {
|
||||||
|
modules.push(
|
||||||
|
CYPRESS_PREFIX + file.split('/')[2].toLowerCase() + CYPRESS_SUFIX,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return modules;
|
||||||
|
}
|
|
@ -0,0 +1,34 @@
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
const rootDir = process.cwd();
|
||||||
|
const config = JSON.parse(fs.readFileSync('jsconfig.json', 'utf-8'));
|
||||||
|
const { paths, baseUrl } = config.compilerOptions;
|
||||||
|
|
||||||
|
function resolveImportPath(importPath, fileBase) {
|
||||||
|
if (!importPath) return null;
|
||||||
|
importPath = jsConfigPaths(importPath);
|
||||||
|
const fileDir = path.dirname(fileBase);
|
||||||
|
if (importPath.startsWith('.') || importPath.startsWith('/')) {
|
||||||
|
return path.relative(rootDir, path.resolve(fileDir, importPath));
|
||||||
|
}
|
||||||
|
|
||||||
|
return importPath;
|
||||||
|
}
|
||||||
|
function toRelative(file) {
|
||||||
|
return path.relative(rootDir, file);
|
||||||
|
}
|
||||||
|
|
||||||
|
function jsConfigPaths(importPath) {
|
||||||
|
for (const [aliasPattern, [target]] of Object.entries(paths)) {
|
||||||
|
const alias = aliasPattern.replace('/*', '');
|
||||||
|
const targetBase = target.replace('/*', '');
|
||||||
|
|
||||||
|
if (importPath.startsWith(alias)) {
|
||||||
|
const rest = importPath.slice(alias.length);
|
||||||
|
return path.resolve(baseUrl, targetBase + rest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return importPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
export { resolveImportPath, toRelative };
|
|
@ -35,6 +35,8 @@ docker build -f ./docs/Dockerfile.dev -t lilium-dev .
|
||||||
# END IMAGES
|
# END IMAGES
|
||||||
|
|
||||||
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d
|
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d
|
||||||
|
files=$(node test/cypress/docker/find/find.js)
|
||||||
|
echo $files
|
||||||
|
|
||||||
docker run -it --rm \
|
docker run -it --rm \
|
||||||
-v "$(pwd)":/app \
|
-v "$(pwd)":/app \
|
||||||
|
@ -42,6 +44,6 @@ docker run -it --rm \
|
||||||
-e CI \
|
-e CI \
|
||||||
-e TZ \
|
-e TZ \
|
||||||
lilium-dev \
|
lilium-dev \
|
||||||
bash -c 'sh test/cypress/cypressParallel.sh 2'
|
bash -c "sh test/cypress/docker/cypressParallel.sh 2 '$files'"
|
||||||
|
|
||||||
cleanup
|
cleanup
|
|
@ -13,7 +13,7 @@ describe('InvoiceInDescriptor', () => {
|
||||||
cy.validateCheckbox(checkbox, false);
|
cy.validateCheckbox(checkbox, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it.skip('should delete the invoice properly', () => {
|
it('should delete the invoice properly', () => {
|
||||||
cy.visit('/#/invoice-in/2/summary');
|
cy.visit('/#/invoice-in/2/summary');
|
||||||
cy.selectDescriptorOption(2);
|
cy.selectDescriptorOption(2);
|
||||||
cy.clickConfirm();
|
cy.clickConfirm();
|
||||||
|
@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => {
|
||||||
cy.visit('/#/invoice-in/6/summary');
|
cy.visit('/#/invoice-in/6/summary');
|
||||||
cy.selectDescriptorOption(5);
|
cy.selectDescriptorOption(5);
|
||||||
|
|
||||||
cy.dataCy('SendEmailNotifiactionDialogInput_input').type(
|
cy.dataCy('SendEmailNotificationDialogInput_input').type(
|
||||||
'{selectall}jorgito@gmail.mx',
|
'{selectall}jorgito@gmail.mx',
|
||||||
);
|
);
|
||||||
cy.clickConfirm();
|
cy.clickConfirm();
|
||||||
|
|
|
@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should transfer the invoice ', () => {
|
it.skip('should transfer the invoice ', () => {
|
||||||
cy.typeSearchbar('T1111111{enter}');
|
cy.typeSearchbar('T1111111{enter}');
|
||||||
cy.dataCy('descriptor-more-opts').click();
|
cy.dataCy('descriptor-more-opts').click();
|
||||||
cy.get(selectMenuOption(1)).click();
|
cy.get(selectMenuOption(1)).click();
|
||||||
|
@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => {
|
||||||
cy.dataCy('descriptor-more-opts').click();
|
cy.dataCy('descriptor-more-opts').click();
|
||||||
cy.get(selectMenuOption(3)).click();
|
cy.get(selectMenuOption(3)).click();
|
||||||
cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
|
cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
|
||||||
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
|
cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
|
||||||
cy.get(confirmSend).click();
|
cy.get(confirmSend).click();
|
||||||
cy.checkNotification('Notification sent');
|
cy.checkNotification('Notification sent');
|
||||||
});
|
});
|
||||||
|
@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => {
|
||||||
cy.dataCy('descriptor-more-opts').click();
|
cy.dataCy('descriptor-more-opts').click();
|
||||||
cy.get(selectMenuOption(3)).click();
|
cy.get(selectMenuOption(3)).click();
|
||||||
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
|
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
|
||||||
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
|
cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
|
||||||
cy.get(confirmSend).click();
|
cy.get(confirmSend).click();
|
||||||
cy.checkNotification('Notification sent');
|
cy.checkNotification('Notification sent');
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
|
// https://redmine.verdnatura.es/issues/8848
|
||||||
describe('VnShortcuts', () => {
|
describe.skip('VnShortcuts', () => {
|
||||||
const modules = {
|
const modules = {
|
||||||
item: 'a',
|
item: 'a',
|
||||||
customer: 'c',
|
customer: 'c',
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
describe('WorkerList', () => {
|
// https://redmine.verdnatura.es/issues/8848
|
||||||
|
describe.skip('WorkerList', () => {
|
||||||
const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
|
const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
|
||||||
const searchBtn = '.q-drawer button:nth-child(3)';
|
const searchBtn = '.q-drawer button:nth-child(3)';
|
||||||
const descriptorTitle = '.descriptor .title span';
|
const descriptorTitle = '.descriptor .title span';
|
||||||
|
@ -13,7 +14,7 @@ describe('WorkerList', () => {
|
||||||
cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
|
cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
|
||||||
cy.get(searchBtn).click();
|
cy.get(searchBtn).click();
|
||||||
cy.wait('@worker').then(() =>
|
cy.wait('@worker').then(() =>
|
||||||
cy.get(descriptorTitle).should('include.text', 'Jessica')
|
cy.get(descriptorTitle).should('include.text', 'Jessica'),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -5,8 +5,7 @@ import jsconfigPaths from 'vite-jsconfig-paths';
|
||||||
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
|
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
|
||||||
let reporters,
|
let reporters, outputFile;
|
||||||
outputFile;
|
|
||||||
|
|
||||||
if (process.env.CI) {
|
if (process.env.CI) {
|
||||||
reporters = ['junit', 'default'];
|
reporters = ['junit', 'default'];
|
||||||
|
@ -28,6 +27,9 @@ export default defineConfig({
|
||||||
'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
|
'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
server: {
|
||||||
|
hmr: { overlay: false },
|
||||||
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
vue({
|
vue({
|
||||||
template: {
|
template: {
|
||||||
|
@ -39,8 +41,11 @@ export default defineConfig({
|
||||||
sassVariables: 'src/quasar-variables.scss',
|
sassVariables: 'src/quasar-variables.scss',
|
||||||
}),
|
}),
|
||||||
VueI18nPlugin({
|
VueI18nPlugin({
|
||||||
|
strictMessage: false,
|
||||||
|
|
||||||
|
runtimeOnly: false,
|
||||||
include: [
|
include: [
|
||||||
path.resolve(__dirname, 'src/i18n/**'),
|
path.resolve(__dirname, 'src/i18n/locale/**'),
|
||||||
path.resolve(__dirname, 'src/pages/**/locale/**'),
|
path.resolve(__dirname, 'src/pages/**/locale/**'),
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
|
|
Loading…
Reference in New Issue