Compare commits
9 Commits
| Author | SHA1 | Date |
|---|---|---|
 Javi Gallego
|
804d832563 | |
|
Javi Gallego
|
2afbfcc500 | |
|
Javi Gallego
|
c801573245 | |
|
Javi Gallego
|
b28835b126 | |
|
Javi Gallego
|
d790907e79 | |
|
Javi Gallego
|
a317b3777a | |
 Javier Segarra
|
5f41aeb28d | |
|
Javier Segarra
|
acd253da9b | |
|
Javi Gallego
|
7865d5742b |
|
|
@ -0,0 +1,6 @@
|
|||
/dist
|
||||
/src-capacitor
|
||||
/src-cordova
|
||||
/.quasar
|
||||
/node_modules
|
||||
.eslintrc.js
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
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',
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"extends": ["plugin:cypress/recommended"]
|
||||
}
|
||||
|
|
@ -125,10 +125,8 @@ pipeline {
|
|||
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
||||
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") {
|
||||
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
|
||||
sh 'sh test/cypress/cypressParallel.sh 1'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -185,4 +183,3 @@ pipeline {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
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",
|
||||
"version": "25.16.0",
|
||||
"version": "25.14.0",
|
||||
"description": "Salix frontend",
|
||||
"productName": "Salix",
|
||||
"author": "Verdnatura",
|
||||
|
|
@ -9,8 +9,7 @@
|
|||
"type": "module",
|
||||
"scripts": {
|
||||
"resetDatabase": "cd ../salix && gulp docker",
|
||||
"lint": "eslint \"**/*.{vue,js}\" ",
|
||||
"lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
|
||||
"lint": "eslint --ext .js,.vue ./",
|
||||
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
||||
"test:e2e": "cypress open",
|
||||
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
||||
|
|
@ -32,27 +31,22 @@
|
|||
"axios": "^1.4.0",
|
||||
"chromium": "^3.0.3",
|
||||
"croppie": "^2.6.5",
|
||||
"es-module-lexer": "^1.6.0",
|
||||
"fast-glob": "^3.3.3",
|
||||
"moment": "^2.30.1",
|
||||
"pinia": "^2.1.3",
|
||||
"quasar": "^2.17.7",
|
||||
"validator": "^13.9.0",
|
||||
"vue": "^3.5.13",
|
||||
"vue-i18n": "^9.4.0",
|
||||
"vue-i18n": "^9.3.0",
|
||||
"vue-router": "^4.2.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^19.2.1",
|
||||
"@commitlint/config-conventional": "^19.1.0",
|
||||
"@eslint/eslintrc": "^3.2.0",
|
||||
"@eslint/js": "^9.20.0",
|
||||
"@intlify/unplugin-vue-i18n": "^4.0.0",
|
||||
"@intlify/unplugin-vue-i18n": "^0.8.2",
|
||||
"@pinia/testing": "^0.1.2",
|
||||
"@quasar/app-vite": "^2.0.8",
|
||||
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
||||
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
||||
"@vue/compiler-sfc": "^3.5.13",
|
||||
"@vue/test-utils": "^2.4.4",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"cypress": "^14.1.0",
|
||||
|
|
@ -60,9 +54,7 @@
|
|||
"eslint": "^9.18.0",
|
||||
"eslint-config-prettier": "^10.0.1",
|
||||
"eslint-plugin-cypress": "^4.1.0",
|
||||
"eslint-plugin-import": "^2.31.0",
|
||||
"eslint-plugin-vue": "^9.32.0",
|
||||
"globals": "^16.0.0",
|
||||
"husky": "^8.0.0",
|
||||
"junit-merge": "^2.0.0",
|
||||
"mocha": "^11.1.0",
|
||||
|
|
|
|||
1065
pnpm-lock.yaml
1065
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
|
|||
build: {
|
||||
target: {
|
||||
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
||||
node: 'node20',
|
||||
node: 'node18',
|
||||
},
|
||||
|
||||
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
||||
|
|
@ -92,7 +92,6 @@ export default configure(function (/* ctx */) {
|
|||
vitePlugins: [
|
||||
[
|
||||
VueI18nPlugin({
|
||||
strictMessage: false,
|
||||
runtimeOnly: false,
|
||||
include: [
|
||||
path.resolve(__dirname, './src/i18n/locale/**'),
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* eslint-disable eslint/export */
|
||||
export * from './defaults/qTable';
|
||||
export * from './defaults/qInput';
|
||||
export * from './defaults/qSelect';
|
||||
|
|
|
|||
|
|
@ -17,6 +17,17 @@ defineProps({ row: { type: Object, required: true } });
|
|||
</QTooltip>
|
||||
</QIcon>
|
||||
</router-link>
|
||||
<QIcon
|
||||
v-if="row?.reserved"
|
||||
color="primary"
|
||||
name="vn:reserva"
|
||||
size="xs"
|
||||
data-cy="ticketSaleReservedIcon"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('ticketSale.reserved') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
<QIcon
|
||||
v-if="row?.isDeleted"
|
||||
color="primary"
|
||||
|
|
|
|||
|
|
@ -55,8 +55,6 @@ const $props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const label = $props.showLabel && $props.column.label ? $props.column.label : '';
|
||||
|
||||
const defaultSelect = {
|
||||
attrs: {
|
||||
row: $props.row,
|
||||
|
|
@ -64,7 +62,7 @@ const defaultSelect = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -76,7 +74,7 @@ const defaultComponents = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
number: {
|
||||
|
|
@ -86,7 +84,7 @@ const defaultComponents = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
date: {
|
||||
|
|
@ -98,7 +96,7 @@ const defaultComponents = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
time: {
|
||||
|
|
@ -107,7 +105,7 @@ const defaultComponents = {
|
|||
disable: !$props.isEditable,
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
checkbox: {
|
||||
|
|
@ -127,7 +125,7 @@ const defaultComponents = {
|
|||
return defaultAttrs;
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
autofocus: true,
|
||||
},
|
||||
events: {
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
|
|||
:style="textAlignToFlex(align)"
|
||||
>
|
||||
<span :title="label">{{ label }}</span>
|
||||
<div v-if="name && (model?.index || vertical)">
|
||||
<div v-if="name && model?.index">
|
||||
<QChip
|
||||
:label="!vertical ? model?.index : ''"
|
||||
:icon="
|
||||
|
|
@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
|
|||
:size="vertical ? '' : 'sm'"
|
||||
:class="[
|
||||
model?.index ? 'color-vn-text' : 'bg-transparent',
|
||||
vertical ? 'q-mx-none q-py-lg' : '',
|
||||
vertical ? 'q-px-none' : '',
|
||||
]"
|
||||
class="no-box-shadow"
|
||||
:clickable="true"
|
||||
style="min-width: 40px; max-height: 30px"
|
||||
>
|
||||
<div
|
||||
class="column justify-center text-center"
|
||||
class="column flex-center"
|
||||
v-if="vertical"
|
||||
:style="!model?.index && 'color: #5d5d5d'"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -26,12 +26,7 @@ function columnName(col) {
|
|||
}
|
||||
</script>
|
||||
<template>
|
||||
<VnFilterPanel
|
||||
v-bind="$attrs"
|
||||
:search-button="true"
|
||||
:disable-submit-event="true"
|
||||
:search-url
|
||||
>
|
||||
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
|
||||
<template #body="{ params, orders, searchFn }">
|
||||
<div
|
||||
class="container"
|
||||
|
|
@ -39,12 +34,6 @@ function columnName(col) {
|
|||
:key="col.id"
|
||||
>
|
||||
<div class="filter">
|
||||
<slot
|
||||
:name="`filter-${col.name}`"
|
||||
:params="params"
|
||||
:column-name="columnName(col)"
|
||||
:search-fn
|
||||
>
|
||||
<VnFilter
|
||||
ref="tableFilterRef"
|
||||
:column="col"
|
||||
|
|
@ -52,7 +41,6 @@ function columnName(col) {
|
|||
v-model="params[columnName(col)]"
|
||||
:search-url="searchUrl"
|
||||
/>
|
||||
</slot>
|
||||
</div>
|
||||
<div class="order">
|
||||
<VnTableOrder
|
||||
|
|
@ -89,13 +77,13 @@ function columnName(col) {
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 45px;
|
||||
height: 45px;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.filter {
|
||||
width: 70%;
|
||||
min-height: 40px;
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
}
|
||||
.order {
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
|||
v-model="address"
|
||||
is-outlined
|
||||
autofocus
|
||||
data-cy="SendEmailNotificationDialogInput"
|
||||
data-cy="SendEmailNotifiactionDialogInput"
|
||||
/>
|
||||
</QCardSection>
|
||||
<QCardActions align="right">
|
||||
|
|
|
|||
|
|
@ -1,14 +1,35 @@
|
|||
<script setup>
|
||||
import { nextTick, ref } from 'vue';
|
||||
import VnInput from './VnInput.vue';
|
||||
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
||||
|
||||
const $props = defineProps({
|
||||
insertable: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
|
||||
const model = defineModel({ prop: 'modelValue' });
|
||||
const inputRef = ref(false);
|
||||
|
||||
function setCursorPosition(pos) {
|
||||
const input = inputRef.value.vnInputRef.$el.querySelector('input');
|
||||
input.focus();
|
||||
input.setSelectionRange(pos, pos);
|
||||
}
|
||||
|
||||
async function handleUpdateModel(val) {
|
||||
model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
|
||||
await nextTick(() => setCursorPosition(0));
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<VnInput
|
||||
v-model="model"
|
||||
ref="inputRef"
|
||||
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
||||
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||
:insertable
|
||||
@update:model-value="handleUpdateModel"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { onBeforeMount, computed, markRaw } from 'vue';
|
||||
import { onBeforeMount, computed } from 'vue';
|
||||
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
|
|
@ -26,14 +26,18 @@ const route = useRoute();
|
|||
const stateStore = useStateStore();
|
||||
const router = useRouter();
|
||||
const entityId = computed(() => props.id || route?.params?.id);
|
||||
let arrayData = getArrayData(entityId.value, props.url);
|
||||
const arrayData = useArrayData(props.dataKey, {
|
||||
url: props.url,
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
|
||||
onBeforeRouteLeave(() => {
|
||||
stateStore.cardDescriptorChangeValue(null);
|
||||
});
|
||||
|
||||
onBeforeMount(async () => {
|
||||
stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
|
||||
stateStore.cardDescriptorChangeValue(props.descriptor);
|
||||
|
||||
const route = router.currentRoute.value;
|
||||
try {
|
||||
|
|
@ -57,31 +61,16 @@ onBeforeRouteUpdate(async (to, from) => {
|
|||
});
|
||||
|
||||
async function fetch(id, append = false) {
|
||||
const regex = /\/(\d+)/;
|
||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||
else {
|
||||
arrayData = getArrayData(id);
|
||||
}
|
||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
||||
await arrayData.fetch({ append, updateRouter: false });
|
||||
emit('onFetch', arrayData.store.data);
|
||||
}
|
||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||
return Object.values(params).includes(valueToCheck);
|
||||
}
|
||||
|
||||
function formatUrl(id) {
|
||||
const newId = id || entityId.value;
|
||||
const regex = /\/(\d+)/;
|
||||
if (!regex.test(props.url)) return `${props.url}/${newId}`;
|
||||
return props.url.replace(regex, `/${newId}`);
|
||||
}
|
||||
|
||||
function getArrayData(id, url) {
|
||||
return useArrayData(props.dataKey, {
|
||||
url: url ?? formatUrl(id),
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<template v-if="visual">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
|
||||
import { ref, onUnmounted, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import axios from 'axios';
|
||||
|
|
@ -11,11 +11,11 @@ import { useCapitalize } from 'src/composables/useCapitalize';
|
|||
import { useValidator } from 'src/composables/useValidator';
|
||||
import VnAvatar from '../ui/VnAvatar.vue';
|
||||
import VnLogValue from './VnLogValue.vue';
|
||||
import FetchData from '../FetchData.vue';
|
||||
import VnSelect from './VnSelect.vue';
|
||||
import VnUserLink from '../ui/VnUserLink.vue';
|
||||
import VnPaginate from '../ui/VnPaginate.vue';
|
||||
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||
import RightMenu from './RightMenu.vue';
|
||||
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||
|
||||
const stateStore = useStateStore();
|
||||
const validationsStore = useValidator();
|
||||
|
|
@ -72,8 +72,39 @@ const filter = {
|
|||
};
|
||||
|
||||
const paginate = ref();
|
||||
const dataKey = computed(() => `${props.model}Log`);
|
||||
const userParams = ref(useFilterParams(dataKey.value).params);
|
||||
const actions = ref();
|
||||
const changeInput = ref();
|
||||
const searchInput = ref();
|
||||
const userRadio = ref();
|
||||
const userSelect = ref();
|
||||
const dateFrom = ref();
|
||||
const dateFromDialog = ref(false);
|
||||
const dateTo = ref();
|
||||
const dateToDialog = ref(false);
|
||||
const selectedFilters = ref({});
|
||||
const userTypes = [
|
||||
{ label: 'All', value: undefined },
|
||||
{ label: 'User', value: { neq: null } },
|
||||
{ label: 'System', value: null },
|
||||
];
|
||||
const checkboxOptions = ref({
|
||||
insert: {
|
||||
label: 'Creates',
|
||||
selected: false,
|
||||
},
|
||||
update: {
|
||||
label: 'Edits',
|
||||
selected: false,
|
||||
},
|
||||
delete: {
|
||||
label: 'Deletes',
|
||||
selected: false,
|
||||
},
|
||||
select: {
|
||||
label: 'Accesses',
|
||||
selected: false,
|
||||
},
|
||||
});
|
||||
|
||||
let validations = models;
|
||||
let pointRecord = ref(null);
|
||||
|
|
@ -215,55 +246,131 @@ async function setLogTree(data) {
|
|||
function filterByRecord(modelLog) {
|
||||
byRecord.value = true;
|
||||
const { id, model } = modelLog;
|
||||
applyFilter({ changedModelId: id, changedModel: model });
|
||||
|
||||
searchInput.value = id;
|
||||
selectedFilters.value.changedModelId = id;
|
||||
selectedFilters.value.changedModel = model;
|
||||
applyFilter();
|
||||
}
|
||||
|
||||
async function applyFilter(params = {}) {
|
||||
paginate.value.arrayData.resetPagination();
|
||||
paginate.value.arrayData.applyFilter({
|
||||
filter: {},
|
||||
params: { originFk: route.params.id, ...params },
|
||||
});
|
||||
async function applyFilter() {
|
||||
filter.where = { and: [] };
|
||||
if (
|
||||
!selectedFilters.value.changedModel ||
|
||||
(!selectedFilters.value.changedModelValue &&
|
||||
!selectedFilters.value.changedModelId)
|
||||
)
|
||||
byRecord.value = false;
|
||||
|
||||
if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
|
||||
|
||||
if (Object.keys(selectedFilters.value).length) {
|
||||
filter.where.and.push(selectedFilters.value);
|
||||
}
|
||||
|
||||
function exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
case 'changedModelValue':
|
||||
return { [param]: { like: `%${value}%` } };
|
||||
case 'change':
|
||||
if (value)
|
||||
return {
|
||||
or: [
|
||||
{ oldJson: { like: `%${value}%` } },
|
||||
{ newJson: { like: `%${value}%` } },
|
||||
{ description: { like: `%${value}%` } },
|
||||
],
|
||||
};
|
||||
break;
|
||||
case 'action':
|
||||
if (value?.length) return { [param]: { inq: value } };
|
||||
break;
|
||||
paginate.value.fetch({ filter });
|
||||
}
|
||||
|
||||
function setDate(type) {
|
||||
let from = dateFrom.value
|
||||
? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
||||
: undefined;
|
||||
from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
|
||||
|
||||
let to = dateTo.value
|
||||
? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
||||
: date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
|
||||
to = date.adjustDate(
|
||||
to,
|
||||
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
|
||||
true,
|
||||
);
|
||||
|
||||
switch (type) {
|
||||
case 'from':
|
||||
return { creationDate: { gte: value } };
|
||||
case 'to':
|
||||
return { creationDate: { lte: value } };
|
||||
case 'userType':
|
||||
if (value === 'User') return { userFk: { neq: null } };
|
||||
if (value === 'System') return { userFk: null };
|
||||
break;
|
||||
default:
|
||||
return { [param]: value };
|
||||
return { between: [from, to] };
|
||||
case 'to': {
|
||||
if (dateFrom.value) {
|
||||
return {
|
||||
between: [from, to],
|
||||
};
|
||||
}
|
||||
return { lte: to };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function selectFilter(type, dateType) {
|
||||
const filter = {};
|
||||
const actions = { inq: [] };
|
||||
let reload = true;
|
||||
|
||||
if (type === 'search') {
|
||||
if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
|
||||
selectedFilters.value.changedModelId = searchInput.value.trim();
|
||||
} else if (!searchInput.value) {
|
||||
selectedFilters.value.changedModelId = undefined;
|
||||
selectedFilters.value.changedModelValue = undefined;
|
||||
} else {
|
||||
selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
|
||||
}
|
||||
}
|
||||
if (type === 'action' && selectedFilters.value.changedModel === null) {
|
||||
selectedFilters.value.changedModel = undefined;
|
||||
}
|
||||
if (type === 'userRadio') {
|
||||
selectedFilters.value.userFk = userRadio.value;
|
||||
}
|
||||
if (type === 'change') {
|
||||
if (changeInput.value)
|
||||
selectedFilters.value.or = [
|
||||
{ oldJson: { like: `%${changeInput.value}%` } },
|
||||
{ newJson: { like: `%${changeInput.value}%` } },
|
||||
{ description: { like: `%${changeInput.value}%` } },
|
||||
];
|
||||
else selectedFilters.value.or = undefined;
|
||||
}
|
||||
if (type === 'userSelect') {
|
||||
selectedFilters.value.userFk =
|
||||
userSelect.value !== null ? userSelect.value : undefined;
|
||||
}
|
||||
if (type === 'date') {
|
||||
if (!dateFrom.value && !dateTo.value) {
|
||||
selectedFilters.value.creationDate = undefined;
|
||||
} else if (dateType === 'to') {
|
||||
selectedFilters.value.creationDate = setDate('to');
|
||||
} else if (dateType === 'from') {
|
||||
selectedFilters.value.creationDate = setDate('from');
|
||||
}
|
||||
}
|
||||
|
||||
Object.keys(checkboxOptions.value).forEach((key) => {
|
||||
if (checkboxOptions.value[key].selected) actions.inq.push(key);
|
||||
});
|
||||
selectedFilters.value.action = actions.inq.length ? actions : undefined;
|
||||
|
||||
Object.keys(selectedFilters.value).forEach((key) => {
|
||||
if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
|
||||
});
|
||||
|
||||
if (reload) applyFilter(filter);
|
||||
}
|
||||
|
||||
async function clearFilter() {
|
||||
selectedFilters.value = {};
|
||||
byRecord.value = false;
|
||||
userSelect.value = undefined;
|
||||
searchInput.value = undefined;
|
||||
changeInput.value = undefined;
|
||||
dateFrom.value = undefined;
|
||||
dateTo.value = undefined;
|
||||
userRadio.value = undefined;
|
||||
Object.keys(checkboxOptions.value).forEach(
|
||||
(opt) => (checkboxOptions.value[opt].selected = false),
|
||||
);
|
||||
await applyFilter();
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
stateStore.rightDrawerChangeValue(true);
|
||||
});
|
||||
onUnmounted(() => {
|
||||
stateStore.rightDrawer = false;
|
||||
});
|
||||
|
|
@ -276,18 +383,32 @@ watch(
|
|||
);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
:url="`${props.model}Logs/${route.params.id}/models`"
|
||||
:filter="{ order: ['changedModel'] }"
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(actions = data.map((item) => {
|
||||
const changedModel = item.changedModel;
|
||||
return {
|
||||
locale: useCapitalize(
|
||||
validations[changedModel]?.locale?.name ?? changedModel,
|
||||
),
|
||||
value: changedModel,
|
||||
};
|
||||
}))
|
||||
"
|
||||
auto-load
|
||||
/>
|
||||
<VnPaginate
|
||||
ref="paginate"
|
||||
:data-key
|
||||
:url="dataKey + 's'"
|
||||
:data-key="`${model}Log`"
|
||||
:url="`${model}Logs`"
|
||||
:user-filter="filter"
|
||||
:skeleton="false"
|
||||
auto-load
|
||||
@on-fetch="setLogTree"
|
||||
@on-change="setLogTree"
|
||||
search-url="logs"
|
||||
:exprBuilder
|
||||
:order="['creationDate DESC', 'id DESC']"
|
||||
>
|
||||
<template #body>
|
||||
<div
|
||||
|
|
@ -346,7 +467,6 @@ watch(
|
|||
backgroundColor: useColor(modelLog.model),
|
||||
}"
|
||||
:title="`${modelLog.model} #${modelLog.id}`"
|
||||
data-cy="vnLog-model-chip"
|
||||
>
|
||||
{{ t(modelLog.modelI18n) }}
|
||||
</QChip>
|
||||
|
|
@ -460,7 +580,6 @@ watch(
|
|||
}`,
|
||||
)
|
||||
"
|
||||
data-cy="vnLog-action-icon"
|
||||
/>
|
||||
</div>
|
||||
</QItem>
|
||||
|
|
@ -578,12 +697,181 @@ watch(
|
|||
</VnPaginate>
|
||||
<RightMenu>
|
||||
<template #right-panel>
|
||||
<VnLogFilter :data-key />
|
||||
<QList dense>
|
||||
<QSeparator />
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
:label="t('globals.search')"
|
||||
v-model="searchInput"
|
||||
class="full-width"
|
||||
clearable
|
||||
filled
|
||||
clear-icon="close"
|
||||
@keyup.enter="() => selectFilter('search')"
|
||||
@focusout="() => selectFilter('search')"
|
||||
@clear="() => selectFilter('search')"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip>{{ t('tooltips.search') }}</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
</QInput>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<VnSelect
|
||||
class="full-width"
|
||||
:label="t('globals.entity')"
|
||||
v-model="selectedFilters.changedModel"
|
||||
option-label="locale"
|
||||
option-value="value"
|
||||
filled
|
||||
:options="actions"
|
||||
@update:model-value="selectFilter('action')"
|
||||
hide-selected
|
||||
/>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QOptionGroup
|
||||
size="sm"
|
||||
v-model="userRadio"
|
||||
:options="userTypes"
|
||||
color="primary"
|
||||
@update:model-value="selectFilter('userRadio')"
|
||||
right-label
|
||||
>
|
||||
<template #label="{ label }">
|
||||
{{ t(`Users.${label}`) }}
|
||||
</template>
|
||||
</QOptionGroup>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QItemSection v-if="userRadio !== null">
|
||||
<VnSelect
|
||||
class="full-width"
|
||||
:label="t('globals.user')"
|
||||
v-model="userSelect"
|
||||
filled
|
||||
:url="`${model}Logs/${route.params.id}/editors`"
|
||||
:fields="['id', 'nickname', 'name', 'image']"
|
||||
sort-by="nickname"
|
||||
@update:model-value="selectFilter('userSelect')"
|
||||
hide-selected
|
||||
>
|
||||
<template #option="{ opt, itemProps }">
|
||||
<QItem
|
||||
v-bind="itemProps"
|
||||
class="q-pa-xs row items-center"
|
||||
>
|
||||
<QItemSection class="col-3 items-center">
|
||||
<VnAvatar :worker-id="opt.id" />
|
||||
</QItemSection>
|
||||
<QItemSection class="col-9 justify-center">
|
||||
<span>{{ opt.name }}</span>
|
||||
<span class="text-grey">{{ opt.nickname }}</span>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
:label="t('globals.changes')"
|
||||
v-model="changeInput"
|
||||
class="full-width"
|
||||
filled
|
||||
clearable
|
||||
clear-icon="close"
|
||||
@keyup.enter="selectFilter('change')"
|
||||
@focusout="selectFilter('change')"
|
||||
@clear="selectFilter('change')"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip max-width="250px">{{
|
||||
t('tooltips.changes')
|
||||
}}</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
</QInput>
|
||||
</QItem>
|
||||
<QItem
|
||||
:class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
|
||||
v-for="(checkboxOption, index) in checkboxOptions"
|
||||
:key="index"
|
||||
>
|
||||
<QCheckbox
|
||||
size="sm"
|
||||
v-model="checkboxOption.selected"
|
||||
:label="t(`actions.${checkboxOption.label}`)"
|
||||
@update:model-value="selectFilter"
|
||||
/>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
class="full-width"
|
||||
:label="t('globals.date')"
|
||||
@click="dateFromDialog = true"
|
||||
@focus="(evt) => evt.target.blur()"
|
||||
@clear="selectFilter('date', 'to')"
|
||||
v-model="dateFrom"
|
||||
clearable
|
||||
filled
|
||||
clear-icon="close"
|
||||
/>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
class="full-width"
|
||||
:label="t('globals.to')"
|
||||
@click="dateToDialog = true"
|
||||
@focus="(evt) => evt.target.blur()"
|
||||
@clear="selectFilter('date', 'from')"
|
||||
v-model="dateTo"
|
||||
clearable
|
||||
filled
|
||||
clear-icon="close"
|
||||
/>
|
||||
</QItem>
|
||||
</QList>
|
||||
</template>
|
||||
</RightMenu>
|
||||
<QDialog v-model="dateFromDialog">
|
||||
<QDate
|
||||
:years-in-month-view="false"
|
||||
v-model="dateFrom"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
filled
|
||||
@update:model-value="
|
||||
(value) => {
|
||||
dateFromDialog = false;
|
||||
dateFrom = date.formatDate(value, 'DD-MM-YYYY');
|
||||
selectFilter('date', 'from');
|
||||
}
|
||||
"
|
||||
/>
|
||||
</QDialog>
|
||||
<QDialog v-model="dateToDialog">
|
||||
<QDate
|
||||
v-model="dateTo"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
@update:model-value="
|
||||
(value) => {
|
||||
dateToDialog = false;
|
||||
dateTo = date.formatDate(value, 'DD-MM-YYYY');
|
||||
selectFilter('date', 'to');
|
||||
}
|
||||
"
|
||||
/>
|
||||
</QDialog>
|
||||
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
||||
<QBtn
|
||||
v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
|
||||
v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
|
||||
color="primary"
|
||||
icon="filter_alt_off"
|
||||
size="md"
|
||||
|
|
|
|||
|
|
@ -1,249 +1,77 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import VnTableFilter from '../VnTable/VnTableFilter.vue';
|
||||
import VnSelect from './VnSelect.vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import VnInput from './VnInput.vue';
|
||||
import { ref, computed, watch } from 'vue';
|
||||
import VnInputDate from './VnInputDate.vue';
|
||||
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||
import FetchData from '../FetchData.vue';
|
||||
import { useValidator } from 'src/composables/useValidator';
|
||||
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||
import VnAvatar from '../ui/VnAvatar.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const validationsStore = useValidator();
|
||||
const { models } = validationsStore;
|
||||
const entities = ref([]);
|
||||
const editors = ref([]);
|
||||
const userParams = ref(useFilterParams($props.dataKey).params);
|
||||
let validations = models;
|
||||
const userTypes = [
|
||||
{ value: 'All', label: t(`Users.All`) },
|
||||
{ value: 'User', label: t(`Users.User`) },
|
||||
{ value: 'System', label: t(`Users.System`) },
|
||||
];
|
||||
const checkboxOptions = ref([
|
||||
{ name: 'insert', label: 'Creates', selected: false },
|
||||
{ name: 'update', label: 'Edits', selected: false },
|
||||
{ name: 'delete', label: 'Deletes', selected: false },
|
||||
{ name: 'select', label: 'Accesses', selected: false },
|
||||
]);
|
||||
const columns = computed(() => [
|
||||
{ name: 'changedModelValue' },
|
||||
{ name: 'changedModel' },
|
||||
{ name: 'userType', orderBy: false },
|
||||
{ name: 'userFk' },
|
||||
{ name: 'change', orderBy: false },
|
||||
{ name: 'action' },
|
||||
{ name: 'from', orderBy: 'creationDate' },
|
||||
{ name: 'to', orderBy: 'creationDate' },
|
||||
]);
|
||||
|
||||
const userParamsWatcher = watch(
|
||||
() => userParams.value,
|
||||
(params) => {
|
||||
if (params.action) {
|
||||
params.action.forEach((option) => {
|
||||
checkboxOptions.value.find((o) => o.name === option).selected = true;
|
||||
});
|
||||
userParamsWatcher();
|
||||
}
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
function getActions() {
|
||||
const actions = checkboxOptions.value
|
||||
.filter((option) => option.selected)
|
||||
?.map((o) => o.name);
|
||||
return actions.length ? actions : null;
|
||||
}
|
||||
const workers = ref();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
:url="`${dataKey}s/${route.params.id}/models`"
|
||||
:filter="{ order: ['changedModel'] }"
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(entities = data.map((item) => {
|
||||
const changedModel = item.changedModel;
|
||||
return {
|
||||
locale: useCapitalize(
|
||||
validations[changedModel]?.locale?.name ?? changedModel,
|
||||
),
|
||||
value: changedModel,
|
||||
};
|
||||
}))
|
||||
"
|
||||
url="Workers/activeWithInheritedRole"
|
||||
:filter="{ where: { role: 'salesPerson' } }"
|
||||
@on-fetch="(data) => (workers = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
:url="`${dataKey}s/${route.params.id}/editors`"
|
||||
:filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
|
||||
sort-by="nickname"
|
||||
@on-fetch="(data) => (editors = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnTableFilter
|
||||
v-if="dataKey"
|
||||
:data-key
|
||||
:columns="columns"
|
||||
:redirect="false"
|
||||
:hiddenTags="['originFk', 'creationDate']"
|
||||
search-url="logs"
|
||||
:showTagChips="false"
|
||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
||||
<span>{{ formatFn(tag.value) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<template #body="{ params, searchFn }">
|
||||
<QDate
|
||||
v-model="params.created"
|
||||
@update:model-value="searchFn()"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
>
|
||||
<template #filter-changedModelValue="{ params, columnName, searchFn }">
|
||||
<VnInput
|
||||
:label="t('globals.search')"
|
||||
v-model="params[columnName]"
|
||||
@keyup.enter="searchFn"
|
||||
@blur="searchFn"
|
||||
@remove="searchFn"
|
||||
:info="t('tooltips.search')"
|
||||
dense
|
||||
filled
|
||||
data-cy="vnLog-search"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-changedModel="{ params, columnName, searchFn }">
|
||||
<VnSelect
|
||||
:label="t('globals.entity')"
|
||||
v-model="params[columnName]"
|
||||
option-label="locale"
|
||||
option-value="value"
|
||||
:options="entities"
|
||||
@update:model-value="() => searchFn()"
|
||||
dense
|
||||
filled
|
||||
data-cy="vnLog-entity"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-userType="{ params, columnName, searchFn }">
|
||||
<QOptionGroup
|
||||
class="text-left"
|
||||
size="sm"
|
||||
v-model="params[columnName]"
|
||||
:options="userTypes"
|
||||
color="primary"
|
||||
@update:model-value="
|
||||
() => {
|
||||
params.userFk = null;
|
||||
searchFn();
|
||||
}
|
||||
"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-userFk="{ params, columnName, searchFn }">
|
||||
<VnSelect
|
||||
:label="t('globals.user')"
|
||||
v-model="params[columnName]"
|
||||
:options="editors"
|
||||
@update:modelValue="() => searchFn()"
|
||||
:disable="params.userType === 'System'"
|
||||
dense
|
||||
filled
|
||||
>
|
||||
<template #option="{ opt, itemProps }">
|
||||
<QItem v-bind="itemProps" class="q-pa-xs row items-center">
|
||||
<QItemSection class="col-3 items-center">
|
||||
<VnAvatar :worker-id="opt.id" />
|
||||
</QDate>
|
||||
<QSeparator />
|
||||
<QItem>
|
||||
<QItemSection v-if="!workers">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
</QItemSection>
|
||||
<QItemSection class="col-9 justify-center">
|
||||
<span>{{ opt.name }}</span>
|
||||
<span class="text-grey">{{ opt.nickname }}</span>
|
||||
<QItemSection v-if="workers">
|
||||
<QSelect
|
||||
:label="t('User')"
|
||||
v-model="params.userFk"
|
||||
@update:model-value="searchFn()"
|
||||
:options="workers"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
:input-debounce="0"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
</VnFilterPanel>
|
||||
</template>
|
||||
<template #filter-change="{ params, columnName, searchFn }">
|
||||
<VnInput
|
||||
:label="t('globals.changes')"
|
||||
v-model="params[columnName]"
|
||||
@keyup.enter="searchFn"
|
||||
@blur="searchFn"
|
||||
@remove="searchFn"
|
||||
:info="t('tooltips.changes')"
|
||||
dense
|
||||
filled
|
||||
/>
|
||||
</template>
|
||||
<template #filter-action="{ searchFn }">
|
||||
<div class="column">
|
||||
<QCheckbox
|
||||
v-for="checkboxOption in checkboxOptions"
|
||||
:key="checkboxOption"
|
||||
size="sm"
|
||||
v-model="checkboxOption.selected"
|
||||
:label="t(`actions.${checkboxOption.label}`)"
|
||||
@update:model-value="
|
||||
() => searchFn(undefined, 'action', getActions())
|
||||
"
|
||||
data-cy="vnLog-checkbox"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #filter-from="{ params, columnName, searchFn }">
|
||||
<VnInputDate
|
||||
:label="t('globals.from')"
|
||||
v-model="params[columnName]"
|
||||
dense
|
||||
filled
|
||||
@update:modelValue="() => searchFn()"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-to="{ params, columnName, searchFn }">
|
||||
<VnInputDate
|
||||
:label="t('globals.to')"
|
||||
v-model="params[columnName]"
|
||||
dense
|
||||
filled
|
||||
@update:modelValue="() => searchFn()"
|
||||
/>
|
||||
</template>
|
||||
</VnTableFilter>
|
||||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
tooltips:
|
||||
search: Buscar por identificador o concepto
|
||||
changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
|
||||
actions:
|
||||
Creates: Crea
|
||||
Edits: Modifica
|
||||
Deletes: Elimina
|
||||
Accesses: Accede
|
||||
Users:
|
||||
User: Usuario
|
||||
All: Todo
|
||||
System: Sistema
|
||||
params:
|
||||
changedModel: Entity
|
||||
|
||||
<i18n>
|
||||
en:
|
||||
tooltips:
|
||||
search: Search by identifier or concept
|
||||
changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
|
||||
actions:
|
||||
Creates: Creates
|
||||
Edits: Edits
|
||||
Deletes: Deletes
|
||||
Accesses: Accesses
|
||||
Users:
|
||||
User: User
|
||||
All: All
|
||||
System: System
|
||||
params:
|
||||
changedModel: Entidad
|
||||
search: Contains
|
||||
userFk: User
|
||||
created: Created
|
||||
es:
|
||||
params:
|
||||
search: Contiene
|
||||
userFk: Usuario
|
||||
created: Creada
|
||||
User: Usuario
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -40,6 +40,10 @@ const $props = defineProps({
|
|||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
keepData: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
const route = useRoute();
|
||||
|
|
@ -57,6 +61,7 @@ onBeforeMount(() => {
|
|||
if ($props.dataKey)
|
||||
arrayData = useArrayData($props.dataKey, {
|
||||
searchUrl: 'table',
|
||||
keepData: $props.keepData,
|
||||
...$props.arrayDataProps,
|
||||
navigate: $props.redirect,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -108,4 +108,27 @@ describe('VnLog', () => {
|
|||
expect(vm.logTree[0].originFk).toEqual(1);
|
||||
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
|
||||
});
|
||||
|
||||
it('should correctly set the selectedFilters when filtering', () => {
|
||||
vm.searchInput = '1';
|
||||
vm.userSelect = '21';
|
||||
vm.checkboxOptions.insert.selected = true;
|
||||
vm.checkboxOptions.update.selected = true;
|
||||
|
||||
vm.selectFilter('search');
|
||||
vm.selectFilter('userSelect');
|
||||
|
||||
expect(vm.selectedFilters.changedModelId).toEqual('1');
|
||||
expect(vm.selectedFilters.userFk).toEqual('21');
|
||||
expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
|
||||
});
|
||||
|
||||
it('should correctly set the date from', () => {
|
||||
vm.dateFrom = '18-09-2023';
|
||||
vm.selectFilter('date', 'from');
|
||||
expect(vm.selectedFilters.creationDate.between).toEqual([
|
||||
new Date('2023-09-18T00:00:00.000Z'),
|
||||
new Date('2023-09-18T21:59:59.999Z'),
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||
import { createWrapper } from 'app/test/vitest/helper';
|
||||
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||
|
||||
describe('VnLogFilter', () => {
|
||||
let vm;
|
||||
beforeAll(async () => {
|
||||
vm = createWrapper(VnLogFilter, {
|
||||
props: {
|
||||
dataKey: 'ClaimLog',
|
||||
},
|
||||
}).vm;
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.clearAllMocks();
|
||||
});
|
||||
|
||||
it('should getActions selected', async () => {
|
||||
vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
|
||||
vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
|
||||
|
||||
const actions = vm.getActions();
|
||||
|
||||
expect(actions.length).toEqual(2);
|
||||
expect(actions).toEqual(['insert', 'update']);
|
||||
});
|
||||
});
|
||||
|
|
@ -1,6 +1,16 @@
|
|||
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
||||
import {
|
||||
describe,
|
||||
it,
|
||||
expect,
|
||||
vi,
|
||||
beforeAll,
|
||||
afterEach,
|
||||
beforeEach,
|
||||
afterAll,
|
||||
} from 'vitest';
|
||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||
import vnDate from 'src/boot/vnDate';
|
||||
|
||||
describe('VnNotes', () => {
|
||||
let vm;
|
||||
|
|
@ -8,7 +18,6 @@ describe('VnNotes', () => {
|
|||
let spyFetch;
|
||||
let postMock;
|
||||
let patchMock;
|
||||
let deleteMock;
|
||||
let expectedInsertBody;
|
||||
let expectedUpdateBody;
|
||||
const defaultOptions = {
|
||||
|
|
@ -48,7 +57,6 @@ describe('VnNotes', () => {
|
|||
beforeEach(() => {
|
||||
postMock = vi.spyOn(axios, 'post');
|
||||
patchMock = vi.spyOn(axios, 'patch');
|
||||
deleteMock = vi.spyOn(axios, 'delete');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
|
@ -145,16 +153,4 @@ describe('VnNotes', () => {
|
|||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('delete', () => {
|
||||
it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
|
||||
generateWrapper();
|
||||
createSpyFetch();
|
||||
|
||||
await vm.deleteNote({ id: 1 });
|
||||
|
||||
expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
|
||||
expect(spyFetch).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -159,7 +159,6 @@ async function fetch() {
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-top: 2px;
|
||||
align-items: start;
|
||||
.label {
|
||||
color: var(--vn-label-color);
|
||||
width: 9em;
|
||||
|
|
@ -170,15 +169,9 @@ async function fetch() {
|
|||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
&.ellipsis > .value {
|
||||
text-overflow: ellipsis;
|
||||
white-space: pre;
|
||||
}
|
||||
.value {
|
||||
color: var(--vn-text-color);
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
.header {
|
||||
|
|
@ -210,21 +203,27 @@ async function fetch() {
|
|||
}
|
||||
|
||||
.vn-card-group {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||
gap: 16px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.vn-card-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
> div {
|
||||
max-height: 70px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1010px) {
|
||||
.vn-card-group {
|
||||
flex-direction: row;
|
||||
}
|
||||
.vn-card-content {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style lang="scss" scoped>
|
||||
.summaryHeader .vn-label-value {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ const $props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
toModule: {
|
||||
type: Object,
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
|
@ -252,10 +252,6 @@ const toModule = computed(() => {
|
|||
content: ':';
|
||||
}
|
||||
}
|
||||
&.ellipsis > .value {
|
||||
text-overflow: ellipsis;
|
||||
white-space: pre;
|
||||
}
|
||||
.value {
|
||||
color: var(--vn-text-color);
|
||||
font-size: 14px;
|
||||
|
|
|
|||
|
|
@ -61,10 +61,6 @@ const $props = defineProps({
|
|||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
showTagChips: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits([
|
||||
|
|
@ -92,14 +88,13 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
|
|||
defineExpose({ search, params: userParams, remove });
|
||||
|
||||
const isLoading = ref(false);
|
||||
async function search(evt, name, value) {
|
||||
async function search(evt) {
|
||||
try {
|
||||
if (evt && $props.disableSubmitEvent) return;
|
||||
|
||||
store.filter.where = {};
|
||||
isLoading.value = true;
|
||||
const filter = { ...userParams.value, ...$props.modelValue };
|
||||
if (name) filter[name] = value;
|
||||
store.userParamsChanged = true;
|
||||
await arrayData.addFilter({
|
||||
params: filter,
|
||||
|
|
@ -219,7 +214,7 @@ const getLocale = (label) => {
|
|||
</QTooltip>
|
||||
</QBtn>
|
||||
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
|
||||
<QList dense v-if="showTagChips">
|
||||
<QList dense>
|
||||
<QItem class="q-mt-xs">
|
||||
<QItemSection top>
|
||||
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
<script setup>
|
||||
import { dashIfEmpty } from 'src/filters';
|
||||
|
||||
defineProps({ email: { type: [String], default: null } });
|
||||
</script>
|
||||
<template>
|
||||
<QBtn
|
||||
class="q-pr-xs"
|
||||
v-if="email"
|
||||
flat
|
||||
round
|
||||
|
|
@ -16,5 +13,4 @@ defineProps({ email: { type: [String], default: null } });
|
|||
:href="`mailto:${email}`"
|
||||
@click.stop
|
||||
/>
|
||||
<span>{{ dashIfEmpty(email) }}</span>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||
import axios from 'axios';
|
||||
import { dashIfEmpty, parsePhone } from 'src/filters';
|
||||
import { parsePhone } from 'src/filters';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
|
||||
const props = defineProps({
|
||||
|
|
@ -12,51 +12,38 @@ const props = defineProps({
|
|||
|
||||
const phone = ref(props.phoneNumber);
|
||||
const config = reactive({
|
||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||
'say-simple': {
|
||||
icon: 'vn:saysimple',
|
||||
url: null,
|
||||
channel: props.channel,
|
||||
},
|
||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||
});
|
||||
|
||||
const attrs = useAttrs();
|
||||
const types = Object.keys(config)
|
||||
.filter((key) => key in attrs)
|
||||
.sort();
|
||||
const activeTypes = types.length ? types : ['sip'];
|
||||
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
||||
|
||||
onBeforeMount(async () => {
|
||||
if (!phone.value) return;
|
||||
|
||||
for (const type of activeTypes) {
|
||||
if (type === 'say-simple') {
|
||||
let { channel } = config[type];
|
||||
|
||||
if (type === 'say-simple') {
|
||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||
.data;
|
||||
if (!channel) channel = defaultChannel;
|
||||
|
||||
phone.value = await parsePhone(
|
||||
props.phoneNumber,
|
||||
props.country?.toLowerCase(),
|
||||
);
|
||||
config[type].url =
|
||||
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||
}
|
||||
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
||||
config[
|
||||
type
|
||||
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||
}
|
||||
});
|
||||
|
||||
function handleClick(type) {
|
||||
function handleClick() {
|
||||
if (config[type].url) useOpenURL(config[type].url);
|
||||
else if (config[type].href) window.location.href = config[type].href;
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex items-center gap-2">
|
||||
<template v-for="type in activeTypes">
|
||||
<QBtn
|
||||
:key="type"
|
||||
v-if="phone"
|
||||
flat
|
||||
round
|
||||
|
|
@ -64,13 +51,11 @@ function handleClick(type) {
|
|||
size="sm"
|
||||
color="primary"
|
||||
padding="none"
|
||||
@click.stop="() => handleClick(type)"
|
||||
@click.stop="handleClick"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ capitalize(type).replace('-', '') }}
|
||||
</QTooltip>
|
||||
</QBtn></template
|
||||
>
|
||||
<span>{{ dashIfEmpty(phone) }}</span>
|
||||
</div>
|
||||
</QBtn>
|
||||
{{ phoneNumber }}
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
|
|||
|
||||
const emit = defineEmits(['onFetch']);
|
||||
|
||||
const originalAttrs = useAttrs();
|
||||
const $attrs = computed(() => {
|
||||
const { required, deletable, ...rest } = originalAttrs;
|
||||
return rest;
|
||||
const $attrs = useAttrs();
|
||||
|
||||
const isRequired = computed(() => {
|
||||
return Object.keys($attrs).includes('required');
|
||||
});
|
||||
|
||||
const $props = defineProps({
|
||||
|
|
@ -53,11 +53,6 @@ function handleClick(e) {
|
|||
else insert();
|
||||
}
|
||||
|
||||
async function deleteNote(e) {
|
||||
await axios.delete(`${$props.url}/${e.id}`);
|
||||
await vnPaginateRef.value.fetch();
|
||||
}
|
||||
|
||||
async function insert() {
|
||||
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
|
||||
|
||||
|
|
@ -162,7 +157,7 @@ const handleObservationTypes = (data) => {
|
|||
v-model="newNote.observationTypeFk"
|
||||
option-label="description"
|
||||
style="flex: 0.15"
|
||||
:required="'required' in originalAttrs"
|
||||
:required="isRequired"
|
||||
@keyup.enter.stop="insert"
|
||||
/>
|
||||
<VnInput
|
||||
|
|
@ -170,10 +165,11 @@ const handleObservationTypes = (data) => {
|
|||
type="textarea"
|
||||
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
|
||||
filled
|
||||
size="lg"
|
||||
autogrow
|
||||
autofocus
|
||||
@keyup.enter.stop="handleClick"
|
||||
:required="'required' in originalAttrs"
|
||||
:required="isRequired"
|
||||
clearable
|
||||
>
|
||||
<template #append>
|
||||
|
|
@ -243,21 +239,6 @@ const handleObservationTypes = (data) => {
|
|||
</QBadge>
|
||||
</div>
|
||||
<span v-text="toDateHourMin(note.created)" />
|
||||
<div>
|
||||
<QIcon
|
||||
v-if="'deletable' in originalAttrs"
|
||||
name="delete"
|
||||
size="sm"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
@click="deleteNote(note)"
|
||||
data-cy="notesRemoveNoteBtn"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('ticketNotes.removeNote') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
</div>
|
||||
</div>
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ onMounted(async () => {
|
|||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
arrayData.reset(['data']);
|
||||
if (!store.keepData) arrayData.reset(['data']);
|
||||
arrayData.resetPagination();
|
||||
});
|
||||
|
||||
|
|
@ -215,7 +215,6 @@ defineExpose({
|
|||
paginate,
|
||||
userParams: arrayData.store.userParams,
|
||||
currentFilter: arrayData.store.currentFilter,
|
||||
arrayData,
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
const { t } = useI18n();
|
||||
const props = defineProps({
|
||||
usesMana: {
|
||||
type: Boolean,
|
||||
required: true,
|
||||
},
|
||||
manaCode: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
manaVal: {
|
||||
type: String,
|
||||
default: 'mana',
|
||||
},
|
||||
manaLabel: {
|
||||
type: String,
|
||||
default: 'Promotion mana',
|
||||
},
|
||||
manaClaimVal: {
|
||||
type: String,
|
||||
default: 'manaClaim',
|
||||
},
|
||||
claimLabel: {
|
||||
type: String,
|
||||
default: 'Claim mana',
|
||||
},
|
||||
});
|
||||
|
||||
const manaCode = ref(props.manaCode);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="column q-gutter-y-sm q-mt-sm">
|
||||
<QRadio
|
||||
v-model="manaCode"
|
||||
dense
|
||||
:val="manaVal"
|
||||
:label="t(manaLabel)"
|
||||
:dark="true"
|
||||
class="q-mb-sm"
|
||||
/>
|
||||
<QRadio
|
||||
v-model="manaCode"
|
||||
dense
|
||||
:val="manaClaimVal"
|
||||
:label="t(claimLabel)"
|
||||
:dark="true"
|
||||
class="q-mb-sm"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
Promotion mana: Maná promoción
|
||||
Claim mana: Maná reclamación
|
||||
</i18n>
|
||||
|
|
@ -23,19 +23,18 @@ describe('useRole', () => {
|
|||
name: `T'Challa`,
|
||||
nickname: 'Black Panther',
|
||||
lang: 'en',
|
||||
worker: { department: { departmentFk: 155 } },
|
||||
};
|
||||
const expectedUser = {
|
||||
id: 999,
|
||||
name: `T'Challa`,
|
||||
nickname: 'Black Panther',
|
||||
lang: 'en',
|
||||
departmentFk: 155,
|
||||
};
|
||||
const expectedRoles = ['salesPerson', 'admin'];
|
||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||
vi.spyOn(axios, 'get')
|
||||
.mockResolvedValueOnce({
|
||||
data: { roles: rolesData, user: fetchedUser },
|
||||
});
|
||||
})
|
||||
|
||||
vi.spyOn(role.state, 'setUser');
|
||||
vi.spyOn(role.state, 'setRoles');
|
||||
|
|
|
|||
|
|
@ -75,7 +75,6 @@ describe('session', () => {
|
|||
userConfig: {
|
||||
darkMode: false,
|
||||
},
|
||||
worker: { department: { departmentFk: 155 } },
|
||||
};
|
||||
const rolesData = [
|
||||
{
|
||||
|
|
@ -144,7 +143,7 @@ describe('session', () => {
|
|||
await session.destroy(); // this clears token and user for any other test
|
||||
});
|
||||
},
|
||||
{},
|
||||
{}
|
||||
);
|
||||
|
||||
describe('RenewToken', () => {
|
||||
|
|
@ -176,7 +175,7 @@ describe('session', () => {
|
|||
await session.checkValidity();
|
||||
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
|
||||
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
|
||||
expectedTokenMultimedia,
|
||||
expectedTokenMultimedia
|
||||
);
|
||||
});
|
||||
it('Should renewToken', async () => {
|
||||
|
|
@ -205,7 +204,7 @@ describe('session', () => {
|
|||
await session.checkValidity();
|
||||
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
|
||||
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
|
||||
expectedTokenMultimedia,
|
||||
expectedTokenMultimedia
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -30,16 +30,9 @@ export function useAcl() {
|
|||
return false;
|
||||
}
|
||||
|
||||
function hasAcl(model, prop, accessType) {
|
||||
const modelAcl = state.getAcls().value[model];
|
||||
const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
|
||||
return !!(propAcl?.[accessType] || propAcl?.['*']);
|
||||
}
|
||||
|
||||
return {
|
||||
fetch,
|
||||
hasAny,
|
||||
state,
|
||||
hasAcl,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ export function useArrayData(key, userOptions) {
|
|||
'searchUrl',
|
||||
'navigate',
|
||||
'mapKey',
|
||||
'keepData',
|
||||
'oneRecord',
|
||||
];
|
||||
if (typeof userOptions === 'object') {
|
||||
|
|
@ -107,7 +108,7 @@ export function useArrayData(key, userOptions) {
|
|||
store.hasMoreData = limit && response.data.length >= limit;
|
||||
|
||||
if (!append && !isDialogOpened() && updateRouter) {
|
||||
if (updateStateParams(response.data)?.redirect) return;
|
||||
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
|
||||
}
|
||||
store.isLoading = false;
|
||||
canceller = null;
|
||||
|
|
@ -188,7 +189,7 @@ export function useArrayData(key, userOptions) {
|
|||
|
||||
store.order = order;
|
||||
resetPagination();
|
||||
await fetch({});
|
||||
fetch({});
|
||||
index++;
|
||||
|
||||
return { index, order };
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ export function useFilterParams(key) {
|
|||
watch(
|
||||
() => arrayData.value.store?.currentFilter,
|
||||
(val, oldValue) => (val || oldValue) && setUserParams(val),
|
||||
{ immediate: true, deep: true },
|
||||
{ immediate: true, deep: true }
|
||||
);
|
||||
|
||||
function parseOrder(urlOrders) {
|
||||
|
|
@ -54,7 +54,7 @@ export function useFilterParams(key) {
|
|||
Object.assign(params, item);
|
||||
});
|
||||
delete params[key];
|
||||
} else if (value && typeof value === 'object' && !Array.isArray(value)) {
|
||||
} else if (value && typeof value === 'object') {
|
||||
const param = Object.values(value)[0];
|
||||
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ export function useRole() {
|
|||
name: data.user.name,
|
||||
nickname: data.user.nickname,
|
||||
lang: data.user.lang || 'es',
|
||||
departmentFk: data.user?.worker?.department?.departmentFk,
|
||||
};
|
||||
state.setUser(userData);
|
||||
state.setRoles(roles);
|
||||
|
|
|
|||
|
|
@ -370,11 +370,6 @@ globals:
|
|||
countryCodeFk: Country
|
||||
companyFk: Company
|
||||
nickname: Alias
|
||||
changedModel: Entity
|
||||
changedModelValue: Search
|
||||
changedModelId: Entity id
|
||||
userFk: User
|
||||
action: Action
|
||||
model: Model
|
||||
fuel: Fuel
|
||||
active: Active
|
||||
|
|
|
|||
|
|
@ -371,11 +371,6 @@ globals:
|
|||
countryCodeFk: País
|
||||
companyFk: Empresa
|
||||
nickname: Alias
|
||||
changedModel: Entidad
|
||||
changedModelValue: Buscar
|
||||
changedModelId: Id de entidad
|
||||
userFk: Usuario
|
||||
action: Acción
|
||||
errors:
|
||||
statusUnauthorized: Acceso denegado
|
||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||
|
|
|
|||
|
|
@ -100,8 +100,12 @@ const onChangePass = (oldPass) => {
|
|||
};
|
||||
|
||||
onMounted(() => {
|
||||
hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
|
||||
hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
|
||||
hasitManagementAccess.value = useAcl().hasAny([
|
||||
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
|
||||
]);
|
||||
hasSysadminAccess.value = useAcl().hasAny([
|
||||
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
|
||||
]);
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
|
|
@ -223,7 +227,7 @@ onMounted(() => {
|
|||
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
||||
</QItem>
|
||||
<QItem
|
||||
v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
|
||||
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
|
||||
v-ripple
|
||||
clickable
|
||||
@click="showSyncDialog = true"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
|||
<QPopupProxy style="max-width: 10px">
|
||||
<AccountDescriptor
|
||||
v-if="$attrs.id"
|
||||
v-bind="$attrs"
|
||||
v-bind="$attrs.id"
|
||||
:summary="AccountSummary"
|
||||
:proxy-render="true"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -123,8 +123,8 @@ async function fetchMana() {
|
|||
|
||||
async function updateDiscount({ saleFk, discount, canceller }) {
|
||||
const body = { salesIds: [saleFk], newDiscount: discount };
|
||||
const claimId = claim.value.ticketFk;
|
||||
const query = `Tickets/${claimId}/updateDiscount`;
|
||||
const ticketFk = claim.value.ticketFk;
|
||||
const query = `Tickets/${ticketFk}/updateDiscount`;
|
||||
|
||||
await axios.post(query, body, {
|
||||
signal: canceller.signal,
|
||||
|
|
|
|||
|
|
@ -115,7 +115,6 @@ const props = defineProps({
|
|||
<i18n>
|
||||
en:
|
||||
params:
|
||||
departmentFk: Department
|
||||
search: Contains
|
||||
clientFk: Customer
|
||||
clientName: Customer
|
||||
|
|
@ -128,7 +127,6 @@ en:
|
|||
zoneFk: Zone
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Contiene
|
||||
clientFk: Cliente
|
||||
clientName: Cliente
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ const columns = computed(() => [
|
|||
|
||||
const STATE_COLOR = {
|
||||
pending: 'bg-warning',
|
||||
loses: 'bg-negative',
|
||||
managed: 'bg-info',
|
||||
resolved: 'bg-positive',
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -20,12 +20,11 @@ import VnFilter from 'components/VnTable/VnFilter.vue';
|
|||
|
||||
import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
|
||||
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
const { sendEmail, openReport } = usePrintService();
|
||||
const { t } = useI18n();
|
||||
const { hasAcl } = useAcl();
|
||||
const { hasAny } = useAcl();
|
||||
|
||||
const quasar = useQuasar();
|
||||
const route = useRoute();
|
||||
|
|
@ -90,7 +89,15 @@ const columns = computed(() => [
|
|||
{
|
||||
align: 'left',
|
||||
label: t('Employee'),
|
||||
name: 'workerFk',
|
||||
columnField: {
|
||||
component: 'userLink',
|
||||
attrs: ({ row }) => {
|
||||
return {
|
||||
workerId: row.workerFk,
|
||||
name: row.userName,
|
||||
};
|
||||
},
|
||||
},
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
|
|
@ -124,6 +131,7 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
name: 'balance',
|
||||
label: t('Balance'),
|
||||
format: ({ balance }) => toCurrency(balance),
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
|
|
@ -138,14 +146,12 @@ const columns = computed(() => [
|
|||
actions: [
|
||||
{
|
||||
title: t('globals.downloadPdf'),
|
||||
isPrimary: true,
|
||||
icon: 'cloud_download',
|
||||
show: (row) => row.isInvoice,
|
||||
action: (row) => showBalancePdf(row),
|
||||
},
|
||||
{
|
||||
title: t('Send compensation'),
|
||||
isPrimary: true,
|
||||
icon: 'outgoing_mail',
|
||||
show: (row) => !!row.isCompensation,
|
||||
action: ({ id }) =>
|
||||
|
|
@ -250,12 +256,6 @@ const showBalancePdf = ({ id }) => {
|
|||
<template #column-balance="{ rowIndex }">
|
||||
{{ toCurrency(balances[rowIndex]?.balance) }}
|
||||
</template>
|
||||
<template #column-workerFk="{ row }">
|
||||
<span class="link" @click.stop>
|
||||
{{ row.userName }}
|
||||
<WorkerDescriptorProxy :id="row.workerFk" />
|
||||
</span>
|
||||
</template>
|
||||
<template #column-description="{ row }">
|
||||
<span class="link" v-if="row.isInvoice" @click.stop>
|
||||
{{ t('bill', { ref: row.description }) }}
|
||||
|
|
@ -276,7 +276,9 @@ const showBalancePdf = ({ id }) => {
|
|||
>
|
||||
<VnInput
|
||||
v-model="scope.value"
|
||||
:disable="!hasAcl('Receipt', '*', 'WRITE')"
|
||||
:disable="
|
||||
!hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
|
||||
"
|
||||
@keypress.enter="scope.set"
|
||||
autofocus
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -3,13 +3,7 @@ import { computed, ref } from 'vue';
|
|||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import {
|
||||
toCurrency,
|
||||
toPercentage,
|
||||
toDate,
|
||||
dashOrCurrency,
|
||||
dashIfEmpty,
|
||||
} from 'src/filters';
|
||||
import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
|
||||
import CardSummary from 'components/ui/CardSummary.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
|
||||
|
|
@ -293,14 +287,10 @@ const sumRisk = ({ clientRisks }) => {
|
|||
<VnLv
|
||||
v-if="entity.creditInsurance"
|
||||
:label="t('customer.summary.securedCredit')"
|
||||
:value="toCurrency(entity.creditInsurance)"
|
||||
:info="t('customer.summary.securedCreditInfo')"
|
||||
>
|
||||
<template #value>
|
||||
{{ toCurrency(entity.creditInsurance) }}({{
|
||||
dashIfEmpty(entity.classifications[0]?.insurances[0]?.grade)
|
||||
}})
|
||||
</template></VnLv
|
||||
>
|
||||
/>
|
||||
|
||||
<VnLv
|
||||
:label="t('customer.summary.balance')"
|
||||
:value="toCurrency(sumRisk(entity)) || toCurrency(0)"
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ const exprBuilder = (param, value) => {
|
|||
option-value="id"
|
||||
option-label="name"
|
||||
url="Departments"
|
||||
no-one="true"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -155,7 +154,6 @@ en:
|
|||
city: City
|
||||
phone: Phone
|
||||
email: Email
|
||||
departmentFk: Department
|
||||
isToBeMailed: Mailed
|
||||
isEqualizated: Equailized
|
||||
businessTypeFk: Business type
|
||||
|
|
@ -168,7 +166,6 @@ en:
|
|||
postcode: Postcode
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Contiene
|
||||
fi: NIF
|
||||
isActive: Activo
|
||||
|
|
|
|||
|
|
@ -192,10 +192,8 @@ en:
|
|||
date: L. O. Date
|
||||
credit: Credit I.
|
||||
defaulterSinced: From
|
||||
departmentFk: Department
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
clientFk: Cliente
|
||||
countryFk: País
|
||||
paymentMethod: F. Pago
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@ es:
|
|||
Identifier: Identificador
|
||||
Social name: Razón social
|
||||
Phone: Teléfono
|
||||
Postcode: Código postal
|
||||
City: Población
|
||||
Email: Email
|
||||
Campaign consumption: Consumo campaña
|
||||
|
|
|
|||
|
|
@ -93,26 +93,10 @@ const updateAddressTicket = async () => {
|
|||
};
|
||||
|
||||
const updateObservations = async (payload) => {
|
||||
await axios.post('AddressObservations/crud', cleanPayload(payload));
|
||||
await axios.post('AddressObservations/crud', payload);
|
||||
notes.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 }) {
|
||||
await updateObservations(payload);
|
||||
await updateAddress(data);
|
||||
|
|
|
|||
|
|
@ -3,20 +3,18 @@ import { onBeforeMount, reactive, ref } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import axios from 'axios';
|
||||
import { useDialogPluginComponent } from 'quasar';
|
||||
|
||||
import { getClientRisk } from '../composables/getClientRisk';
|
||||
import { useDialogPluginComponent } from 'quasar';
|
||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||
import { usePrintService } from 'composables/usePrintService';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import VnInputNumber from 'components/common/VnInputNumber.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
|
|
@ -50,7 +48,7 @@ const maxAmount = ref();
|
|||
const accountingType = ref({});
|
||||
const isCash = ref(false);
|
||||
const formModelRef = ref(false);
|
||||
const amountToReturn = ref();
|
||||
|
||||
const filterBanks = {
|
||||
fields: ['id', 'bank', 'accountingTypeFk'],
|
||||
include: { relation: 'accountingType' },
|
||||
|
|
@ -92,7 +90,7 @@ function setPaymentType(data, accounting) {
|
|||
let descriptions = [];
|
||||
if (accountingType.value.receiptDescription)
|
||||
descriptions.push(accountingType.value.receiptDescription);
|
||||
if (data.description > 0) descriptions.push(data.description);
|
||||
if (data.description) descriptions.push(data.description);
|
||||
data.description = descriptions.join(', ');
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +100,7 @@ const calculateFromAmount = (event) => {
|
|||
};
|
||||
|
||||
const calculateFromDeliveredAmount = (event) => {
|
||||
amountToReturn.value = event - initialData.amountPaid;
|
||||
initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
|
||||
};
|
||||
|
||||
function onBeforeSave(data) {
|
||||
|
|
@ -123,16 +121,17 @@ async function onDataSaved(formData, { id }) {
|
|||
recipient: formData.email,
|
||||
});
|
||||
|
||||
if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`, {}, '_blank');
|
||||
if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`);
|
||||
} finally {
|
||||
if ($props.promise) $props.promise();
|
||||
if (closeButton.value) closeButton.value.click();
|
||||
}
|
||||
}
|
||||
|
||||
async function getSupplierClientReferences(value) {
|
||||
async function accountShortToStandard({ target: { value } }) {
|
||||
if (!value) return (initialData.description = '');
|
||||
const params = { bankAccount: value };
|
||||
initialData.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
|
||||
const params = { bankAccount: initialData.compensationAccount };
|
||||
const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
|
||||
if (!data.clientId) {
|
||||
initialData.description = t('Supplier Compensation Reference', {
|
||||
|
|
@ -242,16 +241,17 @@ async function getAmountPaid() {
|
|||
@update:model-value="getAmountPaid()"
|
||||
/>
|
||||
</VnRow>
|
||||
<div v-if="accountingType.code == 'compensation'">
|
||||
|
||||
<div v-if="data.bankFk?.accountingType?.code == 'compensation'">
|
||||
<div class="text-h6">
|
||||
{{ t('Compensation') }}
|
||||
</div>
|
||||
<VnRow>
|
||||
<VnAccountNumber
|
||||
<VnInputNumber
|
||||
:label="t('Compensation account')"
|
||||
clearable
|
||||
v-model="data.compensationAccount"
|
||||
@blur="getSupplierClientReferences(data.compensationAccount)"
|
||||
@blur="accountShortToStandard"
|
||||
/>
|
||||
</VnRow>
|
||||
</div>
|
||||
|
|
@ -261,7 +261,8 @@ async function getAmountPaid() {
|
|||
clearable
|
||||
v-model="data.description"
|
||||
/>
|
||||
<div v-if="accountingType.code == 'cash'">
|
||||
|
||||
<div v-if="data.bankFk?.accountingType?.code == 'cash'">
|
||||
<div class="text-h6">{{ t('Cash') }}</div>
|
||||
<VnRow>
|
||||
<VnInputNumber
|
||||
|
|
@ -273,7 +274,7 @@ async function getAmountPaid() {
|
|||
<VnInputNumber
|
||||
:label="t('Amount to return')"
|
||||
disable
|
||||
v-model="amountToReturn"
|
||||
v-model="data.amountToReturn"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
|
|||
:without-header="true"
|
||||
auto-load
|
||||
:row-click="rowClick"
|
||||
order="shipped DESC, id DESC"
|
||||
order="shipped DESC, id"
|
||||
:disable-option="{ card: true, table: true }"
|
||||
class="full-width"
|
||||
:disable-infinite-scroll="true"
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ onMounted(async () => {
|
|||
:url="`#/entry/${entityId}/basic-data`"
|
||||
:text="t('globals.summary.basicData')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<div class="card-group">
|
||||
<div class="card-content">
|
||||
<VnLv
|
||||
:label="t('entry.summary.commission')"
|
||||
:value="entry?.commission"
|
||||
|
|
@ -93,7 +93,7 @@ onMounted(async () => {
|
|||
:value="entry?.invoiceNumber"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<div class="card-content">
|
||||
<VnCheckbox
|
||||
:label="t('entry.list.tableVisibleColumns.isOrdered')"
|
||||
v-model="entry.isOrdered"
|
||||
|
|
@ -130,8 +130,8 @@ onMounted(async () => {
|
|||
:url="`#/travel/${entry.travel.id}/summary`"
|
||||
:text="t('Travel')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<div class="card-group">
|
||||
<div class="card-content">
|
||||
<VnLv :label="t('entry.summary.travelReference')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
|
|
@ -161,7 +161,7 @@ onMounted(async () => {
|
|||
:value="entry.travel.warehouseIn?.name"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<div class="card-content">
|
||||
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
||||
<VnCheckbox
|
||||
:label="t('entry.summary.travelDelivered')"
|
||||
|
|
@ -193,6 +193,31 @@ onMounted(async () => {
|
|||
</template>
|
||||
</CardSummary>
|
||||
</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>
|
||||
es:
|
||||
Travel: Envío
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ const routes = reactive({
|
|||
getSupplier: (id) => {
|
||||
return { name: 'SupplierCard', params: { id } };
|
||||
},
|
||||
getInvoices: (id) => {
|
||||
getTickets: (id) => {
|
||||
return {
|
||||
name: 'InvoiceInList',
|
||||
query: {
|
||||
|
|
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
|
|||
</QBtn>
|
||||
<QBtn
|
||||
size="md"
|
||||
icon="vn:invoice-in"
|
||||
icon="vn:ticket"
|
||||
color="primary"
|
||||
:to="routes.getInvoices(entity.supplierFk)"
|
||||
:to="routes.getTickets(entity.supplierFk)"
|
||||
>
|
||||
<QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
|
||||
<QTooltip>{{ t('globals.ticketList') }}</QTooltip>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
v-if="
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ invoiceIn:
|
|||
amount: Amount
|
||||
descriptor:
|
||||
ticketList: Ticket list
|
||||
invoices: Supplier invoices
|
||||
descriptorMenu:
|
||||
book: Book
|
||||
unbook: Unbook
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ invoiceIn:
|
|||
awb: AWB
|
||||
amount: Importe
|
||||
descriptor:
|
||||
invoices: Facturas de proveedor
|
||||
ticketList: Listado de tickets
|
||||
descriptorMenu:
|
||||
book: Contabilizar
|
||||
unbook: Descontabilizar
|
||||
|
|
|
|||
|
|
@ -9,14 +9,12 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
|
|||
import VnRow from 'src/components/ui/VnRow.vue';
|
||||
import { dateRange } from 'src/filters';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
import { useState } from 'src/composables/useState';
|
||||
const { t } = useI18n();
|
||||
|
||||
const dates = dateRange(Date.vnNew());
|
||||
const from = ref(dates[0]);
|
||||
const to = ref(dates[1]);
|
||||
|
||||
const state = useState();
|
||||
const filter = computed(() => {
|
||||
const obj = {};
|
||||
const formatFrom = setHours(from.value, 'from');
|
||||
|
|
@ -26,18 +24,16 @@ const filter = computed(() => {
|
|||
if (!formatFrom && formatTo) stamp = { lte: formatTo };
|
||||
else if (formatFrom && !formatTo) stamp = { gte: formatFrom };
|
||||
else if (formatFrom && formatTo) stamp = { between: [formatFrom, formatTo] };
|
||||
return Object.assign(obj, {
|
||||
where: {
|
||||
'v.stamp': stamp,
|
||||
'c.departmentFk': state.getUser().value.departmentFk,
|
||||
},
|
||||
});
|
||||
|
||||
return Object.assign(obj, { where: { 'v.stamp': stamp } });
|
||||
});
|
||||
|
||||
function exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
case 'clientFk':
|
||||
return { [`c.id`]: value };
|
||||
case 'departmentFk':
|
||||
return { [`c.${param}`]: value };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -70,14 +66,10 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
name: 'departmentFk',
|
||||
label: t('customer.summary.team'),
|
||||
columnFilter: {
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'Departments',
|
||||
},
|
||||
alias: 'c',
|
||||
inWhere: true,
|
||||
},
|
||||
columnField: {
|
||||
component: null,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ const getLocale = (label) => {
|
|||
<QItemSection>
|
||||
<VnSelect
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.packing')"
|
||||
v-model="params.packing"
|
||||
url="ItemPackingTypes"
|
||||
|
|
|
|||
|
|
@ -130,10 +130,8 @@ en:
|
|||
myTeam: My Team
|
||||
isConfirmed: Order Confirmed
|
||||
showEmpty: Show Empty
|
||||
departmentFk: Department
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Búsqueda
|
||||
clientFk: Cliente
|
||||
agencyModeFk: Agencia
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
|
|||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" :filter="{ where: { id: $route.params.id } }" />
|
||||
<VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -112,9 +112,12 @@ const filter = {
|
|||
:label="t('Trailer Plate')"
|
||||
:value="dashIfEmpty(entity?.trailerPlate)"
|
||||
/>
|
||||
<VnLv :label="t('Phone')">
|
||||
<VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
|
||||
<template #value>
|
||||
<span>
|
||||
{{ dashIfEmpty(entity?.phone) }}
|
||||
<VnLinkPhone :phone-number="entity?.phone" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ const columns = computed(() => [
|
|||
},
|
||||
isId: true,
|
||||
columnFilter: false,
|
||||
width: '25px',
|
||||
},
|
||||
{
|
||||
name: 'workerFk',
|
||||
|
|
@ -141,6 +142,7 @@ const columns = computed(() => [
|
|||
label: 'm3',
|
||||
cardVisible: true,
|
||||
columnClass: 'shrink',
|
||||
width: '50px',
|
||||
},
|
||||
{
|
||||
name: 'started',
|
||||
|
|
@ -148,6 +150,7 @@ const columns = computed(() => [
|
|||
component: 'time',
|
||||
columnFilter: false,
|
||||
format: ({ started }) => toHour(started),
|
||||
width: '50px',
|
||||
},
|
||||
{
|
||||
name: 'finished',
|
||||
|
|
@ -155,6 +158,7 @@ const columns = computed(() => [
|
|||
component: 'time',
|
||||
columnFilter: false,
|
||||
format: ({ finished }) => toHour(finished),
|
||||
width: '50px',
|
||||
},
|
||||
{
|
||||
align: 'right',
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ const columns = computed(() => [
|
|||
condition: () => true,
|
||||
},
|
||||
columnFilter: false,
|
||||
width: '25px',
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
@ -56,6 +57,7 @@ const columns = computed(() => [
|
|||
cardVisible: true,
|
||||
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
|
||||
columnFilter: false,
|
||||
width: '100px',
|
||||
},
|
||||
{
|
||||
label: t('globals.agency'),
|
||||
|
|
@ -98,6 +100,7 @@ const columns = computed(() => [
|
|||
cardVisible: true,
|
||||
columnFilter: false,
|
||||
format: ({ started }) => toHour(started),
|
||||
width: '50px',
|
||||
},
|
||||
{
|
||||
align: 'center',
|
||||
|
|
@ -106,6 +109,7 @@ const columns = computed(() => [
|
|||
cardVisible: true,
|
||||
columnFilter: false,
|
||||
format: ({ finished }) => toHour(finished),
|
||||
width: '50px',
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ function exprBuilder(param, value) {
|
|||
}"
|
||||
>
|
||||
<template #advanced-menu>
|
||||
<RoadmapFilter :data-key />
|
||||
<RoadmapFilter :dataKey />
|
||||
</template>
|
||||
<template #body>
|
||||
<VnTable
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const state = useState();
|
||||
const user = state.getUser();
|
||||
const vehicleId = computed(() => route.params.id);
|
||||
|
||||
const noteFilter = computed(() => {
|
||||
return {
|
||||
order: 'created DESC',
|
||||
where: { vehicleFk: vehicleId.value },
|
||||
};
|
||||
});
|
||||
|
||||
const body = {
|
||||
vehicleFk: vehicleId.value,
|
||||
workerFk: user.value.id,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnNotes
|
||||
url="vehicleObservations"
|
||||
:add-note="true"
|
||||
:filter="noteFilter"
|
||||
:body="body"
|
||||
style="overflow-y: auto"
|
||||
required
|
||||
deletable
|
||||
/>
|
||||
</template>
|
||||
|
|
@ -50,7 +50,7 @@ route:
|
|||
agencyAgreement: Agency agreement
|
||||
agencyModeName: Agency route
|
||||
isOwn: Own
|
||||
isAnyVolumeAllowed: Any volume allowed
|
||||
isAnyVolumeallowed: Any volume allowed
|
||||
Worker: Worker
|
||||
Agency: Agency
|
||||
Vehicle: Vehicle
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ const getEntryQueryParams = (supplier) => {
|
|||
<QBtn
|
||||
:to="{
|
||||
name: 'EntryList',
|
||||
query: { table: JSON.stringify(getEntryQueryParams(entity)) },
|
||||
query: { params: JSON.stringify(getEntryQueryParams(entity)) },
|
||||
}"
|
||||
size="md"
|
||||
icon="vn:entry"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@ const { validate } = useValidator();
|
|||
const { notify } = useNotify();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
|
||||
const canEditZone = useAcl().hasAny([
|
||||
{ model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
|
||||
]);
|
||||
|
||||
const agencyFetchRef = ref();
|
||||
const warehousesOptions = ref([]);
|
||||
|
|
|
|||
|
|
@ -4,8 +4,10 @@ import { useI18n } from 'vue-i18n';
|
|||
import { computed, ref } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { toCurrency } from 'src/filters';
|
||||
import VnUsesMana from 'components/ui/VnUsesMana.vue';
|
||||
import axios from 'axios';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
const route = useRoute();
|
||||
const $props = defineProps({
|
||||
newPrice: {
|
||||
type: Number,
|
||||
|
|
@ -17,15 +19,10 @@ const $props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const route = useRoute();
|
||||
const mana = ref(null);
|
||||
const usesMana = ref(false);
|
||||
|
||||
const emit = defineEmits(['save', 'cancel']);
|
||||
|
||||
const emit = defineEmits(['save', 'cancel', 'show']);
|
||||
const { t } = useI18n();
|
||||
const QPopupProxyRef = ref(null);
|
||||
const manaCode = ref($props.manaCode);
|
||||
const componentName = ref('mana');
|
||||
|
||||
const save = (sale = $props.sale) => {
|
||||
emit('save', sale);
|
||||
|
|
@ -71,6 +68,27 @@ defineExpose({ save });
|
|||
{{ toCurrency($props.newPrice) }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<QBtn
|
||||
color="primary"
|
||||
class="no-border-radius"
|
||||
dense
|
||||
style="width: 50%"
|
||||
@click="cancel()"
|
||||
>
|
||||
{{ t('globals.cancel') }}
|
||||
</QBtn>
|
||||
<QBtn
|
||||
color="primary"
|
||||
class="no-border-radius"
|
||||
dense
|
||||
style="width: 50%"
|
||||
data-cy="saveManaBtn"
|
||||
type="submit"
|
||||
>
|
||||
{{ t('globals.save') }}
|
||||
</QBtn>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
|
@ -99,11 +117,6 @@ defineExpose({ save });
|
|||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.container {
|
||||
background-color: $dark;
|
||||
width: 230px;
|
||||
}
|
||||
|
||||
.header {
|
||||
height: 54px;
|
||||
width: 100%;
|
||||
|
|
@ -120,4 +133,5 @@ defineExpose({ save });
|
|||
<i18n>
|
||||
es:
|
||||
New price: Nuevo precio
|
||||
Claim: Reclamación
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,19 @@
|
|||
<script setup>
|
||||
import { onMounted, ref, computed, watch, inject } from 'vue';
|
||||
import { onMounted, ref, computed, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRouter, useRoute } from 'vue-router';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FetchedTags from 'components/ui/FetchedTags.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
||||
import TicketEditManaProxy from './TicketEditMana.vue';
|
||||
import TicketEditMana from './TicketEditMana.vue';
|
||||
import VnImg from 'src/components/ui/VnImg.vue';
|
||||
|
||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
|
||||
import TicketTransferProxy from './TicketTransferProxy.vue';
|
||||
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import { toCurrency, toPercentage } from 'src/filters';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
|
|
@ -25,7 +23,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
|
|||
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||
import TicketProblems from 'src/components/TicketProblems.vue';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
const app = inject('app');
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
|
|
@ -134,7 +132,7 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
label: t('ticketSale.packaging'),
|
||||
label: t('ticketSale.pack'),
|
||||
name: 'itemPackingTypeFk',
|
||||
format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
|
||||
},
|
||||
|
|
@ -151,7 +149,6 @@ const columns = computed(() => [
|
|||
],
|
||||
},
|
||||
]);
|
||||
|
||||
const getConfig = async () => {
|
||||
let filter = {
|
||||
fields: ['daysForWarningClaim'],
|
||||
|
|
@ -187,26 +184,20 @@ const getRowUpdateInputEvents = (sale) => {
|
|||
|
||||
const resetChanges = async () => {
|
||||
arrayData.fetch({ append: false });
|
||||
tableRef.value.CrudModelRef.hasChanges = false;
|
||||
await tableRef.value.reload();
|
||||
|
||||
tableRef.value.reload();
|
||||
selectedRows.value = [];
|
||||
};
|
||||
const changeQuantity = async (sale) => {
|
||||
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
||||
return;
|
||||
else sale.originalQuantity = sale.quantity;
|
||||
try {
|
||||
if (!sale.id) await addSale(sale);
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
return;
|
||||
}
|
||||
if (!sale.id) return addSale(sale);
|
||||
|
||||
if (await isSalePrepared(sale)) {
|
||||
await confirmUpdate(() => updateQuantity(sale));
|
||||
} else await updateQuantity(sale);
|
||||
};
|
||||
|
||||
const updateQuantity = async (sale) => {
|
||||
try {
|
||||
let { quantity, id } = sale;
|
||||
|
|
@ -219,7 +210,7 @@ const updateQuantity = async (sale) => {
|
|||
(s) => s.id === sale.id,
|
||||
);
|
||||
sale.quantity = quantity;
|
||||
app.config.errorHandler(e);
|
||||
throw e;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -228,7 +219,7 @@ const addSale = async (sale) => {
|
|||
barcode: sale.itemFk,
|
||||
quantity: sale.quantity,
|
||||
};
|
||||
try {
|
||||
|
||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||
|
||||
if (!data) return;
|
||||
|
|
@ -246,9 +237,6 @@ const addSale = async (sale) => {
|
|||
notify('globals.dataSaved', 'positive');
|
||||
sale.isNew = false;
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
const changeConcept = async (sale) => {
|
||||
if (await isSalePrepared(sale)) {
|
||||
|
|
@ -257,14 +245,10 @@ const changeConcept = async (sale) => {
|
|||
};
|
||||
|
||||
const updateConcept = async (sale) => {
|
||||
try {
|
||||
const data = { newConcept: sale.concept };
|
||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const DEFAULT_EDIT = {
|
||||
|
|
@ -275,6 +259,18 @@ const DEFAULT_EDIT = {
|
|||
oldQuantity: null,
|
||||
};
|
||||
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(() => {
|
||||
if (!sales.value) return;
|
||||
|
|
@ -288,21 +284,16 @@ const onOpenEditPricePopover = async (sale) => {
|
|||
};
|
||||
};
|
||||
|
||||
const onOpenEditDiscountPopover = async (sale) => {
|
||||
const onDiscountClick = async (sale) => {
|
||||
if (isLocked.value) return;
|
||||
if (sale) {
|
||||
edit.value = {
|
||||
sale: JSON.parse(JSON.stringify(sale)),
|
||||
discount: sale.discount,
|
||||
};
|
||||
} else {
|
||||
edit.value = {
|
||||
discount: null,
|
||||
sales: selectedValidSales.value,
|
||||
};
|
||||
}
|
||||
};
|
||||
const changePrice = async (sale) => {
|
||||
const changePrice = async (sale, componentName) => {
|
||||
const newPrice = edit.value.price;
|
||||
if (newPrice != null && newPrice != sale.price) {
|
||||
if (await isSalePrepared(sale)) {
|
||||
|
|
@ -311,51 +302,26 @@ const changePrice = async (sale) => {
|
|||
}
|
||||
};
|
||||
const updatePrice = async (sale, newPrice) => {
|
||||
try {
|
||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||
sale.price = newPrice;
|
||||
edit.value = { ...DEFAULT_EDIT };
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const changeDiscount = async (sale) => {
|
||||
const newDiscount = edit.value.discount;
|
||||
if (newDiscount != null && newDiscount != sale.discount) {
|
||||
if (await isSalePrepared(sale))
|
||||
await confirmUpdate(() => updateDiscount([sale], newDiscount));
|
||||
else await updateDiscount([sale], newDiscount);
|
||||
}
|
||||
};
|
||||
const updateDiscount = async (sales, componentName, newDiscount) => {
|
||||
const hasChanges = sales.some((sale) => sale.discount != newDiscount);
|
||||
if (!hasChanges || newDiscount == null || newDiscount === '') return;
|
||||
const canProceed = await Promise.all(sales.map((sale) => isSalePrepared(sale)));
|
||||
if (canProceed.includes(false)) return;
|
||||
|
||||
const updateDiscounts = async (sales, newDiscount) => {
|
||||
const salesTracking = await fetchSalesTracking();
|
||||
const saleIds = sales.map((sale) => sale.id);
|
||||
const params = { salesIds: saleIds, newDiscount, componentName };
|
||||
|
||||
const someSaleIsPrepared = salesTracking.some((sale) =>
|
||||
matchSale(salesTracking, sale),
|
||||
);
|
||||
if (someSaleIsPrepared) await confirmUpdate(() => updateDiscount(sales, newDiscount));
|
||||
else updateDiscount(sales, newDiscount);
|
||||
};
|
||||
|
||||
const updateDiscount = async (sales, newDiscount = 0) => {
|
||||
try {
|
||||
const salesIds = sales.map(({ id }) => id);
|
||||
const params = {
|
||||
salesIds,
|
||||
newDiscount,
|
||||
manaCode: manaCode.value,
|
||||
};
|
||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
return;
|
||||
}
|
||||
for (let sale of sales) sale.discount = params.newDiscount;
|
||||
edit.value = { ...DEFAULT_EDIT };
|
||||
};
|
||||
|
||||
const getNewPrice = computed(() => {
|
||||
|
|
@ -377,42 +343,31 @@ const getNewPrice = computed(() => {
|
|||
});
|
||||
|
||||
const newOrderFromTicket = async () => {
|
||||
try {
|
||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||
ticketFk: Number(route.params.id),
|
||||
});
|
||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||
window.open(routeData.href, '_blank');
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const goToLog = (saleId) => {
|
||||
router.push({
|
||||
name: 'TicketLog',
|
||||
query: {
|
||||
logs: JSON.stringify({
|
||||
originFk: route.params.id,
|
||||
params: {
|
||||
originId: route.params.id,
|
||||
changedModel: 'Sale',
|
||||
changedModelId: saleId,
|
||||
}),
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const changeTicketState = async (val) => {
|
||||
try {
|
||||
stateBtnDropdownRef.value.hide();
|
||||
const params = { ticketFk: route.params.id, code: val };
|
||||
await axios.post('Tickets/state', params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
await resetChanges();
|
||||
};
|
||||
|
||||
const removeSelectedSales = () => {
|
||||
selectedRows.value.forEach((sale) => {
|
||||
const index = sales.value.indexOf(sale);
|
||||
|
|
@ -430,14 +385,10 @@ const removeSales = async () => {
|
|||
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
||||
|
||||
if (params.sales.length == 0) return;
|
||||
try {
|
||||
await axios.post('Sales/deleteSales', params);
|
||||
removeSelectedSales();
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
};
|
||||
|
||||
const setTransferParams = async () => {
|
||||
|
|
@ -624,7 +575,7 @@ watch(
|
|||
:sales="selectedValidSales"
|
||||
:disable="!hasSelectedRows"
|
||||
:ticket-config="ticketConfig"
|
||||
@update-discounts="updateDiscounts"
|
||||
@update-discounts="updateDiscount"
|
||||
@refresh-table="resetChanges"
|
||||
/>
|
||||
<QBtn
|
||||
|
|
@ -813,28 +764,26 @@ watch(
|
|||
</template>
|
||||
<template #column-price="{ row }">
|
||||
<template v-if="isTicketEditable && row.id">
|
||||
<QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
|
||||
<QBtn flat class="link" dense>
|
||||
{{ toCurrency(row.price) }}
|
||||
</QBtn>
|
||||
<TicketEditManaProxy
|
||||
ref="editPriceProxyRef"
|
||||
:sale="row"
|
||||
<TicketEditMana
|
||||
:new-price="getNewPrice"
|
||||
@save="changePrice"
|
||||
@show="onOpenEditPricePopover(row)"
|
||||
@save="(componentName) => updatePrice(row, componentName)"
|
||||
>
|
||||
<VnInput
|
||||
@keyup.enter.stop="() => editManaProxyRef.save(row)"
|
||||
v-model.number="edit.price"
|
||||
:label="t('basicData.price')"
|
||||
type="number"
|
||||
/>
|
||||
</TicketEditManaProxy>
|
||||
</TicketEditMana>
|
||||
</QBtn>
|
||||
</template>
|
||||
<span v-else>{{ toCurrency(row.price) }}</span>
|
||||
</template>
|
||||
<template #column-discount="{ row }">
|
||||
<template v-if="!isLocked && row.id">
|
||||
<QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
|
||||
<QBtn flat class="link" dense>
|
||||
{{ toPercentage(row.discount / 100) }}
|
||||
</QBtn>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { useQuasar } from 'quasar';
|
|||
import { useRouter } from 'vue-router';
|
||||
|
||||
import VnSmsDialog from 'components/common/VnSmsDialog.vue';
|
||||
import TicketEditManaProxy from './TicketEditMana.vue';
|
||||
import TicketEditMana from './TicketEditMana.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
|
@ -14,7 +14,7 @@ import { toDateFormat } from 'src/filters/date';
|
|||
import { useAcl } from 'src/composables/useAcl';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
|
||||
const emit = defineEmits(['updateDiscounts', 'getMana', 'refreshTable']);
|
||||
const emit = defineEmits(['updateDiscounts', 'refreshTable']);
|
||||
|
||||
const props = defineProps({
|
||||
disable: {
|
||||
|
|
@ -28,7 +28,6 @@ const props = defineProps({
|
|||
ticket: {
|
||||
type: Object,
|
||||
required: true,
|
||||
default: () => {},
|
||||
},
|
||||
sales: {
|
||||
type: Array,
|
||||
|
|
@ -55,12 +54,13 @@ const isClaimable = computed(() => {
|
|||
if (ticket.value) {
|
||||
const landedPlusWeek = new Date(ticket.value.landed);
|
||||
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
||||
const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
|
||||
const createAfterDeadline = acl.hasAny([
|
||||
{ model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
|
||||
]);
|
||||
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
const sendSms = async (params) => {
|
||||
await axios.post(`Tickets/${ticket.value.id}/sendSms`, params);
|
||||
notify(t('SMS sent'), 'positive');
|
||||
|
|
@ -106,13 +106,9 @@ const calculateSalePrice = async () => {
|
|||
emit('refreshTable', props.sales);
|
||||
};
|
||||
|
||||
const changeMultipleDiscount = () => {
|
||||
const hasChanges = props.sales.some((sale) => {
|
||||
return sale.discount != newDiscount.value;
|
||||
});
|
||||
|
||||
if (newDiscount.value != null && hasChanges)
|
||||
emit('updateDiscounts', props.sales, newDiscount.value);
|
||||
const changeMultipleDiscount = (componentName, newDiscount) => {
|
||||
if (newDiscount != null)
|
||||
emit('updateDiscounts', props.sales, componentName, newDiscount);
|
||||
btnDropdownRef.value.hide();
|
||||
};
|
||||
|
||||
|
|
@ -193,19 +189,15 @@ const createRefund = async (withWarehouse) => {
|
|||
<QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem
|
||||
clickable
|
||||
v-ripple
|
||||
@click="emit('getMana')"
|
||||
data-cy="updateDiscountItem"
|
||||
>
|
||||
<QItem clickable v-ripple data-cy="updateDiscountItem">
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ t('Update discount') }}</QItemLabel>
|
||||
</QItemSection>
|
||||
<TicketEditManaProxy
|
||||
ref="editManaProxyRef"
|
||||
:sale="row"
|
||||
@save="changeMultipleDiscount"
|
||||
<TicketEditMana
|
||||
@save="
|
||||
(componentName) =>
|
||||
changeMultipleDiscount(componentName, newDiscount)
|
||||
"
|
||||
>
|
||||
<VnInput
|
||||
autofocus
|
||||
|
|
@ -215,7 +207,7 @@ const createRefund = async (withWarehouse) => {
|
|||
type="number"
|
||||
data-cy="ticketSaleDiscountInput"
|
||||
/>
|
||||
</TicketEditManaProxy>
|
||||
</TicketEditMana>
|
||||
</QItem>
|
||||
<QItem
|
||||
v-if="isClaimable"
|
||||
|
|
@ -229,6 +221,18 @@ const createRefund = async (withWarehouse) => {
|
|||
<QItemLabel>{{ t('Add claim') }}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem
|
||||
v-if="isTicketEditable"
|
||||
clickable
|
||||
v-close-popup
|
||||
v-ripple
|
||||
@click="setReserved(true)"
|
||||
data-cy="markAsReservedItem"
|
||||
>
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem clickable v-ripple data-cy="ticketSaleRefundItem">
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ t('Refund') }}</QItemLabel>
|
||||
|
|
@ -274,6 +278,8 @@ es:
|
|||
Recalculate price: Recalcular precio
|
||||
Update discount: Actualizar descuento
|
||||
Add claim: Crear reclamación
|
||||
Mark as reserved: Marcar como reservado
|
||||
Unmark as reserved: Desmarcar como reservado
|
||||
Refund: Abono
|
||||
with warehouse: con almacén
|
||||
without warehouse: sin almacén
|
||||
|
|
|
|||
|
|
@ -22,6 +22,16 @@ const states = ref([]);
|
|||
const agencies = ref([]);
|
||||
const warehouses = ref([]);
|
||||
const groupedStates = ref([]);
|
||||
|
||||
const getGroupedStates = (data) => {
|
||||
for (const state of data) {
|
||||
groupedStates.value.push({
|
||||
id: state.id,
|
||||
name: t(`${state.code}`),
|
||||
code: state.code,
|
||||
});
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -29,11 +39,12 @@ const groupedStates = ref([]);
|
|||
<FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
|
||||
<FetchData
|
||||
url="AlertLevels"
|
||||
auto-load
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(groupedStates = data.map((x) => Object.assign(x, { code: t(x.code) })))
|
||||
(data) => {
|
||||
getGroupedStates(data);
|
||||
}
|
||||
"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="AgencyModes"
|
||||
|
|
@ -115,11 +126,12 @@ const groupedStates = ref([]);
|
|||
</QItemSection>
|
||||
<QItemSection v-if="groupedStates">
|
||||
<VnSelect
|
||||
:label="t('params.groupedStates')"
|
||||
:label="t('Grouped state')"
|
||||
v-model="params.groupedStates"
|
||||
@update:model-value="searchFn()"
|
||||
:options="groupedStates"
|
||||
option-label="code"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
|
|
@ -292,7 +304,7 @@ en:
|
|||
ON_PREPARATION: On preparation
|
||||
PACKED: Packed
|
||||
DELIVERED: Delivered
|
||||
ON_PREVIOUS: On previous
|
||||
ON_PREVIOUS: ON_PREVIOUS
|
||||
es:
|
||||
params:
|
||||
search: Contiene
|
||||
|
|
@ -337,7 +349,7 @@ es:
|
|||
ON_PREPARATION: En preparación
|
||||
PACKED: Encajado
|
||||
DELIVERED: Servido
|
||||
ON_PREVIOUS: En previa
|
||||
ON_PREVIOUS: ON_PREVIOUS
|
||||
Collection: Colección
|
||||
Nickname: Nombre mostrado
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'shippedDate',
|
||||
name: 'shipped',
|
||||
cardVisible: true,
|
||||
label: t('ticketList.shipped'),
|
||||
columnFilter: {
|
||||
|
|
@ -123,7 +123,7 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'shippedHour',
|
||||
name: 'shipped',
|
||||
component: 'time',
|
||||
columnFilter: false,
|
||||
label: t('ticketList.hour'),
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ ticketSale:
|
|||
available: Available
|
||||
discount: Disc
|
||||
packaging: Packaging
|
||||
pack: Pack.
|
||||
subtotal: Subtotal
|
||||
tax: VAT
|
||||
history: History
|
||||
|
|
@ -205,7 +206,6 @@ ticketList:
|
|||
toLines: Go to lines
|
||||
addressNickname: Address nickname
|
||||
ref: Reference
|
||||
hour: Hour
|
||||
rounding: Rounding
|
||||
noVerifiedData: No verified data
|
||||
purchaseRequest: Purchase request
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ ticketSale:
|
|||
available: Disponible
|
||||
discount: Dto
|
||||
packaging: Encajado
|
||||
pack: Enc.
|
||||
subtotal: Subtotal
|
||||
tax: IVA
|
||||
history: Historial
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ import filter from './TravelFilter.js';
|
|||
data-key="Travel"
|
||||
url="Travels"
|
||||
:descriptor="TravelDescriptor"
|
||||
:filter="{ ...filter, where: { id: $route.params.id } }"
|
||||
:filter="filter"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
|
|||
:to="{
|
||||
name: 'TravelList',
|
||||
query: {
|
||||
table: JSON.stringify({
|
||||
params: JSON.stringify({
|
||||
agencyModeFk: entity.agencyModeFk,
|
||||
}),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ const cloneTravelWithEntries = async () => {
|
|||
router.push({ name: 'TravelBasicData', params: { id: data.id } });
|
||||
};
|
||||
|
||||
const canDelete = computed(() => useAcl().hasAcl('Travel', '*', 'WRITE'));
|
||||
const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
|
||||
|
||||
const openDeleteEntryDialog = (id) => {
|
||||
quasar
|
||||
|
|
|
|||
|
|
@ -410,18 +410,18 @@ onMounted(async () => {
|
|||
</template>
|
||||
</QTable>
|
||||
</QCard>
|
||||
|
||||
<QCard class="full-width" v-if="thermographs.length > 0">
|
||||
<FetchData
|
||||
url="Warehouses"
|
||||
:filter="{ fields: ['id', 'name'] }"
|
||||
order="name"
|
||||
@on-fetch="(data) => (warehouses = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnTitle
|
||||
:url="getLink('thermographs')"
|
||||
:text="t('travel.summary.thermographs')"
|
||||
/>
|
||||
<RouterLink
|
||||
class="header header-link"
|
||||
:to="{
|
||||
name: 'TravelThermographsIndex',
|
||||
params: { id: travel.id },
|
||||
}"
|
||||
>
|
||||
{{ t('travel.summary.thermographs') }}
|
||||
<QIcon name="open_in_new" />
|
||||
</RouterLink>
|
||||
<QTable
|
||||
:rows="thermographs"
|
||||
:columns="thermographsTableColumns"
|
||||
|
|
|
|||
|
|
@ -182,6 +182,7 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
showValue: false,
|
||||
sortable: true,
|
||||
style: 'min-width: 170px;',
|
||||
},
|
||||
{
|
||||
label: t('globals.packages'),
|
||||
|
|
@ -580,20 +581,19 @@ watch(route, () => {
|
|||
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
||||
<EntryDescriptorProxy :id="entry.id" />
|
||||
</QTd>
|
||||
<QTd :colspan="2">
|
||||
<div style="display: flex">
|
||||
<span class="link">
|
||||
{{ entry.supplierName }}
|
||||
<QTd>
|
||||
<QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
|
||||
<SupplierDescriptorProxy :id="entry.supplierFk" />
|
||||
</span>
|
||||
</QTd>
|
||||
<QTd class="text-center">
|
||||
<QIcon
|
||||
v-if="entry.isCustomInspectionRequired"
|
||||
name="warning"
|
||||
color="negative"
|
||||
size="md"
|
||||
:title="t('extraCommunity.requiresInspection')"
|
||||
/>
|
||||
</div>
|
||||
>
|
||||
</QIcon>
|
||||
</QTd>
|
||||
<QTd class="text-right">
|
||||
<span>{{ toCurrency(entry.invoiceAmount) }}</span>
|
||||
|
|
@ -629,17 +629,15 @@ watch(route, () => {
|
|||
}
|
||||
|
||||
:deep(.q-table) {
|
||||
table-layout: auto;
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
tbody tr td {
|
||||
&:nth-child(1) {
|
||||
max-width: 65px;
|
||||
}
|
||||
padding: 0 5px 0;
|
||||
&:nth-child(4) {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
thead > tr > th {
|
||||
padding: 3px;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@ const router = useRouter();
|
|||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const acl = useAcl();
|
||||
const canSeeNotes = computed(() => acl.hasAcl('Worker', '__get__business', 'READ'));
|
||||
const canSeeNotes = computed(() =>
|
||||
acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
|
||||
);
|
||||
const workerIsFreelance = ref();
|
||||
const WorkerFreelanceRef = ref();
|
||||
const workerCalendarFilterRef = ref(null);
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
|
|||
<template #body="{ entity }">
|
||||
<VnLv :label="t('globals.user')" :value="entity.user?.name" />
|
||||
<VnLv
|
||||
class="ellipsis"
|
||||
class="ellipsis-text"
|
||||
:label="t('globals.params.email')"
|
||||
:value="entity.user?.emailUser?.email"
|
||||
copy
|
||||
|
|
@ -128,13 +128,15 @@ const handlePhotoUpdated = (evt = false) => {
|
|||
</template>
|
||||
</VnLv>
|
||||
|
||||
<VnLv :label="t('globals.phone')">
|
||||
<template #value>
|
||||
<VnLv :value="entity.phone">
|
||||
<template #label>
|
||||
{{ t('globals.phone') }}
|
||||
<VnLinkPhone :phone-number="entity.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('worker.summary.sipExtension')">
|
||||
<template #value>
|
||||
<VnLv :value="entity?.sip?.extension">
|
||||
<template #label>
|
||||
{{ t('worker.summary.sipExtension') }}
|
||||
<VnLinkPhone :phone-number="entity?.sip?.extension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
|||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
|
||||
const { hasAcl } = useAcl();
|
||||
const { hasAny } = useAcl();
|
||||
const { t } = useI18n();
|
||||
const fetchData = ref();
|
||||
const originaLockerId = ref();
|
||||
|
|
@ -58,7 +58,11 @@ const init = async (data) => {
|
|||
option-label="code"
|
||||
option-value="id"
|
||||
hide-selected
|
||||
:readonly="!hasAcl('Worker', '__get__locker', 'READ')"
|
||||
:readonly="
|
||||
!hasAny([
|
||||
{ model: 'Worker', props: '__get__locker', accessType: 'READ' },
|
||||
])
|
||||
"
|
||||
/>
|
||||
</template>
|
||||
</FormModel>
|
||||
|
|
|
|||
|
|
@ -73,25 +73,28 @@ onBeforeMount(async () => {
|
|||
/>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('worker.summary.phoneExtension')">
|
||||
<template #value>
|
||||
<VnLv :value="worker.mobileExtension">
|
||||
<template #label>
|
||||
{{ t('worker.summary.phoneExtension') }}
|
||||
<VnLinkPhone :phone-number="worker.mobileExtension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('worker.summary.entPhone')">
|
||||
<template #value>
|
||||
<VnLv :value="worker.phone">
|
||||
<template #label>
|
||||
{{ t('worker.summary.entPhone') }}
|
||||
<VnLinkPhone :phone-number="worker.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('worker.summary.personalPhone')">
|
||||
<template #value>
|
||||
<VnLv :value="advancedSummary?.client?.phone">
|
||||
<template #label>
|
||||
{{ t('worker.summary.personalPhone') }}
|
||||
<VnLinkPhone
|
||||
:phone-number="advancedSummary?.client?.phone"
|
||||
/>
|
||||
</template>
|
||||
</VnLv>
|
||||
</div>
|
||||
<div class="vn-card-content" v-if="advancedSummary">
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('worker.summary.fiDueDate')"
|
||||
:value="toDate(advancedSummary.fiDueDate)"
|
||||
|
|
@ -132,7 +135,6 @@ onBeforeMount(async () => {
|
|||
<VnTitle :text="t('worker.summary.userData')" />
|
||||
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
|
||||
<VnLv
|
||||
class="ellipsis"
|
||||
:label="t('globals.params.email')"
|
||||
:value="worker.user?.emailUser?.email"
|
||||
copy
|
||||
|
|
@ -145,8 +147,9 @@ onBeforeMount(async () => {
|
|||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('worker.summary.sipExtension')">
|
||||
<template #value>
|
||||
<VnLv :value="worker?.sip?.extension">
|
||||
<template #label>
|
||||
{{ t('worker.summary.sipExtension') }}
|
||||
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
|
|
|
|||
|
|
@ -68,9 +68,13 @@ const arrayData = useArrayData('Worker');
|
|||
const acl = useAcl();
|
||||
const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
|
||||
const worker = computed(() => arrayData.store?.data);
|
||||
const canSend = computed(() => acl.hasAcl('WorkerTimeControl', 'sendMail', 'WRITE'));
|
||||
const canSend = computed(() =>
|
||||
acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }]),
|
||||
);
|
||||
const canUpdate = computed(() =>
|
||||
acl.hasAcl('WorkerTimeControl', 'updateMailState', 'WRITE'),
|
||||
acl.hasAny([
|
||||
{ model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
|
||||
]),
|
||||
);
|
||||
const isHimself = computed(() => user.value.id === Number(route.params.id));
|
||||
|
||||
|
|
|
|||
|
|
@ -102,11 +102,8 @@ en:
|
|||
lastName: Last name
|
||||
userName: User
|
||||
extension: Extension
|
||||
departmentFk: Department
|
||||
es:
|
||||
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Contiene
|
||||
firstName: Nombre
|
||||
lastName: Apellidos
|
||||
|
|
|
|||
|
|
@ -75,13 +75,13 @@ onMounted(async () => {
|
|||
<template #body="{ entity: zone }">
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<div class="card-group">
|
||||
<div class="card-content">
|
||||
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
|
||||
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
|
||||
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<div class="card-content">
|
||||
<VnLv
|
||||
:label="t('summary.closeHour')"
|
||||
:value="toTimeFormat(zone.hour)"
|
||||
|
|
@ -98,7 +98,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
</QCard>
|
||||
<QCard class="vn-max">
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
|
||||
<QTable
|
||||
:columns="columns"
|
||||
|
|
@ -109,3 +109,15 @@ onMounted(async () => {
|
|||
</template>
|
||||
</CardSummary>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.card-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.card-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ const vehicleCard = {
|
|||
component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
|
||||
redirect: { name: 'VehicleSummary' },
|
||||
meta: {
|
||||
menu: ['VehicleBasicData', 'VehicleNotes'],
|
||||
menu: ['VehicleBasicData'],
|
||||
},
|
||||
children: [
|
||||
{
|
||||
|
|
@ -187,15 +187,6 @@ const vehicleCard = {
|
|||
},
|
||||
component: () => import('src/pages/Route/Vehicle/Card/VehicleBasicData.vue'),
|
||||
},
|
||||
{
|
||||
name: 'VehicleNotes',
|
||||
path: 'notes',
|
||||
meta: {
|
||||
title: 'notes',
|
||||
icon: 'vn:notes',
|
||||
},
|
||||
component: () => import('src/pages/Route/Vehicle/Card/VehicleNotes.vue'),
|
||||
}
|
||||
],
|
||||
};
|
||||
|
||||
|
|
@ -238,7 +229,6 @@ export default {
|
|||
title: 'list',
|
||||
icon: 'view_list',
|
||||
},
|
||||
component: () => import('src/pages/Route/RouteList.vue'),
|
||||
},
|
||||
routeCard,
|
||||
],
|
||||
|
|
@ -287,7 +277,6 @@ export default {
|
|||
title: 'list',
|
||||
icon: 'view_list',
|
||||
},
|
||||
component: () => import('src/pages/Route/RouteRoadmap.vue'),
|
||||
},
|
||||
roadmapCard,
|
||||
],
|
||||
|
|
@ -318,8 +307,6 @@ export default {
|
|||
title: 'list',
|
||||
icon: 'view_list',
|
||||
},
|
||||
component: () =>
|
||||
import('src/pages/Route/Agency/AgencyList.vue'),
|
||||
},
|
||||
agencyCard,
|
||||
],
|
||||
|
|
@ -341,8 +328,6 @@ export default {
|
|||
title: 'vehicleList',
|
||||
icon: 'directions_car',
|
||||
},
|
||||
component: () =>
|
||||
import('src/pages/Route/Vehicle/VehicleList.vue'),
|
||||
},
|
||||
vehicleCard,
|
||||
],
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
|
|||
navigate: null,
|
||||
page: 1,
|
||||
mapKey: 'id',
|
||||
keepData: false,
|
||||
oneRecord: false,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
#!/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
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
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));
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
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);
|
||||
});
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
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 };
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
describe('Account descriptor', () => {
|
||||
describe('ClaimNotes', () => {
|
||||
const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
|
||||
const url = '/#/account/1/summary';
|
||||
|
||||
|
|
@ -7,9 +7,6 @@ describe('Account descriptor', () => {
|
|||
cy.visit(url);
|
||||
cy.dataCy('descriptor-more-opts').click();
|
||||
cy.get(descriptorOptions)
|
||||
.should('exist')
|
||||
.should('be.visible')
|
||||
|
||||
.find('.q-item')
|
||||
.its('length')
|
||||
.then((count) => {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue