Merge branch 'dev' into 7065-testUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
5f45434d89
154
CHANGELOG.md
154
CHANGELOG.md
|
@ -1,3 +1,157 @@
|
||||||
|
# Version 25.04 - 2025-01-28
|
||||||
|
|
||||||
|
### Added 🆕
|
||||||
|
|
||||||
|
- chore: add task comment by:jorgep
|
||||||
|
- chore: refs #8198 rollback by:jorgep
|
||||||
|
- chore: refs #8322 unnecessary prop by:alexm
|
||||||
|
- feat: refs #7055 added new test case by:provira
|
||||||
|
- feat: refs #7055 created FilterItemForm test by:provira
|
||||||
|
- feat: refs #7077 created test for VnInputTime by:provira
|
||||||
|
- feat: refs #7078 created test for VnJsonValue by:provira
|
||||||
|
- feat: refs #7087 added more test cases by:provira
|
||||||
|
- feat: refs #7087 added new test by:provira
|
||||||
|
- feat: refs #7087 created CardSummary test by:provira
|
||||||
|
- feat: refs #7088 created test for FetchedTags by:provira
|
||||||
|
- feat: refs #7202 added new field by:Jon
|
||||||
|
- feat: refs #7882 Added coords to create a address by:guillermo
|
||||||
|
- feat: refs #7957 add tooltip and i18n support for search link in VnSearchbar component by:jorgep
|
||||||
|
- feat: refs #7957 enhance search functionality and improve data filtering logic by:jorgep
|
||||||
|
- feat: refs #7957 open in new tab by:jorgep
|
||||||
|
- feat: refs #7957 simplify fn to by:jorgep
|
||||||
|
- feat: refs #7957 update VnSearchbar component with improved search URL handling and styling enhancements by:jorgep
|
||||||
|
- feat: refs #8117 filters and values added as needed by:jtubau
|
||||||
|
- feat: refs #8197 useHasContent and use in VnSection and RightMenu by:alexm
|
||||||
|
- feat: refs #8219 added invoice out e2e tests by:Jon
|
||||||
|
- feat: refs #8219 global invoicing e2e by:Jon
|
||||||
|
- feat: refs #8220 added barcodes e2e test by:Jon
|
||||||
|
- feat: refs #8220 created items e2e by:Jon
|
||||||
|
- feat: refs #8220 modified create item form and added respective e2e by:Jon
|
||||||
|
- feat: refs #8225 added account and invoiceOut modules by:Jon
|
||||||
|
- feat: refs #8225 added entry module and fixed translations by:Jon
|
||||||
|
- feat: refs #8225 added invoiceIn and travel module by:Jon
|
||||||
|
- feat: refs #8225 added moreOptions and use it in customer and ticket summary by:Jon
|
||||||
|
- feat: refs #8225 added route and shelving module by:Jon
|
||||||
|
- feat: refs #8225 added worker and zone modules by:Jon
|
||||||
|
- feat: refs #8225 use it in claim, item and order modules by:Jon
|
||||||
|
- feat: refs #8258 added button to pass to uppercase by:provira
|
||||||
|
- feat: refs #8258 added uppercase option to VnInput by:provira
|
||||||
|
- feat: refs #8258 added uppercase validation on supplier create by:provira
|
||||||
|
- feat: refs #8298 add price optimum input and update translations for bonus and price optimum by:jgallego
|
||||||
|
- feat: refs #8316 add entryFilter prop to VnTable component in EntryList by:jtubau
|
||||||
|
- feat: refs #8322 added department changes by:provira
|
||||||
|
- feat: refs #8372 workerPBX by:robert
|
||||||
|
- feat: refs #8381 add initial and final temperature fields to entry forms and summaries by:jgallego
|
||||||
|
- feat: refs #8381 add initial and final temperature labels in English and Spanish locales by:jgallego
|
||||||
|
- feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries by:jgallego
|
||||||
|
- feat: skip tests by:jorgep
|
||||||
|
- style: refs #7957 update VnSearchbar padding for improved layout by:jorgep
|
||||||
|
|
||||||
|
### Changed 📦
|
||||||
|
|
||||||
|
- perf: refs #8219 #8219 minor change by:Javier Segarra
|
||||||
|
- perf: refs #8220 on-fetch and added missing translations by:Jon
|
||||||
|
- perf: refs #8220 on-fetch by:Jon
|
||||||
|
- perf: refs #8220 translations by:Jon
|
||||||
|
- perf: refs #8220 use searchbar selector in e2e tests by:Jon
|
||||||
|
- perf: remove warning default value by:Javier Segarra
|
||||||
|
- refactor: redirect using params by:Jon
|
||||||
|
- refactor: refs #7077 removed some comments by:provira
|
||||||
|
- refactor: refs #7087 removed unused imports by:provira
|
||||||
|
- refactor: refs #7100 added const mockData by:jtubau
|
||||||
|
- refactor: refs #7100 delete unnecesary set prop by:jtubau
|
||||||
|
- refactor: refs #7100 refactorized with methods by:jtubau
|
||||||
|
- refactor: refs #7957 remove blank by:jorgep
|
||||||
|
- refactor: refs #8198 simplify data fetching and filtering logic by:jorgep
|
||||||
|
- refactor: refs #8198 simplify state management and data fetching in ItemDiary component by:jorgep
|
||||||
|
- refactor: refs #8219 modified e2e tests and fixed some translations by:Jon
|
||||||
|
- refactor: refs #8219 modified list test, created cypress download folder and added to gitignore by:Jon
|
||||||
|
- refactor: refs #8219 requested changes by:Jon
|
||||||
|
- refactor: refs #8219 use checkNotification command by:Jon
|
||||||
|
- refactor: refs #8220 added data-cy for e2e tests by:Jon
|
||||||
|
- refactor: refs #8220 requested changes by:Jon
|
||||||
|
- refactor: refs #8220 skip failling test and modifed tag test by:Jon
|
||||||
|
- refactor: refs #8225 requested changes by:Jon
|
||||||
|
- refactor: refs #8247 use new acl for sysadmin by:Jon
|
||||||
|
- refactor: refs #8316 added claimFilter by:jtubau
|
||||||
|
- refactor: refs #8316 added entryFilter by:jtubau
|
||||||
|
- refactor: refs #8316 add new localization keys and update existing ones for entry components by:jtubau
|
||||||
|
- refactor: refs #8316 moved localizations to local locale by:jtubau
|
||||||
|
- refactor: refs #8316 move order localization by:jtubau
|
||||||
|
- refactor: refs #8316 remove unused OrderSearchbar component by:jtubau
|
||||||
|
- refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList by:jtubau
|
||||||
|
- refactor: refs #8316 used VnSection and VnCardBeta by:jtubau
|
||||||
|
- refactor: refs #8322 changed translations by:provira
|
||||||
|
- refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta by:provira
|
||||||
|
- refactor: refs #8322 set department inside worker by:alexm
|
||||||
|
- refactor: skip intermitent failing test by:Jon
|
||||||
|
|
||||||
|
### Fixed 🛠️
|
||||||
|
|
||||||
|
- feat: refs #8225 added entry module and fixed translations by:Jon
|
||||||
|
- fix: added missing translations in InvoiceIn by:provira
|
||||||
|
- fix: changed invoiceIn for InvoiceIn by:provira
|
||||||
|
- fix: changed translations to only use "invoicein" by:provira
|
||||||
|
- fix: department descriptor link by:Jon
|
||||||
|
- fix: e2e tests by:Jon
|
||||||
|
- fix: entry summary view and build warnings by:Jon
|
||||||
|
- fix: fixed InvoiceIn filter translations by:provira
|
||||||
|
- fix: modified setData in customerDescriptor to show the icons by:Jon
|
||||||
|
- fix: redirect to TicketSale from OrderLines (origin/Fix-RedirectToTicketSale) by:Jon
|
||||||
|
- fix: redirect when confirming lines by:Jon
|
||||||
|
- fix: refs #7055 #7055 #7055 fixed some tests by:provira
|
||||||
|
- fix: refs #7077 removed unused imports by:provira
|
||||||
|
- fix: refs #7078 added missing case with array by:provira
|
||||||
|
- fix: refs #7087 fixed some tests by:provira
|
||||||
|
- fix: refs #7088 changed "vm.vm" to "vm" by:provira
|
||||||
|
- fix: refs #7088 changed wrapper to vm by:provira
|
||||||
|
- fix: refs #7699 add icons and hint by:carlossa
|
||||||
|
- fix: refs #7699 add pwd vnInput by:carlossa
|
||||||
|
- fix: refs #7699 fix component by:carlossa
|
||||||
|
- fix: refs #7699 fix password visibility by:carlossa
|
||||||
|
- fix: refs #7699 fix tfront clean code by:carlossa
|
||||||
|
- fix: refs #7699 fix vnChangePassword, clean VnInput by:carlossa
|
||||||
|
- fix: refs #7699 fix vnInputPassword by:carlossa
|
||||||
|
- fix: refs #7957 add missing closing brace by:jorgep
|
||||||
|
- fix: refs #7957 css by:jorgep
|
||||||
|
- fix: refs #7957 rollback by:jorgep
|
||||||
|
- fix: refs #7957 update data-cy by:jorgep
|
||||||
|
- fix: refs #7957 update visibility handling for clear icon in VnInput component by:jorgep
|
||||||
|
- fix: refs #7957 vn-searchbar test by:jorgep
|
||||||
|
- fix: refs #8117 update salesPersonFk filter options and URL for improved data retrieval by:jtubau
|
||||||
|
- fix: refs #8197 not use yet by:alexm
|
||||||
|
- fix: refs #8198 update query param by:jorgep
|
||||||
|
- fix: refs #8219 fixed e2e tests by:Jon
|
||||||
|
- fix: refs #8219 fixed summary and global tests by:Jon
|
||||||
|
- fix: refs #8219 forgotten dataCy by:Jon
|
||||||
|
- fix: refs #8219 global e2e by:Jon
|
||||||
|
- fix: refs #8219 requested changes by:Jon
|
||||||
|
- fix: refs #8220 itemTag test by:Javier Segarra
|
||||||
|
- fix: refs #8225 invoice in translations by:Jon
|
||||||
|
- fix: refs #8243 fixed SkeletonSummary by:provira
|
||||||
|
- fix: refs #8247 conflicts by:Jon
|
||||||
|
- fix: refs #8247 fixed acls and added lost options by:Jon
|
||||||
|
- fix: refs #8316 ref="claimFilterRef" by:alexm
|
||||||
|
- fix: refs #8316 userFilter by:alexm
|
||||||
|
- fix: refs #8316 use rightMenu by:alexm
|
||||||
|
- fix: refs #8316 use section-searchbar by:alexm
|
||||||
|
- fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice by:jtubau
|
||||||
|
- fix: refs #8322 unnecessary section by:alexm
|
||||||
|
- fix: refs #8338 fixed VnTable translations by:provira
|
||||||
|
- fix: refs #8338 removed chipLocale property/added more translations by:provira
|
||||||
|
- fix: refs #8448 e2e by:Jon
|
||||||
|
- fix: refs #8448 not use croppie by:alexm
|
||||||
|
- fix: remove departmentCode by:Javier Segarra
|
||||||
|
- fix: removed unused searchbar by:PAU ROVIRA ROSALENY
|
||||||
|
- fix: skip failling e2e by:Jon
|
||||||
|
- fix: sort by name in description by:Jon
|
||||||
|
- fix: translations by:Jon
|
||||||
|
- fix: use entryFilter by:alexm
|
||||||
|
- fix(VnCardBeta): add userFilter by:alexm
|
||||||
|
- refactor: refs #8219 modified e2e tests and fixed some translations by:Jon
|
||||||
|
- revert: revert header by:alexm
|
||||||
|
- test: fix expedition e2e by:alexm
|
||||||
|
|
||||||
# Version 25.00 - 2025-01-14
|
# Version 25.00 - 2025-01-14
|
||||||
|
|
||||||
### Added 🆕
|
### Added 🆕
|
||||||
|
|
|
@ -453,6 +453,7 @@ ticket:
|
||||||
service: Service
|
service: Service
|
||||||
attender: Attender
|
attender: Attender
|
||||||
ok: Ok
|
ok: Ok
|
||||||
|
consigneeStreet: Street
|
||||||
create:
|
create:
|
||||||
address: Address
|
address: Address
|
||||||
invoiceOut:
|
invoiceOut:
|
||||||
|
|
|
@ -448,6 +448,7 @@ ticket:
|
||||||
purchaseRequest: Petición de compra
|
purchaseRequest: Petición de compra
|
||||||
service: Servicio
|
service: Servicio
|
||||||
attender: Consignatario
|
attender: Consignatario
|
||||||
|
consigneeStreet: Dirección
|
||||||
create:
|
create:
|
||||||
address: Dirección
|
address: Dirección
|
||||||
order:
|
order:
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||||
|
@ -169,9 +170,16 @@ en:
|
||||||
fi: FI
|
fi: FI
|
||||||
salesPersonFk: Salesperson
|
salesPersonFk: Salesperson
|
||||||
provinceFk: Province
|
provinceFk: Province
|
||||||
|
isActive: Is active
|
||||||
city: City
|
city: City
|
||||||
phone: Phone
|
phone: Phone
|
||||||
email: Email
|
email: Email
|
||||||
|
isToBeMailed: Mailed
|
||||||
|
isEqualizated: Equailized
|
||||||
|
businessTypeFk: Business type
|
||||||
|
sageTaxTypeFk: Sage Tax Type
|
||||||
|
sageTransactionTypeFk: Sage Tax Type
|
||||||
|
payMethodFk: Billing data
|
||||||
zoneFk: Zone
|
zoneFk: Zone
|
||||||
socialName : Social name
|
socialName : Social name
|
||||||
name: Name
|
name: Name
|
||||||
|
@ -180,6 +188,13 @@ es:
|
||||||
params:
|
params:
|
||||||
search: Contiene
|
search: Contiene
|
||||||
fi: NIF
|
fi: NIF
|
||||||
|
isActive: Activo
|
||||||
|
isToBeMailed: A enviar
|
||||||
|
isEqualizated: Recargo de equivalencia
|
||||||
|
businessTypeFk: Tipo de negocio
|
||||||
|
sageTaxTypeFk: Tipo de impuesto Sage
|
||||||
|
sageTransactionTypeFk: Tipo de impuesto Sage
|
||||||
|
payMethodFk: Forma de pago
|
||||||
salesPersonFk: Comercial
|
salesPersonFk: Comercial
|
||||||
provinceFk: Provincia
|
provinceFk: Provincia
|
||||||
city: Ciudad
|
city: Ciudad
|
||||||
|
|
|
@ -38,8 +38,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('globals.name'),
|
|
||||||
name: 'name',
|
name: 'name',
|
||||||
|
label: t('globals.name'),
|
||||||
isTitle: true,
|
isTitle: true,
|
||||||
create: true,
|
create: true,
|
||||||
columnClass: 'expand',
|
columnClass: 'expand',
|
||||||
|
@ -51,25 +51,30 @@ const columns = computed(() => [
|
||||||
isTitle: true,
|
isTitle: true,
|
||||||
create: true,
|
create: true,
|
||||||
columnClass: 'expand',
|
columnClass: 'expand',
|
||||||
attrs: {
|
|
||||||
uppercase: true,
|
|
||||||
},
|
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
|
url: 'Clients',
|
||||||
|
fields: ['socialName'],
|
||||||
|
optionLabel: 'socialName',
|
||||||
|
optionValue: 'socialName',
|
||||||
uppercase: false,
|
uppercase: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
attrs: {
|
||||||
|
uppercase: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.fi'),
|
|
||||||
name: 'fi',
|
name: 'fi',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.fi'),
|
||||||
create: true,
|
create: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
|
|
||||||
name: 'salesPersonFk',
|
name: 'salesPersonFk',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'Workers/activeWithInheritedRole',
|
url: 'Workers/activeWithInheritedRole',
|
||||||
|
@ -85,8 +90,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.credit'),
|
|
||||||
name: 'credit',
|
name: 'credit',
|
||||||
|
label: t('customer.summary.credit'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'number',
|
component: 'number',
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
|
@ -94,8 +99,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
|
|
||||||
name: 'creditInsurance',
|
name: 'creditInsurance',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'number',
|
component: 'number',
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
|
@ -103,8 +108,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.phone'),
|
|
||||||
name: 'phone',
|
name: 'phone',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.phone'),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'number',
|
component: 'number',
|
||||||
|
@ -123,8 +128,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.mobile'),
|
|
||||||
name: 'mobile',
|
name: 'mobile',
|
||||||
|
label: t('customer.summary.mobile'),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'number',
|
component: 'number',
|
||||||
|
@ -133,8 +138,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.street'),
|
|
||||||
name: 'street',
|
name: 'street',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.street'),
|
||||||
create: true,
|
create: true,
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
|
@ -143,8 +148,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.countryFk'),
|
|
||||||
name: 'countryFk',
|
name: 'countryFk',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.countryFk'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'select',
|
component: 'select',
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
|
@ -157,8 +162,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
|
|
||||||
name: 'provinceFk',
|
name: 'provinceFk',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'Provinces',
|
url: 'Provinces',
|
||||||
|
@ -170,24 +175,24 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.city'),
|
|
||||||
name: 'city',
|
name: 'city',
|
||||||
|
label: t('customer.summary.city'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.postcode'),
|
|
||||||
name: 'postcode',
|
name: 'postcode',
|
||||||
|
label: t('customer.summary.postcode'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('globals.params.email'),
|
|
||||||
name: 'email',
|
name: 'email',
|
||||||
|
label: t('globals.params.email'),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.created'),
|
|
||||||
name: 'created',
|
name: 'created',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.created'),
|
||||||
format: ({ created }) => toDate(created),
|
format: ({ created }) => toDate(created),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'date',
|
component: 'date',
|
||||||
|
@ -197,10 +202,13 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
|
|
||||||
name: 'businessTypeFk',
|
name: 'businessTypeFk',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
|
||||||
create: true,
|
create: true,
|
||||||
component: 'select',
|
component: 'select',
|
||||||
|
columnFilter: {
|
||||||
|
inWhere: true,
|
||||||
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'BusinessTypes',
|
url: 'BusinessTypes',
|
||||||
fields: ['code', 'description'],
|
fields: ['code', 'description'],
|
||||||
|
@ -215,8 +223,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.payMethodFk'),
|
|
||||||
name: 'payMethodFk',
|
name: 'payMethodFk',
|
||||||
|
label: t('customer.summary.payMethodFk'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
|
@ -236,8 +244,6 @@ const columns = computed(() => [
|
||||||
optionLabel: 'vat',
|
optionLabel: 'vat',
|
||||||
url: 'SageTaxTypes',
|
url: 'SageTaxTypes',
|
||||||
},
|
},
|
||||||
alias: 'sti',
|
|
||||||
inWhere: true,
|
|
||||||
},
|
},
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
|
format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
|
||||||
},
|
},
|
||||||
|
@ -251,15 +257,13 @@ const columns = computed(() => [
|
||||||
optionLabel: 'transaction',
|
optionLabel: 'transaction',
|
||||||
url: 'SageTransactionTypes',
|
url: 'SageTransactionTypes',
|
||||||
},
|
},
|
||||||
alias: 'stt',
|
|
||||||
inWhere: true,
|
|
||||||
},
|
},
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
|
format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.isActive'),
|
|
||||||
name: 'isActive',
|
name: 'isActive',
|
||||||
|
label: t('customer.summary.isActive'),
|
||||||
chip: {
|
chip: {
|
||||||
color: null,
|
color: null,
|
||||||
condition: (value) => !value,
|
condition: (value) => !value,
|
||||||
|
@ -271,24 +275,24 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('globals.isVies'),
|
|
||||||
name: 'isVies',
|
name: 'isVies',
|
||||||
|
label: t('globals.isVies'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
|
|
||||||
name: 'isTaxDataChecked',
|
name: 'isTaxDataChecked',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.isEqualizated'),
|
|
||||||
name: 'isEqualizated',
|
name: 'isEqualizated',
|
||||||
|
label: t('customer.summary.isEqualizated'),
|
||||||
create: true,
|
create: true,
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
|
@ -296,8 +300,8 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
|
|
||||||
name: 'isFreezed',
|
name: 'isFreezed',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
|
||||||
chip: {
|
chip: {
|
||||||
color: null,
|
color: null,
|
||||||
condition: (value) => value,
|
condition: (value) => value,
|
||||||
|
@ -309,48 +313,48 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
|
|
||||||
name: 'hasToInvoice',
|
name: 'hasToInvoice',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
|
|
||||||
name: 'hasToInvoiceByAddress',
|
name: 'hasToInvoiceByAddress',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
|
|
||||||
name: 'isToBeMailed',
|
name: 'isToBeMailed',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.hasLcr'),
|
|
||||||
name: 'hasLcr',
|
name: 'hasLcr',
|
||||||
|
label: t('customer.summary.hasLcr'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.summary.hasCoreVnl'),
|
|
||||||
name: 'hasCoreVnl',
|
name: 'hasCoreVnl',
|
||||||
|
label: t('customer.summary.hasCoreVnl'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
|
|
||||||
name: 'hasSepaVnl',
|
name: 'hasSepaVnl',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
|
|
|
@ -422,6 +422,7 @@ function handleOnDataSave({ CrudModelRef }) {
|
||||||
onDataSaved: handleOnDataSave,
|
onDataSaved: handleOnDataSave,
|
||||||
}"
|
}"
|
||||||
:disable-option="{ card: true }"
|
:disable-option="{ card: true }"
|
||||||
|
:has-sub-toolbar="false"
|
||||||
>
|
>
|
||||||
<template #header-selection="scope">
|
<template #header-selection="scope">
|
||||||
<QCheckbox v-model="scope.selected" />
|
<QCheckbox v-model="scope.selected" />
|
||||||
|
|
|
@ -46,16 +46,6 @@ onMounted(async () => {
|
||||||
ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
|
ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
|
||||||
});
|
});
|
||||||
|
|
||||||
function formattedAddress() {
|
|
||||||
if (!ticket.value) return '';
|
|
||||||
|
|
||||||
const address = ticket.value.address;
|
|
||||||
const postcode = address.postalCode;
|
|
||||||
const province = address.province ? `(${address.province.name})` : '';
|
|
||||||
|
|
||||||
return `${address.street} - ${postcode} - ${address.city} ${province}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isEditable() {
|
function isEditable() {
|
||||||
try {
|
try {
|
||||||
return !ticket.value.ticketState?.state?.alertLevel;
|
return !ticket.value.ticketState?.state?.alertLevel;
|
||||||
|
@ -243,7 +233,11 @@ onMounted(async () => {
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('ticket.summary.consignee')"
|
:label="t('ticket.summary.consignee')"
|
||||||
:value="formattedAddress()"
|
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
||||||
|
/>
|
||||||
|
<VnLv
|
||||||
|
:label="t('ticket.summary.consigneeStreet')"
|
||||||
|
:value="entity.address?.street"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-one" v-if="entity.notes.length">
|
<QCard class="vn-one" v-if="entity.notes.length">
|
||||||
|
|
|
@ -11,6 +11,7 @@ import { useStateStore } from 'stores/useStateStore';
|
||||||
import { dashIfEmpty } from 'src/filters';
|
import { dashIfEmpty } from 'src/filters';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
|
@ -23,7 +24,7 @@ watch(
|
||||||
async () => {
|
async () => {
|
||||||
await nextTick();
|
await nextTick();
|
||||||
salesRef.value?.fetch();
|
salesRef.value?.fetch();
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const salesFilter = computed(() => ({
|
const salesFilter = computed(() => ({
|
||||||
|
@ -100,29 +101,28 @@ onMounted(() => (stateStore.rightDrawer = true));
|
||||||
@on-fetch="(data) => applyVolumes(data)"
|
@on-fetch="(data) => applyVolumes(data)"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<Teleport
|
<RightMenu>
|
||||||
to="#right-panel"
|
<template #right-panel>
|
||||||
v-if="stateStore.isHeaderMounted() && packingTypeVolume.length"
|
<QCard
|
||||||
>
|
v-for="(packingType, index) in packingTypeVolume"
|
||||||
<QCard
|
:key="index"
|
||||||
v-for="(packingType, index) in packingTypeVolume"
|
class="q-pa-md q-mb-md q-ma-md color-vn-text"
|
||||||
:key="index"
|
bordered
|
||||||
class="q-pa-md q-mb-md q-ma-md color-vn-text"
|
flat
|
||||||
bordered
|
style="border-color: black"
|
||||||
flat
|
>
|
||||||
style="border-color: black"
|
<QCardSection class="column items-center" horizontal>
|
||||||
>
|
<span>
|
||||||
<QCardSection class="column items-center" horizontal>
|
{{ t('volume.type') }}:
|
||||||
<span>
|
{{ dashIfEmpty(packingType.description) }}
|
||||||
{{ t('volume.type') }}:
|
</span>
|
||||||
{{ dashIfEmpty(packingType.description) }}
|
</QCardSection>
|
||||||
</span>
|
<QCardSection class="column items-center" horizontal>
|
||||||
</QCardSection>
|
<span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
|
||||||
<QCardSection class="column items-center" horizontal>
|
</QCardSection>
|
||||||
<span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
|
</QCard>
|
||||||
</QCardSection>
|
</template>
|
||||||
</QCard>
|
</RightMenu>
|
||||||
</Teleport>
|
|
||||||
<VnTable
|
<VnTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
data-key="TicketVolume"
|
data-key="TicketVolume"
|
||||||
|
|
Loading…
Reference in New Issue