diff --git a/Jenkinsfile b/Jenkinsfile index ea3f1b439..f57678938 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,6 +26,7 @@ node { // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables echo "NODE_NAME: ${env.NODE_NAME}" echo "WORKSPACE: ${env.WORKSPACE}" + echo "CHANGE_TARGET: ${env.CHANGE_TARGET}" configFileProvider([ configFile(fileId: 'salix-front.properties', diff --git a/package.json b/package.json index 1361d1fd8..80706f895 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "25.10.0", + "version": "25.12.0", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", @@ -71,4 +71,4 @@ "vite": "^6.0.11", "vitest": "^0.31.1" } -} +} \ No newline at end of file diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue index 765d97763..c522d0269 100644 --- a/src/components/FilterTravelForm.vue +++ b/src/components/FilterTravelForm.vue @@ -124,7 +124,7 @@ const selectTravel = ({ id }) => { {{ $t('salesTicketsTable.risk') }}: - {{ toCurrency(row.risk - row.credit) }} + {{ toCurrency(row.risk - (row.credit ?? 0)) }} { - const { style, ...rest } = originalAttrs; - return rest; -}); +const $attrs = useAttrs(); const isRequired = computed(() => { return Object.keys($attrs).includes('required'); diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue index 89f9d9449..e3156dd6d 100644 --- a/src/pages/Customer/Card/CustomerDescriptor.vue +++ b/src/pages/Customer/Card/CustomerDescriptor.vue @@ -118,14 +118,6 @@ const debtWarning = computed(() => { > {{ t('Allowed substitution') }} - - {{ t('customer.card.isFrozen') }} - { > {{ t('customer.card.notChecked') }} + + {{ t('customer.card.isFrozen') }} + {
{{ t('unpaidDated', { - dated: toDate(customer.unpaid?.dated), + dated: toDate(entity.unpaid?.dated), }) }}
{{ t('unpaidAmount', { - amount: toCurrency(customer.unpaid?.amount), + amount: toCurrency(entity.unpaid?.amount), }) }} diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue index 6bce6aa04..c283e4a0b 100644 --- a/src/pages/Entry/EntryFilter.vue +++ b/src/pages/Entry/EntryFilter.vue @@ -145,6 +145,7 @@ const entryFilterPanel = ref(); v-model="params.agencyModeId" @update:model-value="searchFn()" url="AgencyModes" + sort-by="name ASC" :fields="['id', 'name']" hide-selected dense diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 2ec862df0..782175cd6 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -17,6 +17,7 @@ import MonitorTicketFilter from './MonitorTicketFilter.vue'; import TicketProblems from 'src/components/TicketProblems.vue'; import VnDateBadge from 'src/components/common/VnDateBadge.vue'; import { useStateStore } from 'src/stores/useStateStore'; +import useOpenURL from 'src/composables/useOpenURL'; const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; const { t } = useI18n(); @@ -321,8 +322,7 @@ const totalPriceColor = (ticket) => { if (total > 0 && total < 50) return 'warning'; }; -const openTab = (id) => - window.open(`#/ticket/${id}/sale`, '_blank', 'noopener, noreferrer'); +const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);