Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d435c6d60a | ||
|
|
278298ecd2 | ||
|
|
dec90bbbbf | ||
|
|
a4b9d2f04d | ||
|
|
22f8b5f203 | ||
|
|
987acc5b0f | ||
|
|
cf1509e34f | ||
|
|
ce2e671768 |
@@ -7,7 +7,7 @@ export const fallbackChangePatterns = [
|
|||||||
/^vite\.config\.js$/u,
|
/^vite\.config\.js$/u,
|
||||||
/^playwright(?:\..+)?\.config\.(?:js|ts)$/u,
|
/^playwright(?:\..+)?\.config\.(?:js|ts)$/u,
|
||||||
/^playwright\.global-(?:setup|teardown)\.mjs$/u,
|
/^playwright\.global-(?:setup|teardown)\.mjs$/u,
|
||||||
/^scripts\/run-playwright/u,
|
/^scripts\/run-playwright-(?:pr|ci-parallel|batched-chromium)\.mjs$/u,
|
||||||
/^tests\/e2e\/(?:support|fixtures)\//u,
|
/^tests\/e2e\/(?:support|fixtures)\//u,
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -24,6 +24,15 @@ export const sourceMappings = [
|
|||||||
specs: ["tests/e2e/navigation.smoke.spec.js"],
|
specs: ["tests/e2e/navigation.smoke.spec.js"],
|
||||||
projects: chromiumProjects,
|
projects: chromiumProjects,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "superuser-roles-permissions",
|
||||||
|
patterns: [
|
||||||
|
/^src\/views\/dashboards\/superUserDashboard\/roles\/SuperUserRolesPermissions\.vue$/u,
|
||||||
|
/^src\/views\/dashboards\/superUserDashboard\/roles\/rolePermissionCatalog\.js$/u,
|
||||||
|
],
|
||||||
|
specs: ["tests/e2e/superuser-roles-permissions.spec.ts"],
|
||||||
|
projects: chromiumProjects,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "booking",
|
name: "booking",
|
||||||
patterns: [/bookings?/iu, /time-bookings/iu, /^src\/views\/guest\/book\//u],
|
patterns: [/bookings?/iu, /time-bookings/iu, /^src\/views\/guest\/book\//u],
|
||||||
@@ -52,6 +61,15 @@ export const sourceMappings = [
|
|||||||
specs: ["tests/e2e/edge-gateways.smoke.spec.js", "tests/e2e/edge-gateways.routes.spec.js"],
|
specs: ["tests/e2e/edge-gateways.smoke.spec.js", "tests/e2e/edge-gateways.routes.spec.js"],
|
||||||
projects: chromiumProjects,
|
projects: chromiumProjects,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "admin-department-notifications",
|
||||||
|
patterns: [
|
||||||
|
/^src\/components\/displays\/department\/notifications\//u,
|
||||||
|
/^src\/components\/displays\/pagination\/models\/DepartmentPos\/NotificationsPhonePagination\.vue$/u,
|
||||||
|
],
|
||||||
|
specs: ["tests/e2e/admin-department-notifications.spec.ts"],
|
||||||
|
projects: chromiumProjects,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "invoicing",
|
name: "invoicing",
|
||||||
patterns: [/invoic/iu, /economic[-/]?queue/iu, /collected-order/iu],
|
patterns: [/invoic/iu, /economic[-/]?queue/iu, /collected-order/iu],
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export const ownedFilesByRole = {
|
|||||||
admin: [
|
admin: [
|
||||||
"admin-bookings-mobile.spec.ts",
|
"admin-bookings-mobile.spec.ts",
|
||||||
"admin-daily-report.spec.ts",
|
"admin-daily-report.spec.ts",
|
||||||
|
"admin-department-notifications.spec.ts",
|
||||||
"admin-department-visibility.spec.ts",
|
"admin-department-visibility.spec.ts",
|
||||||
"admin-overview-mobile.spec.ts",
|
"admin-overview-mobile.spec.ts",
|
||||||
"admin-overview-night-washes.spec.ts",
|
"admin-overview-night-washes.spec.ts",
|
||||||
@@ -105,6 +106,7 @@ export const ownedFilesByRole = {
|
|||||||
"superuser-departments-archive.spec.ts",
|
"superuser-departments-archive.spec.ts",
|
||||||
"superuser-drafts.spec.ts",
|
"superuser-drafts.spec.ts",
|
||||||
"superuser-products-layout.spec.ts",
|
"superuser-products-layout.spec.ts",
|
||||||
|
"superuser-roles-permissions.spec.ts",
|
||||||
"superuser-system-status.smoke.spec.js",
|
"superuser-system-status.smoke.spec.js",
|
||||||
"superuser-users.spec.ts",
|
"superuser-users.spec.ts",
|
||||||
"superuser-vehicles.smoke.spec.js",
|
"superuser-vehicles.smoke.spec.js",
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { useWindowSize } from "@vueuse/core";
|
|||||||
import { BMessage } from "buefy";
|
import { BMessage } from "buefy";
|
||||||
|
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
type DateRange = {
|
type DateRange = {
|
||||||
startDate: Date,
|
startDate: Date,
|
||||||
@@ -115,23 +116,11 @@ const availableYears = computed(() => (
|
|||||||
));
|
));
|
||||||
|
|
||||||
const formatDateInputValue = (date: Date) => {
|
const formatDateInputValue = (date: Date) => {
|
||||||
if (!(date instanceof Date) || Number.isNaN(date.getTime())) {
|
return formatLocalDateOnly(date);
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
const year = date.getFullYear();
|
|
||||||
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
||||||
const day = String(date.getDate()).padStart(2, "0");
|
|
||||||
return `${year}-${month}-${day}`;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const parseDateInputValue = (value: string) => {
|
const parseDateInputValue = (value: string) => {
|
||||||
const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
|
return parseLocalDateOnly(value);
|
||||||
if (!match) {
|
|
||||||
return new Date(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]));
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const isSameDateInputValue = (left: Date, right: Date) => (
|
const isSameDateInputValue = (left: Date, right: Date) => (
|
||||||
|
|||||||
+72
-16
@@ -4,12 +4,15 @@ import { useI18n } from 'vue-i18n';
|
|||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
|
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
|
||||||
import { loadList } from "@/components/pagination/paginatedList.vue";
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
objects: {
|
objects: {
|
||||||
type: Array,
|
type: Array,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
loadList: {
|
||||||
|
type: Function,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
@@ -22,6 +25,52 @@ const su_object = SessionUser.objects.department_notification_sms;
|
|||||||
const hasUpdatePermission = () => {
|
const hasUpdatePermission = () => {
|
||||||
return (SessionUser.hasPermission('department_notification_sms_update') || SessionUser.canAccessSuperUser());
|
return (SessionUser.hasPermission('department_notification_sms_update') || SessionUser.canAccessSuperUser());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const enabledSavingIds = ref(new Set());
|
||||||
|
|
||||||
|
const isEnabled = (value) => {
|
||||||
|
return value === true || value === 1 || value === "1" || value === "true";
|
||||||
|
};
|
||||||
|
|
||||||
|
const isEnabledSaving = (id) => {
|
||||||
|
return enabledSavingIds.value.has(Number(id));
|
||||||
|
};
|
||||||
|
|
||||||
|
const setEnabledSaving = (id, saving) => {
|
||||||
|
const nextIds = new Set(enabledSavingIds.value);
|
||||||
|
const normalizedId = Number(id);
|
||||||
|
if (saving) {
|
||||||
|
nextIds.add(normalizedId);
|
||||||
|
} else {
|
||||||
|
nextIds.delete(normalizedId);
|
||||||
|
}
|
||||||
|
enabledSavingIds.value = nextIds;
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleEnabled = async (obj, event) => {
|
||||||
|
const target = event?.target;
|
||||||
|
const previousValue = isEnabled(obj.enabled);
|
||||||
|
|
||||||
|
if (!target || !hasUpdatePermission() || isEnabledSaving(obj.id)) {
|
||||||
|
if (target) {
|
||||||
|
target.checked = previousValue;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nextValue = Boolean(target.checked);
|
||||||
|
setEnabledSaving(obj.id, true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await su_object.set.enabled(obj.id, nextValue);
|
||||||
|
await props.loadList();
|
||||||
|
} catch (error) {
|
||||||
|
target.checked = previousValue;
|
||||||
|
console.error('Unable to update department notification SMS active state', error);
|
||||||
|
} finally {
|
||||||
|
setEnabledSaving(obj.id, false);
|
||||||
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -42,7 +91,7 @@ const hasUpdatePermission = () => {
|
|||||||
<!-- Label -->
|
<!-- Label -->
|
||||||
<EditableTableColumn
|
<EditableTableColumn
|
||||||
:object="obj"
|
:object="obj"
|
||||||
:loadList="loadList"
|
:loadList="props.loadList"
|
||||||
:editFunction="su_object.showEditObjectFieldForm"
|
:editFunction="su_object.showEditObjectFieldForm"
|
||||||
column="label"
|
column="label"
|
||||||
:permission-check-function="hasUpdatePermission"
|
:permission-check-function="hasUpdatePermission"
|
||||||
@@ -50,7 +99,7 @@ const hasUpdatePermission = () => {
|
|||||||
<!-- Phone country code -->
|
<!-- Phone country code -->
|
||||||
<EditableTableColumn
|
<EditableTableColumn
|
||||||
:object="obj"
|
:object="obj"
|
||||||
:loadList="loadList"
|
:loadList="props.loadList"
|
||||||
:editFunction="su_object.showEditObjectFieldForm"
|
:editFunction="su_object.showEditObjectFieldForm"
|
||||||
column="phone_country_code"
|
column="phone_country_code"
|
||||||
:permission-check-function="hasUpdatePermission"
|
:permission-check-function="hasUpdatePermission"
|
||||||
@@ -58,22 +107,27 @@ const hasUpdatePermission = () => {
|
|||||||
<!-- Phone -->
|
<!-- Phone -->
|
||||||
<EditableTableColumn
|
<EditableTableColumn
|
||||||
:object="obj"
|
:object="obj"
|
||||||
:loadList="loadList"
|
:loadList="props.loadList"
|
||||||
:editFunction="su_object.showEditObjectFieldForm"
|
:editFunction="su_object.showEditObjectFieldForm"
|
||||||
column="phone"
|
column="phone"
|
||||||
:permission-check-function="hasUpdatePermission"
|
:permission-check-function="hasUpdatePermission"
|
||||||
/>
|
/>
|
||||||
<!-- Enabled -->
|
<!-- Enabled -->
|
||||||
<EditableTableColumn
|
<td>
|
||||||
:object="obj"
|
<input
|
||||||
:loadList="loadList"
|
:id="`department-notification-sms-enabled-${obj.id}`"
|
||||||
:editFunction="su_object.showEditObjectFieldForm"
|
class="switch is-rounded is-small"
|
||||||
column="enabled"
|
type="checkbox"
|
||||||
:parse-function="(value) => {
|
:checked="isEnabled(obj.enabled)"
|
||||||
return value ? t('common.yes') : t('common.no');
|
:disabled="!hasUpdatePermission() || isEnabledSaving(obj.id)"
|
||||||
}"
|
:data-testid="`department-notification-sms-enabled-toggle-${obj.id}`"
|
||||||
:permission-check-function="hasUpdatePermission"
|
:aria-label="`${su_object.columns.enabled.label}: ${obj.label}`"
|
||||||
/>
|
@change="toggleEnabled(obj, $event)"
|
||||||
|
/>
|
||||||
|
<label :for="`department-notification-sms-enabled-${obj.id}`">
|
||||||
|
{{ isEnabled(obj.enabled) ? t('common.yes') : t('common.no') }}
|
||||||
|
</label>
|
||||||
|
</td>
|
||||||
<!-- Actions -->
|
<!-- Actions -->
|
||||||
<td>
|
<td>
|
||||||
<ActionSettingsWheelButton class="is-float-right">
|
<ActionSettingsWheelButton class="is-float-right">
|
||||||
@@ -81,9 +135,10 @@ const hasUpdatePermission = () => {
|
|||||||
<RequiresPermission :permission="'department_notification_sms_delete'">
|
<RequiresPermission :permission="'department_notification_sms_delete'">
|
||||||
<template #default>
|
<template #default>
|
||||||
<ActionSettingsWheelItem
|
<ActionSettingsWheelItem
|
||||||
@click="su_object.functions.showDeleteObjectForm(obj.id, loadList)"
|
@click="su_object.functions.showDeleteObjectForm(obj.id, props.loadList)"
|
||||||
:icon="SessionUser.objects.global.icons.delete"
|
:icon="SessionUser.objects.global.icons.delete"
|
||||||
:label="t('global.delete')"
|
:label="t('global.delete')"
|
||||||
|
:test-id="`department-notification-sms-delete-${obj.id}`"
|
||||||
template="danger"
|
template="danger"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
@@ -91,6 +146,7 @@ const hasUpdatePermission = () => {
|
|||||||
<ActionSettingsWheelItem
|
<ActionSettingsWheelItem
|
||||||
:icon="SessionUser.objects.global.icons.delete"
|
:icon="SessionUser.objects.global.icons.delete"
|
||||||
:label="t('global.delete')"
|
:label="t('global.delete')"
|
||||||
|
:test-id="`department-notification-sms-delete-${obj.id}`"
|
||||||
template="danger"
|
template="danger"
|
||||||
disabled
|
disabled
|
||||||
/>
|
/>
|
||||||
@@ -111,4 +167,4 @@ const hasUpdatePermission = () => {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { computed, nextTick, ref, watch } from "vue";
|
import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
|
||||||
import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
|
import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
|
||||||
import { isBlankPosMetadataValue } from "@/components/shop/POSDepartmentProcess.vue";
|
import {
|
||||||
|
isBlankPosMetadataValue,
|
||||||
|
registerPosStepSaveBarrier,
|
||||||
|
saveOrderMetadataField,
|
||||||
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
order_id: {
|
order_id: {
|
||||||
@@ -123,7 +126,7 @@ const referenceField = createCustomerWishField({
|
|||||||
key: "reference",
|
key: "reference",
|
||||||
label: computed(() => t("common.reference")),
|
label: computed(() => t("common.reference")),
|
||||||
source: () => props.reference,
|
source: () => props.reference,
|
||||||
saveValue: (value) => SessionUser.objects.orders.set.reference(props.order_id, value),
|
saveValue: (value) => saveOrderMetadataField("reference", value, props.order_id),
|
||||||
testIdBase: "pos-order-customer-wishes-reference",
|
testIdBase: "pos-order-customer-wishes-reference",
|
||||||
isRequired: () => props.referenceRequired,
|
isRequired: () => props.referenceRequired,
|
||||||
warningStateWhenEmpty: "danger",
|
warningStateWhenEmpty: "danger",
|
||||||
@@ -134,7 +137,7 @@ const poField = createCustomerWishField({
|
|||||||
key: "po",
|
key: "po",
|
||||||
label: computed(() => t("admin.pos.po_number")),
|
label: computed(() => t("admin.pos.po_number")),
|
||||||
source: () => props.po,
|
source: () => props.po,
|
||||||
saveValue: (value) => SessionUser.objects.orders.set.po(props.order_id, value),
|
saveValue: (value) => saveOrderMetadataField("po", value, props.order_id),
|
||||||
testIdBase: "pos-order-customer-wishes-po",
|
testIdBase: "pos-order-customer-wishes-po",
|
||||||
isRequired: () => props.poRequired,
|
isRequired: () => props.poRequired,
|
||||||
warningStateWhenEmpty: "warning",
|
warningStateWhenEmpty: "warning",
|
||||||
@@ -145,7 +148,7 @@ const safetySealField = createCustomerWishField({
|
|||||||
key: "safety_seal",
|
key: "safety_seal",
|
||||||
label: computed(() => t("admin.pos.safety_seal")),
|
label: computed(() => t("admin.pos.safety_seal")),
|
||||||
source: () => props.safetySeal,
|
source: () => props.safetySeal,
|
||||||
saveValue: (value) => SessionUser.objects.orders.set.safety_seal(props.order_id, value),
|
saveValue: (value) => saveOrderMetadataField("safety_seal", value, props.order_id),
|
||||||
testIdBase: "pos-order-customer-wishes-safety-seal",
|
testIdBase: "pos-order-customer-wishes-safety-seal",
|
||||||
isRequired: () => false,
|
isRequired: () => false,
|
||||||
warningStateWhenEmpty: null,
|
warningStateWhenEmpty: null,
|
||||||
@@ -161,6 +164,15 @@ const safetySealField = createCustomerWishField({
|
|||||||
const fields = computed(() => {
|
const fields = computed(() => {
|
||||||
return props.showSafetySeal ? [referenceField, poField, safetySealField] : [referenceField, poField];
|
return props.showSafetySeal ? [referenceField, poField, safetySealField] : [referenceField, poField];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const flushCustomerWishFields = async () => {
|
||||||
|
await Promise.all(fields.value.map((field) => field.autosave.flushAndWait()));
|
||||||
|
};
|
||||||
|
const unregisterStepSaveBarrier = registerPosStepSaveBarrier(flushCustomerWishFields);
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
unregisterStepSaveBarrier();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { computed, nextTick, ref, watch } from 'vue';
|
import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
|
||||||
import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
|
import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
|
||||||
|
import {
|
||||||
|
registerPosStepSaveBarrier,
|
||||||
|
saveOrderMetadataField,
|
||||||
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
order_id: {
|
order_id: {
|
||||||
@@ -30,8 +33,7 @@ const isEditing = ref(false);
|
|||||||
const autosave = useOrderMetadataAutosave({
|
const autosave = useOrderMetadataAutosave({
|
||||||
source: () => props.note,
|
source: () => props.note,
|
||||||
saveValue: async (value) => {
|
saveValue: async (value) => {
|
||||||
await SessionUser.objects.orders.set.notes(props.order_id, value);
|
return saveOrderMetadataField("notes", value, props.order_id);
|
||||||
return value;
|
|
||||||
},
|
},
|
||||||
onSaved: async (savedValue, requestedValue) => {
|
onSaved: async (savedValue, requestedValue) => {
|
||||||
if (typeof props.onSaved === "function") {
|
if (typeof props.onSaved === "function") {
|
||||||
@@ -68,6 +70,12 @@ const lostFocus = async () => {
|
|||||||
isEditing.value = false;
|
isEditing.value = false;
|
||||||
await autosave.flush();
|
await autosave.flush();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const unregisterStepSaveBarrier = registerPosStepSaveBarrier(() => autosave.flushAndWait());
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
unregisterStepSaveBarrier();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { computed, nextTick, ref, watch } from "vue";
|
import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
|
||||||
import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
|
import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
|
||||||
|
import {
|
||||||
|
registerPosStepSaveBarrier,
|
||||||
|
saveOrderMetadataField,
|
||||||
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
index: {
|
index: {
|
||||||
@@ -36,8 +39,7 @@ autosave = useOrderMetadataAutosave({
|
|||||||
source: () => props.modelValue,
|
source: () => props.modelValue,
|
||||||
normalizeValue: normalizeRegistrationDraft,
|
normalizeValue: normalizeRegistrationDraft,
|
||||||
saveValue: async (value) => {
|
saveValue: async (value) => {
|
||||||
await SessionUser.objects.orders.set[fieldKey.value](props.order_id, value);
|
return saveOrderMetadataField(fieldKey.value, value, props.order_id);
|
||||||
return value;
|
|
||||||
},
|
},
|
||||||
onSaved: async () => {
|
onSaved: async () => {
|
||||||
await props.loadOrder();
|
await props.loadOrder();
|
||||||
@@ -74,6 +76,12 @@ const closeEditor = async () => {
|
|||||||
isEditing.value = false;
|
isEditing.value = false;
|
||||||
await autosave.flush();
|
await autosave.flush();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const unregisterStepSaveBarrier = registerPosStepSaveBarrier(() => autosave.flushAndWait());
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
unregisterStepSaveBarrier();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import PosLastScannedLicensePlatesV2 from "@/components/displays/department/pos/
|
|||||||
import PosDesktopOrderBookingSelectorModal from "@/components/displays/department/pos/steps/elements/PosDesktopOrderBookingSelectorModal.vue";
|
import PosDesktopOrderBookingSelectorModal from "@/components/displays/department/pos/steps/elements/PosDesktopOrderBookingSelectorModal.vue";
|
||||||
import PosDesktopCustomerConflictModal from "@/components/displays/department/pos/steps/elements/PosDesktopCustomerConflictModal.vue";
|
import PosDesktopCustomerConflictModal from "@/components/displays/department/pos/steps/elements/PosDesktopCustomerConflictModal.vue";
|
||||||
import PosDesktopDuplicateWarning from "@/components/displays/department/pos/steps/elements/PosDesktopDuplicateWarning.vue";
|
import PosDesktopDuplicateWarning from "@/components/displays/department/pos/steps/elements/PosDesktopDuplicateWarning.vue";
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import { parsePosRouteSearch } from "@/views/dashboards/departmentDashboard/modules/Pos/posRouteState.js";
|
import { parsePosRouteSearch } from "@/views/dashboards/departmentDashboard/modules/Pos/posRouteState.js";
|
||||||
import {
|
import {
|
||||||
@@ -377,8 +378,8 @@ const fetchDuplicateOrdersForContext = async (context) => {
|
|||||||
try {
|
try {
|
||||||
const response = await SessionUser.request(SessionUser.objects.orders.meta.endpoint, "GET", {
|
const response = await SessionUser.request(SessionUser.objects.orders.meta.endpoint, "GET", {
|
||||||
filters: `reg_1:${normalizedContext.reg1},department_id:${department_id.value},created_at-date_from:${
|
filters: `reg_1:${normalizedContext.reg1},department_id:${department_id.value},created_at-date_from:${
|
||||||
new Date().toISOString().split("T")[0]
|
todayLocalDateOnly()
|
||||||
},created_at-date_to:${new Date().toISOString().split("T")[0]}`,
|
},created_at-date_to:${todayLocalDateOnly()}`,
|
||||||
limit: 5,
|
limit: 5,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
setBackgroundColor,
|
setBackgroundColor,
|
||||||
backgroundColors,
|
backgroundColors,
|
||||||
} from "@/components/viewport/page/headers/ViewportHeaderSettings.vue";
|
} from "@/components/viewport/page/headers/ViewportHeaderSettings.vue";
|
||||||
import { onMounted, ref, watch, computed } from "vue";
|
import { onBeforeUnmount, onMounted, ref, watch, computed } from "vue";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import PosDepartmentStepMobile2Product from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile2Product.vue";
|
import PosDepartmentStepMobile2Product from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile2Product.vue";
|
||||||
import PosDepartmentStepMobile2LastOrder from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile2LastOrder.vue";
|
import PosDepartmentStepMobile2LastOrder from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile2LastOrder.vue";
|
||||||
@@ -43,6 +43,8 @@ import {
|
|||||||
customer_name,
|
customer_name,
|
||||||
isAddonRestricted,
|
isAddonRestricted,
|
||||||
canBuyAdditionalServices,
|
canBuyAdditionalServices,
|
||||||
|
registerPosStepSaveBarrier,
|
||||||
|
saveOrderMetadataField,
|
||||||
} from "@/components/shop/POSDepartmentProcess.vue";
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
import { createOrderItem, getOrderItems, removeOrderItem } from "@/components/shop/OrdersItems.vue";
|
import { createOrderItem, getOrderItems, removeOrderItem } from "@/components/shop/OrdersItems.vue";
|
||||||
import { PosProduct } from "@/components/displays/department/pos/steps/mobile/objects/PosProduct.vue";
|
import { PosProduct } from "@/components/displays/department/pos/steps/mobile/objects/PosProduct.vue";
|
||||||
@@ -196,8 +198,7 @@ const applyPendingBookingFromSelection = async () => {
|
|||||||
// Set PO number on the order if provided by the booking
|
// Set PO number on the order if provided by the booking
|
||||||
if (booking.po && typeof booking.po === "string" && booking.po.trim() !== "") {
|
if (booking.po && typeof booking.po === "string" && booking.po.trim() !== "") {
|
||||||
try {
|
try {
|
||||||
await SessionUser.objects.orders.set.po(order_id.value, booking.po);
|
order_po.value = await saveOrderMetadataField("po", booking.po, order_id.value);
|
||||||
order_po.value = booking.po.trim();
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Failed to set PO on order from booking", e);
|
console.error("Failed to set PO on order from booking", e);
|
||||||
}
|
}
|
||||||
@@ -217,9 +218,9 @@ const applyPendingBookingFromSelection = async () => {
|
|||||||
const bookingReference = String(fullBookingData.reference ?? fullBookingData.reference_number ?? "").trim();
|
const bookingReference = String(fullBookingData.reference ?? fullBookingData.reference_number ?? "").trim();
|
||||||
if (bookingReference !== "") {
|
if (bookingReference !== "") {
|
||||||
try {
|
try {
|
||||||
await SessionUser.objects.orders.set.reference(order_id.value, bookingReference);
|
const savedReference = await saveOrderMetadataField("reference", bookingReference, order_id.value);
|
||||||
persistedReference.value = bookingReference;
|
persistedReference.value = savedReference;
|
||||||
metadata.setReference(bookingReference);
|
metadata.setReference(savedReference);
|
||||||
hydrateReferenceFromSources();
|
hydrateReferenceFromSources();
|
||||||
} catch (setRefError) {
|
} catch (setRefError) {
|
||||||
console.error("Failed to set reference on order from booking:", setRefError);
|
console.error("Failed to set reference on order from booking:", setRefError);
|
||||||
@@ -228,10 +229,10 @@ const applyPendingBookingFromSelection = async () => {
|
|||||||
const bookingNotes = String(fullBookingData.notes ?? fullBookingData.note ?? "").trim();
|
const bookingNotes = String(fullBookingData.notes ?? fullBookingData.note ?? "").trim();
|
||||||
if (bookingNotes !== "") {
|
if (bookingNotes !== "") {
|
||||||
try {
|
try {
|
||||||
await SessionUser.objects.orders.set.notes(order_id.value, bookingNotes);
|
const savedNotes = await saveOrderMetadataField("notes", bookingNotes, order_id.value);
|
||||||
order_notes.value = bookingNotes;
|
order_notes.value = savedNotes;
|
||||||
notes.value = bookingNotes;
|
notes.value = savedNotes;
|
||||||
metadata.setNotes(bookingNotes);
|
metadata.setNotes(savedNotes);
|
||||||
} catch (setNotesError) {
|
} catch (setNotesError) {
|
||||||
console.error("Failed to set notes on order from booking:", setNotesError);
|
console.error("Failed to set notes on order from booking:", setNotesError);
|
||||||
}
|
}
|
||||||
@@ -243,13 +244,11 @@ const applyPendingBookingFromSelection = async () => {
|
|||||||
const currentReg2 = normalizeRegistrationValue(reg_2.value);
|
const currentReg2 = normalizeRegistrationValue(reg_2.value);
|
||||||
|
|
||||||
if (bookingReg1 && bookingReg1 !== currentReg1) {
|
if (bookingReg1 && bookingReg1 !== currentReg1) {
|
||||||
reg_1.value = bookingReg1;
|
reg_1.value = await saveOrderMetadataField("reg_1", bookingReg1, order_id.value);
|
||||||
await SessionUser.objects.orders.set.reg_1(order_id.value, bookingReg1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bookingReg2 !== currentReg2) {
|
if (bookingReg2 !== currentReg2) {
|
||||||
reg_2.value = bookingReg2;
|
reg_2.value = await saveOrderMetadataField("reg_2", bookingReg2, order_id.value);
|
||||||
await SessionUser.objects.orders.set.reg_2(order_id.value, bookingReg2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const bookingMatches = Array.isArray(vehicles.vehicle_1.value?.booking_matches)
|
const bookingMatches = Array.isArray(vehicles.vehicle_1.value?.booking_matches)
|
||||||
@@ -538,8 +537,7 @@ const notesAutosave = useOrderMetadataAutosave({
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
await SessionUser.objects.orders.set.notes(normalizedOrderId, value);
|
return saveOrderMetadataField("notes", value, normalizedOrderId);
|
||||||
return value;
|
|
||||||
},
|
},
|
||||||
onSaved: async (value) => {
|
onSaved: async (value) => {
|
||||||
order_notes.value = value;
|
order_notes.value = value;
|
||||||
@@ -555,8 +553,7 @@ const referenceAutosave = useOrderMetadataAutosave({
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
await SessionUser.objects.orders.set.reference(normalizedOrderId, value);
|
return saveOrderMetadataField("reference", value, normalizedOrderId);
|
||||||
return value;
|
|
||||||
},
|
},
|
||||||
onSaved: async (value) => {
|
onSaved: async (value) => {
|
||||||
persistedReference.value = value;
|
persistedReference.value = value;
|
||||||
@@ -572,8 +569,7 @@ const safetySealAutosave = useOrderMetadataAutosave({
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
await SessionUser.objects.orders.set.safety_seal(normalizedOrderId, value);
|
return saveOrderMetadataField("safety_seal", value, normalizedOrderId);
|
||||||
return value;
|
|
||||||
},
|
},
|
||||||
onSaved: async (value) => {
|
onSaved: async (value) => {
|
||||||
order_safety_seal.value = value;
|
order_safety_seal.value = value;
|
||||||
@@ -585,6 +581,18 @@ const stepTwoNotesInput = notesAutosave.draft;
|
|||||||
const stepTwoReferenceInput = referenceAutosave.draft;
|
const stepTwoReferenceInput = referenceAutosave.draft;
|
||||||
const stepTwoSafetySealInput = safetySealAutosave.draft;
|
const stepTwoSafetySealInput = safetySealAutosave.draft;
|
||||||
const showSafetySealField = computed(() => transactionItems.containsWashCertificate());
|
const showSafetySealField = computed(() => transactionItems.containsWashCertificate());
|
||||||
|
const flushStepTwoMetadataFields = async () => {
|
||||||
|
await Promise.all([
|
||||||
|
notesAutosave.flushAndWait(),
|
||||||
|
referenceAutosave.flushAndWait(),
|
||||||
|
safetySealAutosave.flushAndWait(),
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
const unregisterStepSaveBarrier = registerPosStepSaveBarrier(flushStepTwoMetadataFields);
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
unregisterStepSaveBarrier();
|
||||||
|
});
|
||||||
|
|
||||||
const resolveReferenceFromSources = () => {
|
const resolveReferenceFromSources = () => {
|
||||||
const orderReference = normalizeReferenceValue(persistedReference.value);
|
const orderReference = normalizeReferenceValue(persistedReference.value);
|
||||||
|
|||||||
+44
-7
@@ -22,7 +22,7 @@ import PosDepartmentStep2MobileVehicleSelection
|
|||||||
import GenericButton from "@/components/viewport/page/templates/generic/graphics/GenericButton.vue";
|
import GenericButton from "@/components/viewport/page/templates/generic/graphics/GenericButton.vue";
|
||||||
import PosDepartmentStepMobile2FloatingCart
|
import PosDepartmentStepMobile2FloatingCart
|
||||||
from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile2FloatingCart.vue";
|
from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile2FloatingCart.vue";
|
||||||
import { isAddonRestricted, canBuyAdditionalServices } from "@/components/shop/POSDepartmentProcess.vue";
|
import { isAddonRestricted, canBuyAdditionalServices, isProductRestricted } from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
label: {
|
label: {
|
||||||
@@ -46,6 +46,7 @@ const props = defineProps({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const canSelectAdditionalItems = computed(() => canBuyAdditionalServices());
|
||||||
const checked = ref(props.defaultChecked);
|
const checked = ref(props.defaultChecked);
|
||||||
// Function to generate a summary from the last order
|
// Function to generate a summary from the last order
|
||||||
function generateSummary(order: PosOrder): string {
|
function generateSummary(order: PosOrder): string {
|
||||||
@@ -72,6 +73,12 @@ const displaySubtitle = computed(() => {
|
|||||||
});
|
});
|
||||||
// Emit event on toggle
|
// Emit event on toggle
|
||||||
function onToggle(isOpen: boolean) {
|
function onToggle(isOpen: boolean) {
|
||||||
|
if (isOpen && !canSelectAdditionalItems.value) {
|
||||||
|
checked.value = false;
|
||||||
|
pos.views.additionalItemSelection.value = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
checked.value = isOpen;
|
checked.value = isOpen;
|
||||||
// Open the additional item selection view if toggled open
|
// Open the additional item selection view if toggled open
|
||||||
if (isOpen) {
|
if (isOpen) {
|
||||||
@@ -118,17 +125,45 @@ const getAvailableAdditionalItems = () => {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
const availableAdditionalItems = ref<Addon[]>(getAvailableAdditionalItems());
|
const availableAdditionalItems = ref<Addon[]>(getAvailableAdditionalItems());
|
||||||
|
const isAdditionalItemRestricted = (product: PosProduct) => {
|
||||||
|
if (!canSelectAdditionalItems.value) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (isProductRestricted(product)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return isAddonRestricted(convertProductToAddon(product));
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(canSelectAdditionalItems, (canSelect) => {
|
||||||
|
if (!canSelect) {
|
||||||
|
checked.value = false;
|
||||||
|
pos.views.additionalItemSelection.value = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Computed property to filter out restricted additional items based on customer attributes
|
// Computed property to filter out restricted additional items based on customer attributes
|
||||||
const filteredAdditionalItems = computed(() => {
|
const filteredAdditionalItems = computed(() => {
|
||||||
// If additional services are restricted, return empty array
|
// If additional services are restricted, return empty array
|
||||||
if (!canBuyAdditionalServices()) {
|
if (!canSelectAdditionalItems.value) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
// Filter out individually restricted addons
|
// Filter out individually restricted addons
|
||||||
return availableAdditionalItems.value.filter((addon: Addon) => !isAddonRestricted(addon));
|
return availableAdditionalItems.value.filter((addon: Addon) => {
|
||||||
|
if (isAddonRestricted(addon)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (addon.product && isProductRestricted(addon.product)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
});
|
||||||
});
|
});
|
||||||
const onClickAddOtherProduct = () => {
|
const onClickAddOtherProduct = () => {
|
||||||
|
if (!canSelectAdditionalItems.value) {
|
||||||
|
pos.views.additionalItemSelection.value = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
pos.views.additionalItemSelection.value = !pos.views.additionalItemSelection.value;
|
pos.views.additionalItemSelection.value = !pos.views.additionalItemSelection.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,7 +194,9 @@ watch(() => pos.transactionItems.additionalItems.value, (newVal) => {
|
|||||||
}, { deep: true });
|
}, { deep: true });
|
||||||
|
|
||||||
const onClickAddProduct = async (product: PosProduct) => {
|
const onClickAddProduct = async (product: PosProduct) => {
|
||||||
// If the product requires note, open note input.
|
if (isAdditionalItemRestricted(product)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
pos.transactionItems.addAdditionalItem(product);
|
pos.transactionItems.addAdditionalItem(product);
|
||||||
// If the view is fullscreen, close it after adding
|
// If the view is fullscreen, close it after adding
|
||||||
//if (pos.views.additionalItemSelection.value) {
|
//if (pos.views.additionalItemSelection.value) {
|
||||||
@@ -171,7 +208,7 @@ const onClickAddProduct = async (product: PosProduct) => {
|
|||||||
<template>
|
<template>
|
||||||
<div data-testid="pos-mobile-additional-items">
|
<div data-testid="pos-mobile-additional-items">
|
||||||
<!-- Minimal view, when not set as fullscreen view -->
|
<!-- Minimal view, when not set as fullscreen view -->
|
||||||
<WhiteBoxCard :toggleable="pos.transactionItems.additionalItems.value && pos.transactionItems.additionalItems.value.length == 0"
|
<WhiteBoxCard :toggleable="canSelectAdditionalItems && pos.transactionItems.additionalItems.value && pos.transactionItems.additionalItems.value.length == 0"
|
||||||
:defaultOpen="pos.transactionItems.additionalItems.value && pos.transactionItems.additionalItems.value.length > 0"
|
:defaultOpen="pos.transactionItems.additionalItems.value && pos.transactionItems.additionalItems.value.length > 0"
|
||||||
@toggle="onToggle"
|
@toggle="onToggle"
|
||||||
:forceState="(pos.transactionItems.additionalItems.value && pos.transactionItems.additionalItems.value.length > 0) ? true : (pos.views.additionalItemSelection.value)"
|
:forceState="(pos.transactionItems.additionalItems.value && pos.transactionItems.additionalItems.value.length > 0) ? true : (pos.views.additionalItemSelection.value)"
|
||||||
@@ -201,7 +238,7 @@ const onClickAddProduct = async (product: PosProduct) => {
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<!-- Footer -->
|
<!-- Footer -->
|
||||||
<template #footer>
|
<template #footer v-if="canSelectAdditionalItems">
|
||||||
<!-- Select other product button -->
|
<!-- Select other product button -->
|
||||||
<a class="card-footer-item" data-testid="pos-mobile-additional-items-open" @click="onClickAddOtherProduct">
|
<a class="card-footer-item" data-testid="pos-mobile-additional-items-open" @click="onClickAddOtherProduct">
|
||||||
<span class="icon">
|
<span class="icon">
|
||||||
@@ -212,7 +249,7 @@ const onClickAddProduct = async (product: PosProduct) => {
|
|||||||
</template>
|
</template>
|
||||||
</WhiteBoxCard>
|
</WhiteBoxCard>
|
||||||
<!-- Fullscreen view, when selecting other products -->
|
<!-- Fullscreen view, when selecting other products -->
|
||||||
<template v-else>
|
<template v-else-if="canSelectAdditionalItems">
|
||||||
<div data-testid="pos-mobile-additional-items-selection">
|
<div data-testid="pos-mobile-additional-items-selection">
|
||||||
<!-- Categories of products -->
|
<!-- Categories of products -->
|
||||||
<PosDepartmentStep2MobileVehicleSelection :onAddProduct="onClickAddProduct" :onSearchClick="() => console.warn('AdditionalItem Search Clicked')"/><!-- :asAddons="true" :addons="availableAdditionalItems" @update:addons="availableAdditionalItems = $event"/>-->
|
<PosDepartmentStep2MobileVehicleSelection :onAddProduct="onClickAddProduct" :onSearchClick="() => console.warn('AdditionalItem Search Clicked')"/><!-- :asAddons="true" :addons="availableAdditionalItems" @update:addons="availableAdditionalItems = $event"/>-->
|
||||||
|
|||||||
+35
-19
@@ -20,6 +20,7 @@ import {
|
|||||||
hasAttribute,
|
hasAttribute,
|
||||||
uploadAttachment,
|
uploadAttachment,
|
||||||
restoreStoredPosOrderId,
|
restoreStoredPosOrderId,
|
||||||
|
saveOrderMetadataField,
|
||||||
} from "@/components/shop/POSDepartmentProcess.vue";
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
import * as POSDepartmentProcess from "@/components/shop/POSDepartmentProcess.vue";
|
import * as POSDepartmentProcess from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
import { errors } from "@/components/request/HandleGlobalError.vue";
|
import { errors } from "@/components/request/HandleGlobalError.vue";
|
||||||
@@ -96,17 +97,30 @@ const props = defineProps({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const updateReference = () => {
|
const getActiveOrderId = () => {
|
||||||
if (!!order_id.value && order_id.value > 0) SessionUser.objects.orders.set.reference(order_id.value, reference.value);
|
const parsedOrderId = Number.parseInt(String(order_id.value ?? ""), 10);
|
||||||
|
return Number.isInteger(parsedOrderId) && parsedOrderId > 0 ? parsedOrderId : null;
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateNotes = () => {
|
const updateReference = async () => {
|
||||||
if (!!order_id.value && order_id.value > 0) SessionUser.objects.orders.set.notes(order_id.value, order_notes.value);
|
const activeOrderId = getActiveOrderId();
|
||||||
|
if (activeOrderId) {
|
||||||
|
await saveOrderMetadataField("reference", reference.value, activeOrderId);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateSafetySeal = () => {
|
const updateNotes = async () => {
|
||||||
if (!!order_id.value && order_id.value > 0)
|
const activeOrderId = getActiveOrderId();
|
||||||
SessionUser.objects.orders.set.safety_seal(order_id.value, order_safety_seal.value);
|
if (activeOrderId) {
|
||||||
|
await saveOrderMetadataField("notes", order_notes.value, activeOrderId);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateSafetySeal = async () => {
|
||||||
|
const activeOrderId = getActiveOrderId();
|
||||||
|
if (activeOrderId) {
|
||||||
|
await saveOrderMetadataField("safety_seal", order_safety_seal.value, activeOrderId);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Helpers: extracted for clarity and reuse
|
// Helpers: extracted for clarity and reuse
|
||||||
@@ -196,9 +210,9 @@ const step1 = async () => {
|
|||||||
// Reset the vehicle selection
|
// Reset the vehicle selection
|
||||||
views.vehicleSelection.value = false;
|
views.vehicleSelection.value = false;
|
||||||
// Merge references and notes
|
// Merge references and notes
|
||||||
mergeReferences();
|
await mergeReferences();
|
||||||
mergeNotes();
|
await mergeNotes();
|
||||||
mergeSafetySeal();
|
await mergeSafetySeal();
|
||||||
// We only need to check if the customer requires reference, if the field is empty.
|
// We only need to check if the customer requires reference, if the field is empty.
|
||||||
if (!isNonEmptyString(reference.value)) {
|
if (!isNonEmptyString(reference.value)) {
|
||||||
const isValid = await validateReferenceRequirements();
|
const isValid = await validateReferenceRequirements();
|
||||||
@@ -214,37 +228,39 @@ const mergeReferences = () => {
|
|||||||
if (metadata.getReference() && metadata.getReference().length >= 1) {
|
if (metadata.getReference() && metadata.getReference().length >= 1) {
|
||||||
// If there is no reference, set it to the registration number of vehicle 1
|
// If there is no reference, set it to the registration number of vehicle 1
|
||||||
reference.value = metadata.getReference();
|
reference.value = metadata.getReference();
|
||||||
updateReference();
|
return updateReference();
|
||||||
} else if (reference.value && reference.value.length >= 1) {
|
} else if (reference.value && reference.value.length >= 1) {
|
||||||
// If there is a reference in the field, set it to the metadata
|
// If there is a reference in the field, set it to the metadata
|
||||||
metadata.setReference(reference.value);
|
metadata.setReference(reference.value);
|
||||||
updateReference();
|
return updateReference();
|
||||||
} else if (vehicles.vehicle_1.value?.reference && vehicles.vehicle_1.value?.reference.length >= 1) {
|
} else if (vehicles.vehicle_1.value?.reference && vehicles.vehicle_1.value?.reference.length >= 1) {
|
||||||
// If there is no reference, set it to the registration number of vehicle 1
|
// If there is no reference, set it to the registration number of vehicle 1
|
||||||
reference.value = vehicles.vehicle_1.value?.reference;
|
reference.value = vehicles.vehicle_1.value?.reference;
|
||||||
metadata.setReference(reference.value);
|
metadata.setReference(reference.value);
|
||||||
updateReference();
|
return updateReference();
|
||||||
}
|
}
|
||||||
|
return Promise.resolve();
|
||||||
};
|
};
|
||||||
const mergeNotes = () => {
|
const mergeNotes = () => {
|
||||||
if (metadata.getNotes() && metadata.getNotes().length >= 1) {
|
if (metadata.getNotes() && metadata.getNotes().length >= 1) {
|
||||||
order_notes.value = metadata.getNotes();
|
order_notes.value = metadata.getNotes();
|
||||||
updateNotes();
|
return updateNotes();
|
||||||
} else if (order_notes.value && order_notes.value.length >= 1) {
|
} else if (order_notes.value && order_notes.value.length >= 1) {
|
||||||
metadata.setNotes(order_notes.value);
|
metadata.setNotes(order_notes.value);
|
||||||
updateNotes();
|
return updateNotes();
|
||||||
}
|
}
|
||||||
|
return Promise.resolve();
|
||||||
};
|
};
|
||||||
const mergeSafetySeal = () => {
|
const mergeSafetySeal = () => {
|
||||||
const resolvedSafetySeal = getResolvedMobileSafetySeal();
|
const resolvedSafetySeal = getResolvedMobileSafetySeal();
|
||||||
order_safety_seal.value = resolvedSafetySeal;
|
order_safety_seal.value = resolvedSafetySeal;
|
||||||
syncMobileSafetySealState(resolvedSafetySeal);
|
syncMobileSafetySealState(resolvedSafetySeal);
|
||||||
updateSafetySeal();
|
return updateSafetySeal();
|
||||||
};
|
};
|
||||||
const finalizeStep1 = async () => {
|
const finalizeStep1 = async () => {
|
||||||
mergeReferences();
|
await mergeReferences();
|
||||||
mergeNotes();
|
await mergeNotes();
|
||||||
mergeSafetySeal();
|
await mergeSafetySeal();
|
||||||
// Upload the attachments if there are any (And the order id has been created)
|
// Upload the attachments if there are any (And the order id has been created)
|
||||||
if (attachments.getBase64().length > 0 && order_id.value > 0) {
|
if (attachments.getBase64().length > 0 && order_id.value > 0) {
|
||||||
const uploadResults = await Promise.all(
|
const uploadResults = await Promise.all(
|
||||||
|
|||||||
+4
-3
@@ -5,6 +5,7 @@ import {
|
|||||||
order_safety_seal,
|
order_safety_seal,
|
||||||
reference,
|
reference,
|
||||||
clearStoredPosOrderId,
|
clearStoredPosOrderId,
|
||||||
|
saveOrderMetadataField,
|
||||||
} from "@/components/shop/POSDepartmentProcess.vue";
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
import { metadata } from "./PosDepartmentStepMobileFlow.vue";
|
import { metadata } from "./PosDepartmentStepMobileFlow.vue";
|
||||||
|
|
||||||
@@ -52,9 +53,9 @@ export const persistCurrentMobileOrderMetadata = async () => {
|
|||||||
order_notes.value = normalizedNotes;
|
order_notes.value = normalizedNotes;
|
||||||
|
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
SessionUser.objects.orders.set.reference(normalizedOrderId, normalizedReference),
|
saveOrderMetadataField("reference", normalizedReference, normalizedOrderId),
|
||||||
SessionUser.objects.orders.set.notes(normalizedOrderId, normalizedNotes),
|
saveOrderMetadataField("notes", normalizedNotes, normalizedOrderId),
|
||||||
SessionUser.objects.orders.set.safety_seal(normalizedOrderId, normalizedSafetySeal),
|
saveOrderMetadataField("safety_seal", normalizedSafetySeal, normalizedOrderId),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return normalizedOrderId;
|
return normalizedOrderId;
|
||||||
|
|||||||
+16
-5
@@ -1,6 +1,13 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onBeforeUnmount, onMounted, watch } from "vue";
|
import { ref, onBeforeUnmount, onMounted, watch } from "vue";
|
||||||
import { order_id, reg_1, reg_2, reg_3, getOrderDetails } from "@/components/shop/POSDepartmentProcess.vue";
|
import {
|
||||||
|
order_id,
|
||||||
|
reg_1,
|
||||||
|
reg_2,
|
||||||
|
reg_3,
|
||||||
|
registerPosStepSaveBarrier,
|
||||||
|
saveOrderMetadataField,
|
||||||
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
import PosDepartmentStepMobile1RegistrationNumberInputField from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile1RegistrationNumberInputField.vue";
|
import PosDepartmentStepMobile1RegistrationNumberInputField from "@/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile1RegistrationNumberInputField.vue";
|
||||||
import BarcodeScanner from "@/components/viewport/elements/icons/BarcodeScanner.vue";
|
import BarcodeScanner from "@/components/viewport/elements/icons/BarcodeScanner.vue";
|
||||||
import GenericButton from "@/components/viewport/page/templates/generic/graphics/GenericButton.vue";
|
import GenericButton from "@/components/viewport/page/templates/generic/graphics/GenericButton.vue";
|
||||||
@@ -103,9 +110,7 @@ const createRegistrationAutosave = (vehicleIndex: number) =>
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
await SessionUser.objects.orders.set[`reg_${vehicleIndex}`](normalizedOrderId, value);
|
return saveOrderMetadataField(`reg_${vehicleIndex}`, value, normalizedOrderId);
|
||||||
const refreshedOrder = await getOrderDetails(normalizedOrderId);
|
|
||||||
return refreshedOrder?.[`reg_${vehicleIndex}`] ?? value;
|
|
||||||
},
|
},
|
||||||
onSaved: async (value) => {
|
onSaved: async (value) => {
|
||||||
setPersistedRegistrationValue(vehicleIndex, value);
|
setPersistedRegistrationValue(vehicleIndex, value);
|
||||||
@@ -194,6 +199,11 @@ const flushAllRegistrations = async () => {
|
|||||||
await Promise.all([1, 2, 3].map((vehicleIndex) => registrationAutosaves[vehicleIndex].flush()));
|
await Promise.all([1, 2, 3].map((vehicleIndex) => registrationAutosaves[vehicleIndex].flush()));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const waitForAllRegistrationSaves = async () => {
|
||||||
|
await Promise.all([1, 2, 3].map((vehicleIndex) => registrationAutosaves[vehicleIndex].flushAndWait()));
|
||||||
|
};
|
||||||
|
const unregisterStepSaveBarrier = registerPosStepSaveBarrier(waitForAllRegistrationSaves);
|
||||||
|
|
||||||
// Function to set a value if it is not null
|
// Function to set a value if it is not null
|
||||||
const createVehicleSelectionFromSearchResult = (value: PosSearchResult) => ({
|
const createVehicleSelectionFromSearchResult = (value: PosSearchResult) => ({
|
||||||
...value,
|
...value,
|
||||||
@@ -266,11 +276,12 @@ onMounted(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
|
unregisterStepSaveBarrier();
|
||||||
void flushAllRegistrations();
|
void flushAllRegistrations();
|
||||||
});
|
});
|
||||||
|
|
||||||
const closeManualInput = async () => {
|
const closeManualInput = async () => {
|
||||||
await flushAllRegistrations();
|
await waitForAllRegistrationSaves();
|
||||||
emit("close");
|
emit("close");
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
+2
-1
@@ -12,6 +12,7 @@ import PosDepartmentStepMobileButtonNextStep from "@/components/displays/departm
|
|||||||
import SessionUser from "@/components/session/token/SessionUser.vue";
|
import SessionUser from "@/components/session/token/SessionUser.vue";
|
||||||
import { PosOrder } from "@/components/displays/department/pos/steps/mobile/objects/PosOrder.vue";
|
import { PosOrder } from "@/components/displays/department/pos/steps/mobile/objects/PosOrder.vue";
|
||||||
import WhiteBoxCard from "@/components/displays/boxes/WhiteBoxCard.vue";
|
import WhiteBoxCard from "@/components/displays/boxes/WhiteBoxCard.vue";
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
// Define the close event to emit when the component is closed
|
// Define the close event to emit when the component is closed
|
||||||
const emit = defineEmits(["close"]);
|
const emit = defineEmits(["close"]);
|
||||||
/** Display variables */
|
/** Display variables */
|
||||||
@@ -126,7 +127,7 @@ const liveTransactions = ref(null);
|
|||||||
const isLoading = ref(true);
|
const isLoading = ref(true);
|
||||||
|
|
||||||
const syncListTransactionHistory = async () => {
|
const syncListTransactionHistory = async () => {
|
||||||
let dateToday = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
|
let dateToday = todayLocalDateOnly(); // Get today's date in YYYY-MM-DD format
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
// Fetch the list of orders created today for the current department
|
// Fetch the list of orders created today for the current department
|
||||||
SessionUser.objects.orders.get
|
SessionUser.objects.orders.get
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { formatLocalDateOnly } from '@/services/dateOnly.js';
|
||||||
type startEndDate = {
|
type startEndDate = {
|
||||||
start: Date; // The start date of the range
|
start: Date; // The start date of the range
|
||||||
end: Date; // The end date of the range
|
end: Date; // The end date of the range
|
||||||
@@ -27,7 +28,7 @@ const datePresetFunctions = {
|
|||||||
month: {
|
month: {
|
||||||
// Get the first day of the month based on the provided date first day at 00:00:01
|
// Get the first day of the month based on the provided date first day at 00:00:01
|
||||||
firstDayOfMonth: (date: Date): Date => {
|
firstDayOfMonth: (date: Date): Date => {
|
||||||
return new Date(date.getFullYear(), date.getMonth(), 2, 0, 0, 1, 0); // Set to the first day of the month at 00:00:01
|
return new Date(date.getFullYear(), date.getMonth(), 1, 0, 0, 0, 0); // Set to the first day of the month at 00:00:00
|
||||||
},
|
},
|
||||||
// Get the last day of the month based on the provided date last day at 23:59:59
|
// Get the last day of the month based on the provided date last day at 23:59:59
|
||||||
lastDayOfMonth: (date: Date): Date => {
|
lastDayOfMonth: (date: Date): Date => {
|
||||||
@@ -116,7 +117,7 @@ export const datePresets = <datePreset[]>[
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
const convertToISO = (date: Date): string => {
|
const convertToISO = (date: Date): string => {
|
||||||
return date.toISOString().split('T')[0]; // Convert to YYYY-MM-DD format
|
return formatLocalDateOnly(date); // Convert to YYYY-MM-DD format
|
||||||
};
|
};
|
||||||
|
|
||||||
export const dateFunctions = {
|
export const dateFunctions = {
|
||||||
@@ -150,4 +151,4 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template></template>
|
<template></template>
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ if (router.currentRoute.value.params.departmentId) {
|
|||||||
<span>{{ t('common.add') }} {{ SessionUser.objects.department_notification_sms.meta.labels.single }}</span>
|
<span>{{ t('common.add') }} {{ SessionUser.objects.department_notification_sms.meta.labels.single }}</span>
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</template>
|
||||||
<DepartmentNotificationsPhoneTable :objects="list" />
|
<DepartmentNotificationsPhoneTable :objects="list" :load-list="loadList" />
|
||||||
</TableLabeledPagination>
|
</TableLabeledPagination>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ import ShowErrorField from "@/components/global/ShowErrorField.vue";
|
|||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
import { BSwitch } from "buefy";
|
import { BSwitch } from "buefy";
|
||||||
import { isUsageOrderAttachedToOrder } from "@/components/displays/department/pos/sync/xlvaskUsageFilters.js";
|
import { isUsageOrderAttachedToOrder } from "@/components/displays/department/pos/sync/xlvaskUsageFilters.js";
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -63,7 +64,7 @@ const parseInitialDate = (value) => {
|
|||||||
return new Date();
|
return new Date();
|
||||||
}
|
}
|
||||||
|
|
||||||
const parsed = new Date(`${value}T00:00:00`);
|
const parsed = parseLocalDateOnly(value);
|
||||||
return Number.isNaN(parsed.getTime()) ? new Date() : parsed;
|
return Number.isNaN(parsed.getTime()) ? new Date() : parsed;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -129,7 +130,7 @@ const dateFrom = ref(parseInitialDate(props.initialDateFrom));
|
|||||||
const dateTo = ref(parseInitialDate(props.initialDateTo));
|
const dateTo = ref(parseInitialDate(props.initialDateTo));
|
||||||
|
|
||||||
const parsedDate = (date) => {
|
const parsedDate = (date) => {
|
||||||
return new Date(date);
|
return parseLocalDateOnly(date);
|
||||||
};
|
};
|
||||||
|
|
||||||
const reloadScheduled = ref(false);
|
const reloadScheduled = ref(false);
|
||||||
@@ -148,14 +149,14 @@ const actions = {
|
|||||||
from: {
|
from: {
|
||||||
select: (date) => {
|
select: (date) => {
|
||||||
dateFrom.value = parsedDate(date);
|
dateFrom.value = parsedDate(date);
|
||||||
setFilter("StartTime-date_from", date.toISOString().split("T")[0], false);
|
setFilter("StartTime-date_from", formatLocalDateOnly(date), false);
|
||||||
scheduleReload();
|
scheduleReload();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
to: {
|
to: {
|
||||||
select: (date) => {
|
select: (date) => {
|
||||||
dateTo.value = parsedDate(date);
|
dateTo.value = parsedDate(date);
|
||||||
setFilter("StartTime-date_to", date.toISOString().split("T")[0], false);
|
setFilter("StartTime-date_to", formatLocalDateOnly(date), false);
|
||||||
scheduleReload();
|
scheduleReload();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
+4
-4
@@ -109,8 +109,8 @@ import OrdersTable from "@/components/displays/department/pos/orders/ordersTable
|
|||||||
import {SessionUser} from "@/components/session/token/SessionUser.vue";
|
import {SessionUser} from "@/components/session/token/SessionUser.vue";
|
||||||
import PaginationDisplayFilters from "@/components/displays/pagination/PaginationDisplayFilters.vue";
|
import PaginationDisplayFilters from "@/components/displays/pagination/PaginationDisplayFilters.vue";
|
||||||
import DatePeriodSelector from "@/components/displays/buttons/DatePeriodSelector.vue";
|
import DatePeriodSelector from "@/components/displays/buttons/DatePeriodSelector.vue";
|
||||||
import {now} from "@vueuse/core";
|
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly, todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -176,8 +176,8 @@ if (props.autoLoad) {
|
|||||||
const date_from = ref(null);
|
const date_from = ref(null);
|
||||||
const date_to = ref(null);
|
const date_to = ref(null);
|
||||||
const onDateRangeSelected = (newSelectionStartDate, newSelectionToDate) => {
|
const onDateRangeSelected = (newSelectionStartDate, newSelectionToDate) => {
|
||||||
const formattedStartDate = newSelectionStartDate.toISOString().split("T")[0];
|
const formattedStartDate = formatLocalDateOnly(newSelectionStartDate);
|
||||||
const formattedEndDate = newSelectionToDate.toISOString().split("T")[0];
|
const formattedEndDate = formatLocalDateOnly(newSelectionToDate);
|
||||||
date_from.value = formattedStartDate;
|
date_from.value = formattedStartDate;
|
||||||
date_to.value = formattedEndDate;
|
date_to.value = formattedEndDate;
|
||||||
setFilter("created_at-date_from", formattedStartDate, true);
|
setFilter("created_at-date_from", formattedStartDate, true);
|
||||||
@@ -361,7 +361,7 @@ const doesEndpointMatch = (matcher) => {
|
|||||||
<!-- Shortcuts for date filters -->
|
<!-- Shortcuts for date filters -->
|
||||||
<DatePeriodSelector :on-selection-change="onDateRangeSelected"
|
<DatePeriodSelector :on-selection-change="onDateRangeSelected"
|
||||||
:visibility="{ showDailySelector: false, showWeeklySelector: false, showMultipleMonthWarning: false, showUpdateButton: false, showMonthSelector: false, showStartDate: false, showEndDate: false, showSelectionValidity: false, showYearSelector: false, showToLabel: false }"
|
:visibility="{ showDailySelector: false, showWeeklySelector: false, showMultipleMonthWarning: false, showUpdateButton: false, showMonthSelector: false, showStartDate: false, showEndDate: false, showSelectionValidity: false, showYearSelector: false, showToLabel: false }"
|
||||||
v-bind:selection="{ startDate: date_from ? new Date(date_from) : new Date(now()), endDate: date_to ? new Date(date_to) : new Date(now()) }"/>
|
v-bind:selection="{ startDate: parseLocalDateOnly(date_from || todayLocalDateOnly()), endDate: parseLocalDateOnly(date_to || todayLocalDateOnly()) }"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #default>
|
<template #default>
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import {ref, watch} from "vue";
|
|||||||
import { Colors } from "@/ThemeConfig.vue";
|
import { Colors } from "@/ThemeConfig.vue";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -52,7 +53,7 @@ watch(() => getFilter("status"), (value) => {
|
|||||||
// If the route starts with /user, set the endpoint to /user/bookings
|
// If the route starts with /user, set the endpoint to /user/bookings
|
||||||
if (router.currentRoute.value.path.startsWith("/user")) {
|
if (router.currentRoute.value.path.startsWith("/user")) {
|
||||||
setEndpoint("/user/bookings", false);
|
setEndpoint("/user/bookings", false);
|
||||||
setFilter("date", new Date().toISOString().split("T")[0], false);
|
setFilter("date", todayLocalDateOnly(), false);
|
||||||
setOrder("created_at", "desc");
|
setOrder("created_at", "desc");
|
||||||
}
|
}
|
||||||
// If the route starts with /superuser, set the endpoint to /bookings
|
// If the route starts with /superuser, set the endpoint to /bookings
|
||||||
@@ -81,7 +82,7 @@ loadList();
|
|||||||
const showingToday = ref(true);
|
const showingToday = ref(true);
|
||||||
|
|
||||||
watch(() => getFilter("date"), (value) => {
|
watch(() => getFilter("date"), (value) => {
|
||||||
showingToday.value = value === new Date().toISOString().split("T")[0];
|
showingToday.value = value === todayLocalDateOnly();
|
||||||
});
|
});
|
||||||
|
|
||||||
// If the screen is mobile, set the is small variable to true
|
// If the screen is mobile, set the is small variable to true
|
||||||
@@ -151,7 +152,7 @@ const showNewOrderBookingsPortal = () => {
|
|||||||
<label class="label">{{ isSmall ? t('common.today') : t('pagination.show_only_today') }}</label>
|
<label class="label">{{ isSmall ? t('common.today') : t('pagination.show_only_today') }}</label>
|
||||||
<div class="control">
|
<div class="control">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<input id="today" type="checkbox" class="switch is-rounded" @change="(event) => { setFilter('date', event.target.checked ? new Date().toISOString().split('T')[0] : '*') }" checked="checked" :class="{ 'is-link': showingToday }" />
|
<input id="today" type="checkbox" class="switch is-rounded" @change="(event) => { setFilter('date', event.target.checked ? todayLocalDateOnly() : '*') }" checked="checked" :class="{ 'is-link': showingToday }" />
|
||||||
<label for="today"></label>
|
<label for="today"></label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -188,4 +189,4 @@ const showNewOrderBookingsPortal = () => {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import OrderBookingsTable from "@/views/dashboards/userDashboard/bookings/displa
|
|||||||
import { departments, getDepartments } from "@/components/pagination/departmentTabs.vue";
|
import { departments, getDepartments } from "@/components/pagination/departmentTabs.vue";
|
||||||
import { Colors } from "@/ThemeConfig.vue";
|
import { Colors } from "@/ThemeConfig.vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import { useI18n } from "vue-i18n";
|
||||||
|
import { endOfLocalDate, startOfLocalDate, todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
/**
|
/**
|
||||||
@@ -52,11 +53,9 @@ const onOnlyTodayFilterChange = (event, autoLoadList = true) => {
|
|||||||
setFilter("datetime-date_from", null, false);
|
setFilter("datetime-date_from", null, false);
|
||||||
setFilter("datetime-date_to", null, false);
|
setFilter("datetime-date_to", null, false);
|
||||||
} else {
|
} else {
|
||||||
const startOfDay = new Date().setHours(0, 0, 0, 0);
|
|
||||||
const endOfDay = new Date().setHours(23, 59, 59, 999);
|
|
||||||
//setFilter('datetime', null, false);
|
//setFilter('datetime', null, false);
|
||||||
setFilter("datetime-date_from", new Date(startOfDay).toISOString(), false);
|
setFilter("datetime-date_from", startOfLocalDate(val).toISOString(), false);
|
||||||
setFilter("datetime-date_to", new Date(endOfDay).toISOString(), false);
|
setFilter("datetime-date_to", endOfLocalDate(val).toISOString(), false);
|
||||||
}
|
}
|
||||||
if (autoLoadList) {
|
if (autoLoadList) {
|
||||||
loadList();
|
loadList();
|
||||||
@@ -95,7 +94,7 @@ onMounted(() => {
|
|||||||
departmentFilter.value = value;
|
departmentFilter.value = value;
|
||||||
} else if (key === "only_today" && value === true) {
|
} else if (key === "only_today" && value === true) {
|
||||||
setFilterKey = false; // Since the only_today filter is handled separately
|
setFilterKey = false; // Since the only_today filter is handled separately
|
||||||
onOnlyTodayFilterChange({ target: { value: new Date().toISOString().split("T")[0] } }, false);
|
onOnlyTodayFilterChange({ target: { value: todayLocalDateOnly() } }, false);
|
||||||
}
|
}
|
||||||
if (setFilterKey) {
|
if (setFilterKey) {
|
||||||
setFilter(key, value, false);
|
setFilter(key, value, false);
|
||||||
@@ -170,7 +169,7 @@ onMounted(() => {
|
|||||||
<div class="select">
|
<div class="select">
|
||||||
<select :value="onlyTodayFilter" @change="onOnlyTodayFilterChange">
|
<select :value="onlyTodayFilter" @change="onOnlyTodayFilterChange">
|
||||||
<option value="*">{{ t("common.all") }}</option>
|
<option value="*">{{ t("common.all") }}</option>
|
||||||
<option :value="new Date().toISOString().split('T')[0]">{{ t("common.yes") }}</option>
|
<option :value="todayLocalDateOnly()">{{ t("common.yes") }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -193,7 +192,7 @@ onMounted(() => {
|
|||||||
@change="
|
@change="
|
||||||
(event) => {
|
(event) => {
|
||||||
onOnlyTodayFilterChange({
|
onOnlyTodayFilterChange({
|
||||||
target: { value: event.target.checked ? new Date().toISOString().split('T')[0] : '*' },
|
target: { value: event.target.checked ? todayLocalDateOnly() : '*' },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
@@ -226,7 +225,7 @@ onMounted(() => {
|
|||||||
@change="
|
@change="
|
||||||
(event) => {
|
(event) => {
|
||||||
onOnlyTodayFilterChange(
|
onOnlyTodayFilterChange(
|
||||||
{ target: { value: event.target.checked ? new Date().toISOString().split('T')[0] : '*' } },
|
{ target: { value: event.target.checked ? todayLocalDateOnly() : '*' } },
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
onOrderIdFilterChange({ target: { value: event.target.checked ? 'is null' : '*' } });
|
onOrderIdFilterChange({ target: { value: event.target.checked ? 'is null' : '*' } });
|
||||||
|
|||||||
@@ -52,6 +52,10 @@ loadList();
|
|||||||
:columnLabels="{ type: SessionUser.objects.vehicles.columns.type.label }"
|
:columnLabels="{ type: SessionUser.objects.vehicles.columns.type.label }"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="$slots.actions" class="vehicles-pagination__add-action">
|
||||||
|
<label class="label is-small"> </label>
|
||||||
|
<slot name="actions" />
|
||||||
|
</div>
|
||||||
<!-- Create a new vehicle, if the route is /user -->
|
<!-- Create a new vehicle, if the route is /user -->
|
||||||
<div class="vehicles-pagination__add-action"
|
<div class="vehicles-pagination__add-action"
|
||||||
v-if="router.currentRoute.value.path.startsWith('/user')">
|
v-if="router.currentRoute.value.path.startsWith('/user')">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import PaginationDisplayItemColumn from "@/components/displays/pagination/PaginationDisplayItemColumn.vue";
|
import PaginationDisplayItemColumn from "@/components/displays/pagination/PaginationDisplayItemColumn.vue";
|
||||||
import { ref, computed } from "vue";
|
import { computed } from "vue";
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
label: {
|
label: {
|
||||||
type: String,
|
type: String,
|
||||||
@@ -19,7 +20,7 @@ defineExpose({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const formattedDate = computed(() => {
|
const formattedDate = computed(() => {
|
||||||
return date.value.toISOString().split('T')[0];
|
return formatLocalDateOnly(date.value);
|
||||||
});
|
});
|
||||||
|
|
||||||
// This component is used to display a date input in a pagination display item column.
|
// This component is used to display a date input in a pagination display item column.
|
||||||
@@ -36,8 +37,7 @@ const formattedDate = computed(() => {
|
|||||||
class="input"
|
class="input"
|
||||||
:value="formattedDate"
|
:value="formattedDate"
|
||||||
@input="(e) => {
|
@input="(e) => {
|
||||||
const newDate = new Date(e.target.value);
|
const newDate = parseLocalDateOnly(e.target.value);
|
||||||
console.log('Selected date:', newDate);
|
|
||||||
emit('update:date', newDate);
|
emit('update:date', newDate);
|
||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
@@ -47,4 +47,4 @@ const formattedDate = computed(() => {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { SessionUser } from '@/components/session/token/SessionUser.vue';
|
import { SessionUser } from '@/components/session/token/SessionUser.vue';
|
||||||
|
|
||||||
@@ -10,7 +9,7 @@ import PaginationDisplayTemplateButton
|
|||||||
from "@/components/displays/pagination/templates/PaginationDisplayTemplateButton.vue";
|
from "@/components/displays/pagination/templates/PaginationDisplayTemplateButton.vue";
|
||||||
import { datePresets , dateFunctions} from '@/components/displays/pagination/PaginationDisplayDates.vue';
|
import { datePresets , dateFunctions} from '@/components/displays/pagination/PaginationDisplayDates.vue';
|
||||||
|
|
||||||
const props = defineProps({
|
defineProps({
|
||||||
startDate: {
|
startDate: {
|
||||||
type: Date,
|
type: Date,
|
||||||
required: true,
|
required: true,
|
||||||
@@ -46,6 +45,7 @@ function updateStartDate(date: Date) {
|
|||||||
// Update the end date model when the date is changed
|
// Update the end date model when the date is changed
|
||||||
function updateEndDate(date: Date) {
|
function updateEndDate(date: Date) {
|
||||||
endDateModel.value = date;
|
endDateModel.value = date;
|
||||||
|
emits('update:endDate', date);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -79,4 +79,4 @@ function updateEndDate(date: Date) {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { showDownloadWashCertificate } from "@/components/shop/DownloadWashCerti
|
|||||||
import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
|
import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
|
||||||
import Swal from 'sweetalert2';
|
import Swal from 'sweetalert2';
|
||||||
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
|
import EditableTableColumn from "@/components/displays/buttons/EditableTableColumn.vue";
|
||||||
|
import { todayLocalDateOnly, yesterdayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
const redirectBookingObjectPage = (objectId) => {
|
const redirectBookingObjectPage = (objectId) => {
|
||||||
// Send the user to the object page
|
// Send the user to the object page
|
||||||
window.location.href = `/user/bookings/${objectId}`;
|
window.location.href = `/user/bookings/${objectId}`;
|
||||||
@@ -237,7 +238,8 @@ window.addEventListener('resize', () => {
|
|||||||
* To organize the bookings, we want to show the bookings that are created today first, then yesterday, then all other days
|
* To organize the bookings, we want to show the bookings that are created today first, then yesterday, then all other days
|
||||||
* @type {string}
|
* @type {string}
|
||||||
*/
|
*/
|
||||||
const currentDate = new Date().toISOString().split("T")[0];
|
const currentDate = todayLocalDateOnly();
|
||||||
|
const previousDate = yesterdayLocalDateOnly();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sort the bookings by date
|
* Sort the bookings by date
|
||||||
@@ -362,7 +364,7 @@ const canUserEditObject = (object) => {
|
|||||||
</span>
|
</span>
|
||||||
<span class="has-text-grey">
|
<span class="has-text-grey">
|
||||||
<!-- Human readable date (Today, Yesterday, etc.) -->
|
<!-- Human readable date (Today, Yesterday, etc.) -->
|
||||||
{{ object.date === currentDate ? $t('tables.bookings.today') : object.date === new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().split("T")[0] ? $t('tables.bookings.yesterday') : object.date }}
|
{{ object.date === currentDate ? $t('tables.bookings.today') : object.date === previousDate ? $t('tables.bookings.yesterday') : object.date }}
|
||||||
<!-- Number of bookings on the date -->
|
<!-- Number of bookings on the date -->
|
||||||
({{ $t('tables.bookings.bookings_count', { count: objects.filter((booking) => booking.date === object.date).length }) }})
|
({{ $t('tables.bookings.bookings_count', { count: objects.filter((booking) => booking.date === object.date).length }) }})
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ const props = defineProps(['label', 'isText']);
|
|||||||
const label = computed(() => props.label || t('admin.pos.buttons.go_back'));
|
const label = computed(() => props.label || t('admin.pos.buttons.go_back'));
|
||||||
|
|
||||||
// Go to previous step
|
// Go to previous step
|
||||||
const goToPreviousStep = () => {
|
const goToPreviousStep = async () => {
|
||||||
// Get the department id
|
// Get the department id
|
||||||
previousStep();
|
await previousStep();
|
||||||
}
|
}
|
||||||
|
|
||||||
const emptyIfText = (string) => props.isText ? '' : string;
|
const emptyIfText = (string) => props.isText ? '' : string;
|
||||||
@@ -32,4 +32,4 @@ const emptyIfText = (string) => props.isText ? '' : string;
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,241 @@
|
|||||||
|
<script setup>
|
||||||
|
import { computed, nextTick, onMounted, ref } from "vue";
|
||||||
|
import { useI18n } from "vue-i18n";
|
||||||
|
import CustomerSearchSelect from "@/components/search/economic/CustomerSearchSelect.vue";
|
||||||
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
|
|
||||||
|
const emit = defineEmits(["close", "created"]);
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
const selectedCustomer = ref(null);
|
||||||
|
const registrationNumber = ref("");
|
||||||
|
const vehicleType = ref("");
|
||||||
|
const washSubscription = ref(false);
|
||||||
|
const reference = ref("");
|
||||||
|
const vehicleTypeOptions = ref([]);
|
||||||
|
const isLoadingVehicleTypes = ref(false);
|
||||||
|
const isSubmitting = ref(false);
|
||||||
|
const errorMessage = ref("");
|
||||||
|
const vehicleTypeError = ref("");
|
||||||
|
|
||||||
|
const getCustomerNumber = (customer) => {
|
||||||
|
const parsedValue = Number.parseInt(
|
||||||
|
String(customer?.customerNumber ?? customer?.customer_number ?? customer?.customer_id ?? customer?.id ?? ""),
|
||||||
|
10
|
||||||
|
);
|
||||||
|
|
||||||
|
return Number.isInteger(parsedValue) && parsedValue > 0 ? parsedValue : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const selectedCustomerNumber = computed(() => getCustomerNumber(selectedCustomer.value));
|
||||||
|
|
||||||
|
const normalizedVehicleType = computed(() => {
|
||||||
|
if (vehicleType.value === "") {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsedValue = Number.parseInt(String(vehicleType.value), 10);
|
||||||
|
return Number.isInteger(parsedValue) && parsedValue >= 0 ? parsedValue : null;
|
||||||
|
});
|
||||||
|
|
||||||
|
const normalizedRegistrationNumber = computed(() => {
|
||||||
|
return registrationNumber.value.trim().toUpperCase();
|
||||||
|
});
|
||||||
|
|
||||||
|
const canSubmit = computed(() => {
|
||||||
|
return (
|
||||||
|
!isSubmitting.value &&
|
||||||
|
!isLoadingVehicleTypes.value &&
|
||||||
|
selectedCustomerNumber.value !== null &&
|
||||||
|
normalizedRegistrationNumber.value.length > 0 &&
|
||||||
|
normalizedVehicleType.value !== null
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
const parseErrorMessage = (error) => {
|
||||||
|
return SessionUser.functions.parseErrorMessage(error) || t("vehicles.add_modal.error");
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadVehicleTypes = async () => {
|
||||||
|
isLoadingVehicleTypes.value = true;
|
||||||
|
vehicleTypeError.value = "";
|
||||||
|
|
||||||
|
try {
|
||||||
|
vehicleTypeOptions.value = await SessionUser.objects.vehicles.columns.type.options();
|
||||||
|
} catch (error) {
|
||||||
|
vehicleTypeError.value = parseErrorMessage(error) || t("vehicles.add_modal.type_load_error");
|
||||||
|
} finally {
|
||||||
|
isLoadingVehicleTypes.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeModal = () => {
|
||||||
|
if (!isSubmitting.value) {
|
||||||
|
emit("close");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const submitVehicle = async () => {
|
||||||
|
if (!canSubmit.value) {
|
||||||
|
errorMessage.value = t("vehicles.add_modal.validation_error");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
isSubmitting.value = true;
|
||||||
|
errorMessage.value = "";
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await SessionUser.objects.vehicles.add(
|
||||||
|
normalizedVehicleType.value,
|
||||||
|
normalizedRegistrationNumber.value,
|
||||||
|
washSubscription.value,
|
||||||
|
selectedCustomerNumber.value,
|
||||||
|
reference.value.trim() || null
|
||||||
|
);
|
||||||
|
|
||||||
|
emit("created", response);
|
||||||
|
} catch (error) {
|
||||||
|
errorMessage.value = parseErrorMessage(error);
|
||||||
|
} finally {
|
||||||
|
isSubmitting.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
await loadVehicleTypes();
|
||||||
|
await nextTick();
|
||||||
|
document.getElementById("superuser-add-vehicle-customer-search")?.focus();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="modal is-active" data-testid="superuser-add-vehicle-modal">
|
||||||
|
<div class="modal-background" @click="closeModal"></div>
|
||||||
|
<div class="modal-card superuser-add-vehicle-modal">
|
||||||
|
<header class="modal-card-head">
|
||||||
|
<p class="modal-card-title">{{ t("vehicles.add_modal.title") }}</p>
|
||||||
|
<button
|
||||||
|
class="delete"
|
||||||
|
type="button"
|
||||||
|
:aria-label="t('common.close')"
|
||||||
|
data-testid="superuser-add-vehicle-close"
|
||||||
|
@click="closeModal"
|
||||||
|
></button>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<section class="modal-card-body">
|
||||||
|
<div v-if="errorMessage" class="notification is-danger is-light" data-testid="superuser-add-vehicle-error">
|
||||||
|
{{ errorMessage }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<CustomerSearchSelect
|
||||||
|
v-model="selectedCustomer"
|
||||||
|
input-id="superuser-add-vehicle-customer-search"
|
||||||
|
test-id-prefix="superuser-add-vehicle-customer"
|
||||||
|
:disabled="isSubmitting"
|
||||||
|
:placeholder="t('vehicles.add_modal.customer_placeholder')"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label class="label" for="superuser-add-vehicle-registration">{{ t("vehicles.form.license_plate") }}</label>
|
||||||
|
<div class="control">
|
||||||
|
<input
|
||||||
|
id="superuser-add-vehicle-registration"
|
||||||
|
v-model="registrationNumber"
|
||||||
|
class="input"
|
||||||
|
type="text"
|
||||||
|
autocomplete="off"
|
||||||
|
:placeholder="t('vehicles.add_modal.registration_placeholder')"
|
||||||
|
:disabled="isSubmitting"
|
||||||
|
data-testid="superuser-add-vehicle-registration"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label class="label" for="superuser-add-vehicle-type">{{ t("vehicles.form.type") }}</label>
|
||||||
|
<div class="control" :class="{ 'is-loading': isLoadingVehicleTypes }">
|
||||||
|
<div class="select is-fullwidth">
|
||||||
|
<select
|
||||||
|
id="superuser-add-vehicle-type"
|
||||||
|
v-model="vehicleType"
|
||||||
|
:disabled="isSubmitting || isLoadingVehicleTypes || vehicleTypeOptions.length === 0"
|
||||||
|
data-testid="superuser-add-vehicle-type"
|
||||||
|
>
|
||||||
|
<option disabled value="">{{ t("vehicles.add_modal.type_placeholder") }}</option>
|
||||||
|
<option v-for="option in vehicleTypeOptions" :key="option.id" :value="option.id">
|
||||||
|
{{ option.name }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p v-if="vehicleTypeError" class="help is-danger" data-testid="superuser-add-vehicle-type-error">
|
||||||
|
{{ vehicleTypeError }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label class="checkbox">
|
||||||
|
<input
|
||||||
|
v-model="washSubscription"
|
||||||
|
type="checkbox"
|
||||||
|
:disabled="isSubmitting"
|
||||||
|
data-testid="superuser-add-vehicle-wash-subscription"
|
||||||
|
/>
|
||||||
|
{{ t("objects.vehicles.columns.wash_subscription") }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label class="label" for="superuser-add-vehicle-reference">{{ t("common.reference") }}</label>
|
||||||
|
<div class="control">
|
||||||
|
<input
|
||||||
|
id="superuser-add-vehicle-reference"
|
||||||
|
v-model="reference"
|
||||||
|
class="input"
|
||||||
|
type="text"
|
||||||
|
autocomplete="off"
|
||||||
|
:placeholder="t('vehicles.add_modal.reference_placeholder')"
|
||||||
|
:disabled="isSubmitting"
|
||||||
|
data-testid="superuser-add-vehicle-reference"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<footer class="modal-card-foot is-justify-content-flex-end">
|
||||||
|
<button
|
||||||
|
class="button"
|
||||||
|
type="button"
|
||||||
|
:disabled="isSubmitting"
|
||||||
|
data-testid="superuser-add-vehicle-cancel"
|
||||||
|
@click="closeModal"
|
||||||
|
>
|
||||||
|
{{ t("common.cancel") }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="button is-link"
|
||||||
|
type="button"
|
||||||
|
:class="{ 'is-loading': isSubmitting }"
|
||||||
|
:disabled="!canSubmit"
|
||||||
|
data-testid="superuser-add-vehicle-submit"
|
||||||
|
@click="submitVehicle"
|
||||||
|
>
|
||||||
|
{{ t("vehicles.add_modal.submit") }}
|
||||||
|
</button>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.superuser-add-vehicle-modal {
|
||||||
|
max-width: min(44rem, calc(100vw - 2rem));
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-card-body {
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -19,17 +19,17 @@ const SENSITIVE_QUERY_KEYS = /authorization|password|passwd|secret|token|api[_-]
|
|||||||
const FALLBACK_LABELS = {
|
const FALLBACK_LABELS = {
|
||||||
"error_report.button": "Report error",
|
"error_report.button": "Report error",
|
||||||
"error_report.title": "Report error",
|
"error_report.title": "Report error",
|
||||||
"error_report.subtitle": "Send the current screen and recent error details to support.",
|
"error_report.subtitle": "Send recent error details to support. A screenshot is attached when available.",
|
||||||
"error_report.before_error": "What were you doing before the error occurred?",
|
"error_report.before_error": "What were you doing before the error occurred?",
|
||||||
"error_report.expected": "What did you expect would happen?",
|
"error_report.expected": "What did you expect would happen?",
|
||||||
"error_report.actual": "What actually happened?",
|
"error_report.actual": "What actually happened?",
|
||||||
"error_report.before_error_placeholder": "Describe the action you were taking, for example opening orders or selecting a customer.",
|
"error_report.before_error_placeholder": "Describe the action you were taking, for example opening orders or selecting a customer.",
|
||||||
"error_report.expected_placeholder": "Describe the result you expected to see.",
|
"error_report.expected_placeholder": "Describe the result you expected to see.",
|
||||||
"error_report.actual_placeholder": "Describe what you saw instead, including any error text.",
|
"error_report.actual_placeholder": "Describe what you saw instead, including any error text.",
|
||||||
"error_report.consent": "I accept that the current app screen, recent request errors, Vue errors, browser details, and my answers are collected for troubleshooting.",
|
"error_report.consent": "I accept that recent request errors, Vue errors, browser details, my answers, and an app screenshot when available are collected for troubleshooting.",
|
||||||
"error_report.submit": "Submit report",
|
"error_report.submit": "Submit report",
|
||||||
"error_report.submitted": "Error report submitted.",
|
"error_report.submitted": "Error report submitted.",
|
||||||
"error_report.capture_failed": "The screen capture failed. Please try again.",
|
"error_report.capture_failed": "The screen capture failed. The report will be sent without a screenshot.",
|
||||||
"error_report.submit_failed": "The error report could not be submitted.",
|
"error_report.submit_failed": "The error report could not be submitted.",
|
||||||
"error_report.required": "All fields and data collection acceptance are required.",
|
"error_report.required": "All fields and data collection acceptance are required.",
|
||||||
};
|
};
|
||||||
@@ -277,15 +277,18 @@ const submit = async () => {
|
|||||||
|
|
||||||
isSubmitting.value = true;
|
isSubmitting.value = true;
|
||||||
try {
|
try {
|
||||||
let screenshot = "";
|
let screenshot = null;
|
||||||
try {
|
try {
|
||||||
screenshot = await captureScreenshot();
|
screenshot = await captureScreenshot();
|
||||||
} catch {
|
} catch {
|
||||||
captureError.value = tr("error_report.capture_failed");
|
captureError.value = tr("error_report.capture_failed");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const context = buildContext();
|
const context = buildContext();
|
||||||
|
context.screenshot_attachment = {
|
||||||
|
status: screenshot ? "stored" : "capture_failed",
|
||||||
|
attached: Boolean(screenshot),
|
||||||
|
};
|
||||||
await submitErrorReport({
|
await submitErrorReport({
|
||||||
before_error: form.before_error.trim(),
|
before_error: form.before_error.trim(),
|
||||||
expected: form.expected.trim(),
|
expected: form.expected.trim(),
|
||||||
@@ -340,7 +343,7 @@ const submit = async () => {
|
|||||||
<div v-if="submitted" class="notification is-success is-light" data-testid="error-report-submitted">
|
<div v-if="submitted" class="notification is-success is-light" data-testid="error-report-submitted">
|
||||||
{{ tr("error_report.submitted") }}
|
{{ tr("error_report.submitted") }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="captureError" class="notification is-danger is-light">
|
<div v-if="captureError" class="notification is-warning is-light" data-testid="error-report-capture-warning">
|
||||||
{{ captureError }}
|
{{ captureError }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="submitError" class="notification is-danger is-light">
|
<div v-if="submitError" class="notification is-danger is-light">
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { ref, watch, onMounted } from "vue";
|
|||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
import { isAccessibleVisibleNamedDepartment, sortByDepartmentPriorityOrder } from "@/services/departmentVisibility.js";
|
import { isAccessibleVisibleNamedDepartment, sortByDepartmentPriorityOrder } from "@/services/departmentVisibility.js";
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
// Get the department ID from the URL
|
// Get the department ID from the URL
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const department_id = route.params.departmentId || SessionUser.functions.getDepartmentIdFromUrl() || null;
|
const department_id = route.params.departmentId || SessionUser.functions.getDepartmentIdFromUrl() || null;
|
||||||
@@ -73,9 +74,9 @@ const emphasis = ref({
|
|||||||
"department:" +
|
"department:" +
|
||||||
department_id +
|
department_id +
|
||||||
",status:pending,date-date_from:" +
|
",status:pending,date-date_from:" +
|
||||||
new Date().toISOString().split("T")[0] +
|
todayLocalDateOnly() +
|
||||||
",date-date_to:" +
|
",date-date_to:" +
|
||||||
new Date().toISOString().split("T")[0],
|
todayLocalDateOnly(),
|
||||||
limit: 1, // Limit to 1 booking, we only need to know if there are any bookings or not
|
limit: 1, // Limit to 1 booking, we only need to know if there are any bookings or not
|
||||||
page: 1,
|
page: 1,
|
||||||
})
|
})
|
||||||
@@ -97,7 +98,7 @@ const emphasis = ref({
|
|||||||
* Check if the department has a daily report for today
|
* Check if the department has a daily report for today
|
||||||
*/
|
*/
|
||||||
SessionUser.request(SessionUser.objects.department_daily_reports.meta.endpoint + "/get", "GET", {
|
SessionUser.request(SessionUser.objects.department_daily_reports.meta.endpoint + "/get", "GET", {
|
||||||
date: new Date().toISOString().split("T")[0],
|
date: todayLocalDateOnly(),
|
||||||
id: department_id, // This refers to the department ID
|
id: department_id, // This refers to the department ID
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
|
|||||||
@@ -0,0 +1,288 @@
|
|||||||
|
<script setup>
|
||||||
|
import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";
|
||||||
|
import { useI18n } from "vue-i18n";
|
||||||
|
import { isSearching, searchCustomer, searchCustomerResults } from "@/components/search/economic/customerSearch.vue";
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
modelValue: {
|
||||||
|
type: Object,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
|
disabled: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
inputId: {
|
||||||
|
type: String,
|
||||||
|
default: "customer-search-select-input",
|
||||||
|
},
|
||||||
|
testIdPrefix: {
|
||||||
|
type: String,
|
||||||
|
default: "customer-search-select",
|
||||||
|
},
|
||||||
|
placeholder: {
|
||||||
|
type: String,
|
||||||
|
default: "",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const emit = defineEmits(["update:modelValue", "selected", "cleared"]);
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
const searchQuery = ref("");
|
||||||
|
const showResults = ref(false);
|
||||||
|
const selectedResultIndex = ref(-1);
|
||||||
|
|
||||||
|
const getCustomerNumber = (customer) => {
|
||||||
|
const parsedValue = Number.parseInt(
|
||||||
|
String(customer?.customerNumber ?? customer?.customer_number ?? customer?.customer_id ?? customer?.id ?? ""),
|
||||||
|
10
|
||||||
|
);
|
||||||
|
|
||||||
|
return Number.isInteger(parsedValue) && parsedValue > 0 ? parsedValue : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getCustomerName = (customer) => {
|
||||||
|
return String(customer?.name ?? customer?.customer_name ?? customer?.customerName ?? "").trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
const getCustomerCity = (customer) => {
|
||||||
|
return String(customer?.city ?? customer?.address_city ?? "").trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatCustomer = (customer) => {
|
||||||
|
if (!customer) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
const name = getCustomerName(customer);
|
||||||
|
const customerNumber = getCustomerNumber(customer);
|
||||||
|
|
||||||
|
return [name, customerNumber ? `#${customerNumber}` : null].filter(Boolean).join(" - ");
|
||||||
|
};
|
||||||
|
|
||||||
|
const selectedCustomerNumber = computed(() => getCustomerNumber(props.modelValue));
|
||||||
|
const selectedCustomerName = computed(() => getCustomerName(props.modelValue));
|
||||||
|
const selectedCustomerCity = computed(() => getCustomerCity(props.modelValue));
|
||||||
|
const hasResults = computed(() => searchCustomerResults.value.length > 0);
|
||||||
|
const placeholderText = computed(() => props.placeholder || t("vehicles.add_modal.customer_placeholder"));
|
||||||
|
|
||||||
|
const resetSearchResults = () => {
|
||||||
|
searchCustomer(null);
|
||||||
|
selectedResultIndex.value = -1;
|
||||||
|
};
|
||||||
|
|
||||||
|
const setSelectedCustomer = (customer) => {
|
||||||
|
emit("update:modelValue", customer);
|
||||||
|
emit("selected", customer);
|
||||||
|
searchQuery.value = formatCustomer(customer);
|
||||||
|
showResults.value = false;
|
||||||
|
selectedResultIndex.value = -1;
|
||||||
|
};
|
||||||
|
|
||||||
|
const clearSelectedCustomer = async () => {
|
||||||
|
emit("update:modelValue", null);
|
||||||
|
emit("cleared");
|
||||||
|
searchQuery.value = "";
|
||||||
|
showResults.value = false;
|
||||||
|
resetSearchResults();
|
||||||
|
await nextTick();
|
||||||
|
document.getElementById(props.inputId)?.focus();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSearchInput = () => {
|
||||||
|
if (props.modelValue) {
|
||||||
|
emit("update:modelValue", null);
|
||||||
|
}
|
||||||
|
|
||||||
|
const query = searchQuery.value.trim();
|
||||||
|
selectedResultIndex.value = -1;
|
||||||
|
|
||||||
|
if (!query) {
|
||||||
|
showResults.value = false;
|
||||||
|
resetSearchResults();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
showResults.value = true;
|
||||||
|
searchCustomer(query);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleFocus = () => {
|
||||||
|
if (searchQuery.value.trim() && hasResults.value) {
|
||||||
|
showResults.value = true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBlur = () => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
showResults.value = false;
|
||||||
|
selectedResultIndex.value = -1;
|
||||||
|
}, 150);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleKeydown = (event) => {
|
||||||
|
if (!showResults.value || !hasResults.value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.key === "ArrowDown") {
|
||||||
|
event.preventDefault();
|
||||||
|
selectedResultIndex.value = Math.min(selectedResultIndex.value + 1, searchCustomerResults.value.length - 1);
|
||||||
|
} else if (event.key === "ArrowUp") {
|
||||||
|
event.preventDefault();
|
||||||
|
selectedResultIndex.value = Math.max(selectedResultIndex.value - 1, 0);
|
||||||
|
} else if (event.key === "Enter") {
|
||||||
|
event.preventDefault();
|
||||||
|
const selectedCustomer = searchCustomerResults.value[selectedResultIndex.value] || searchCustomerResults.value[0];
|
||||||
|
if (selectedCustomer) {
|
||||||
|
setSelectedCustomer(selectedCustomer);
|
||||||
|
}
|
||||||
|
} else if (event.key === "Escape") {
|
||||||
|
showResults.value = false;
|
||||||
|
selectedResultIndex.value = -1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.modelValue,
|
||||||
|
(customer) => {
|
||||||
|
if (customer) {
|
||||||
|
searchQuery.value = formatCustomer(customer);
|
||||||
|
} else if (!document.activeElement || document.activeElement.id !== props.inputId) {
|
||||||
|
searchQuery.value = "";
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
resetSearchResults();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="customer-search-select">
|
||||||
|
<div class="field">
|
||||||
|
<label class="label" :for="inputId">{{ t("vehicles.add_modal.customer_label") }}</label>
|
||||||
|
<div class="control has-icons-left" :class="{ 'is-loading': isSearching }">
|
||||||
|
<input
|
||||||
|
:id="inputId"
|
||||||
|
v-model="searchQuery"
|
||||||
|
class="input"
|
||||||
|
type="text"
|
||||||
|
autocomplete="off"
|
||||||
|
:placeholder="placeholderText"
|
||||||
|
:disabled="disabled"
|
||||||
|
:aria-expanded="showResults && hasResults"
|
||||||
|
:data-testid="`${testIdPrefix}-input`"
|
||||||
|
@input="handleSearchInput"
|
||||||
|
@focus="handleFocus"
|
||||||
|
@blur="handleBlur"
|
||||||
|
@keydown="handleKeydown"
|
||||||
|
/>
|
||||||
|
<span class="icon is-left">
|
||||||
|
<i class="fas fa-search"></i>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="showResults && hasResults"
|
||||||
|
class="dropdown is-active customer-search-select__dropdown"
|
||||||
|
:data-testid="`${testIdPrefix}-results`"
|
||||||
|
>
|
||||||
|
<div class="dropdown-menu customer-search-select__menu" role="listbox">
|
||||||
|
<div class="dropdown-content">
|
||||||
|
<button
|
||||||
|
v-for="(customer, index) in searchCustomerResults"
|
||||||
|
:key="getCustomerNumber(customer) || index"
|
||||||
|
type="button"
|
||||||
|
class="dropdown-item customer-search-select__option"
|
||||||
|
:class="{ 'is-active': selectedResultIndex === index }"
|
||||||
|
:data-testid="`${testIdPrefix}-option-${index}`"
|
||||||
|
@mousedown.prevent="setSelectedCustomer(customer)"
|
||||||
|
>
|
||||||
|
<span class="customer-search-select__option-main">{{ getCustomerName(customer) }}</span>
|
||||||
|
<span class="customer-search-select__option-meta">
|
||||||
|
#{{ getCustomerNumber(customer) }}
|
||||||
|
<template v-if="getCustomerCity(customer)"> · {{ getCustomerCity(customer) }}</template>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="modelValue" class="customer-search-select__selected" :data-testid="`${testIdPrefix}-selected`">
|
||||||
|
<div>
|
||||||
|
<p class="has-text-weight-semibold">{{ t("vehicles.add_modal.selected_customer") }}</p>
|
||||||
|
<p>{{ selectedCustomerName }}</p>
|
||||||
|
<p class="is-size-7 has-text-grey">
|
||||||
|
#{{ selectedCustomerNumber }}
|
||||||
|
<span v-if="selectedCustomerCity"> · {{ selectedCustomerCity }}</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="button is-small is-light"
|
||||||
|
:disabled="disabled"
|
||||||
|
:data-testid="`${testIdPrefix}-clear`"
|
||||||
|
@click="clearSelectedCustomer"
|
||||||
|
>
|
||||||
|
{{ t("common.clear") }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.customer-search-select {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-search-select__dropdown,
|
||||||
|
.customer-search-select__menu {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-search-select__dropdown {
|
||||||
|
left: 0;
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
top: 4.75rem;
|
||||||
|
z-index: 40;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-search-select__option {
|
||||||
|
align-items: flex-start;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
text-align: left;
|
||||||
|
white-space: normal;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-search-select__option-main {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-search-select__option-meta {
|
||||||
|
color: #6b7280;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-search-select__selected {
|
||||||
|
align-items: flex-start;
|
||||||
|
background: #f5f8fc;
|
||||||
|
border: 1px solid #d8e2ef;
|
||||||
|
border-radius: 6px;
|
||||||
|
display: flex;
|
||||||
|
gap: 1rem;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
padding: 0.85rem 1rem;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -5,6 +5,7 @@ import { ObjectsGlobal } from "@/components/session/token/SessionUser/Objects/Ob
|
|||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import {ref} from "vue";
|
import {ref} from "vue";
|
||||||
import i18n from '@/i18n';
|
import i18n from '@/i18n';
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const t = (key) => i18n.global.t(key);
|
const t = (key) => i18n.global.t(key);
|
||||||
|
|
||||||
@@ -241,7 +242,7 @@ export const Bookings = {
|
|||||||
'/bookings',
|
'/bookings',
|
||||||
'GET',
|
'GET',
|
||||||
{
|
{
|
||||||
filters: `department:${department},status:pending,date-date_from:${new Date().toISOString().split('T')[0]},date-date_to:${new Date().toISOString().split('T')[0]}`,
|
filters: `department:${department},status:pending,date-date_from:${todayLocalDateOnly()},date-date_to:${todayLocalDateOnly()}`,
|
||||||
limit: 100,
|
limit: 100,
|
||||||
page: 1
|
page: 1
|
||||||
}
|
}
|
||||||
@@ -289,4 +290,4 @@ export const Bookings = {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { ObjectsGlobal } from "@/components/session/token/SessionUser/Objects/Ob
|
|||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import {ref} from "vue";
|
import {ref} from "vue";
|
||||||
import i18n from '@/i18n';
|
import i18n from '@/i18n';
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const t = (key) => i18n.global.t(key);
|
const t = (key) => i18n.global.t(key);
|
||||||
|
|
||||||
@@ -80,7 +81,7 @@ const t = (key) => i18n.global.t(key);
|
|||||||
water_usage_morning: parseInt(water_usage_morning),
|
water_usage_morning: parseInt(water_usage_morning),
|
||||||
water_usage: parseInt(water_usage),
|
water_usage: parseInt(water_usage),
|
||||||
notes: notes ? notes : 'Daily report',
|
notes: notes ? notes : 'Daily report',
|
||||||
date: date ? date : new Date().toISOString().split('T')[0]
|
date: date ? date : todayLocalDateOnly()
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import { ObjectsGlobal } from "@/components/session/token/SessionUser/Objects/ObjectsGlobal.vue";
|
import { ObjectsGlobal } from "@/components/session/token/SessionUser/Objects/ObjectsGlobal.vue";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
|
import { formatLocalDateOnly, todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The DepartmentTimeBookingsEntries object
|
* The DepartmentTimeBookingsEntries object
|
||||||
@@ -230,10 +231,10 @@ export const DepartmentTimeBookingsEntries = {
|
|||||||
if (!dateFrom) {
|
if (!dateFrom) {
|
||||||
const lastWeek = new Date();
|
const lastWeek = new Date();
|
||||||
lastWeek.setDate(lastWeek.getDate() - 7);
|
lastWeek.setDate(lastWeek.getDate() - 7);
|
||||||
dateFrom = lastWeek.toISOString().split('T')[0]; // Format as YYYY-MM-DD
|
dateFrom = formatLocalDateOnly(lastWeek); // Format as YYYY-MM-DD
|
||||||
}
|
}
|
||||||
if (!dateTo) {
|
if (!dateTo) {
|
||||||
dateTo = new Date().toISOString().split('T')[0]; // Format as YYYY-MM-DD
|
dateTo = todayLocalDateOnly(); // Format as YYYY-MM-DD
|
||||||
}
|
}
|
||||||
console.log("Fetching public available times for department:", departmentId, "from", dateFrom, "to", dateTo);
|
console.log("Fetching public available times for department:", departmentId, "from", dateFrom, "to", dateTo);
|
||||||
// Make the request to fetch public available times for the department
|
// Make the request to fetch public available times for the department
|
||||||
@@ -279,4 +280,4 @@ export const DepartmentTimeBookingsEntries = {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -52,6 +52,42 @@ export const nextStepDelay = ref(0); // 2 seconds delay
|
|||||||
export const isCreatingOrder = ref(false);
|
export const isCreatingOrder = ref(false);
|
||||||
export const desktopStep1PreflightHandler = ref(null);
|
export const desktopStep1PreflightHandler = ref(null);
|
||||||
let createOrderRequest = null;
|
let createOrderRequest = null;
|
||||||
|
const posStepSaveBarriers = new Set();
|
||||||
|
let latestOrderDetailsRequestId = 0;
|
||||||
|
let latestOrderMetadataMutationSequence = 0;
|
||||||
|
let activeOrderMetadataMutationCount = 0;
|
||||||
|
|
||||||
|
export const registerPosStepSaveBarrier = (handler) => {
|
||||||
|
if (typeof handler !== "function") {
|
||||||
|
return () => {};
|
||||||
|
}
|
||||||
|
|
||||||
|
posStepSaveBarriers.add(handler);
|
||||||
|
return () => {
|
||||||
|
posStepSaveBarriers.delete(handler);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const unregisterPosStepSaveBarrier = (handler) => {
|
||||||
|
posStepSaveBarriers.delete(handler);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const flushPosStepSaveBarriers = async () => {
|
||||||
|
const barriers = Array.from(posStepSaveBarriers);
|
||||||
|
if (barriers.length === 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const results = await Promise.allSettled(barriers.map((handler) => handler()));
|
||||||
|
const failedResult = results.find((result) => result.status === "rejected");
|
||||||
|
|
||||||
|
if (failedResult) {
|
||||||
|
parseError(failedResult.reason, "stepError");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
export const setDesktopStep1PreflightHandler = (handler = null) => {
|
export const setDesktopStep1PreflightHandler = (handler = null) => {
|
||||||
desktopStep1PreflightHandler.value = typeof handler === "function" ? handler : null;
|
desktopStep1PreflightHandler.value = typeof handler === "function" ? handler : null;
|
||||||
@@ -109,6 +145,10 @@ export const nextStep = async (options = { isMobile: false, orderCreation: true
|
|||||||
}
|
}
|
||||||
// Set the delay to 2 seconds
|
// Set the delay to 2 seconds
|
||||||
setNextStepDelay(2);
|
setNextStepDelay(2);
|
||||||
|
if (!(await flushPosStepSaveBarriers())) {
|
||||||
|
nextStepDelay.value = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
// Clear the errors
|
// Clear the errors
|
||||||
clearErrors();
|
clearErrors();
|
||||||
// If the current step is 1, create the order
|
// If the current step is 1, create the order
|
||||||
@@ -188,8 +228,22 @@ export const nextStep = async (options = { isMobile: false, orderCreation: true
|
|||||||
step.value++;
|
step.value++;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const previousStep = () => {
|
export const previousStep = async () => {
|
||||||
step.value--;
|
if (nextStepDelay.value > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(await flushPosStepSaveBarriers())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
step.value = Math.max(1, step.value - 1);
|
||||||
|
|
||||||
|
if (order_id.value) {
|
||||||
|
pushPosRouteState(`id=${order_id.value}&customer_id=${customer_id.value}&step=${step.value}`);
|
||||||
|
} else {
|
||||||
|
pushPosRouteState(`step=${step.value}`);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getCurrentStep = () => {
|
export const getCurrentStep = () => {
|
||||||
@@ -784,6 +838,129 @@ watch([reg_1, reg_2, reg_3], () => {
|
|||||||
reg_3.value = normalizeRegistrationValue(reg_3.value);
|
reg_3.value = normalizeRegistrationValue(reg_3.value);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const applyOrderMetadataFieldToPosState = (field, value) => {
|
||||||
|
if (field === "reference") {
|
||||||
|
reference.value = normalizeOrderMetadataString(value);
|
||||||
|
return reference.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field === "notes") {
|
||||||
|
order_notes.value = normalizeOrderMetadataString(value);
|
||||||
|
return order_notes.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field === "po") {
|
||||||
|
order_po.value = normalizeOrderMetadataString(value);
|
||||||
|
return order_po.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field === "safety_seal") {
|
||||||
|
order_safety_seal.value = normalizeOrderMetadataString(value);
|
||||||
|
return order_safety_seal.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field === "reg_1") {
|
||||||
|
reg_1.value = normalizeRegistrationValue(value);
|
||||||
|
return reg_1.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field === "reg_2") {
|
||||||
|
reg_2.value = normalizeRegistrationValue(value);
|
||||||
|
return reg_2.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field === "reg_3") {
|
||||||
|
reg_3.value = normalizeRegistrationValue(value);
|
||||||
|
return reg_3.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalizeOrderMetadataString(value);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const applyOrderDetailsToPosState = (orderData, includes = {}) => {
|
||||||
|
if (!orderData || typeof orderData !== "object") {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const includedCustomer = includes?.customer ?? null;
|
||||||
|
const normalizedOrderCustomerNumber = resolveCustomerNumber(orderData?.customer_id);
|
||||||
|
const selectedCustomerBeforeHydration = getSelectedCustomerNumber();
|
||||||
|
|
||||||
|
department_id.value = orderData.department_id;
|
||||||
|
applyOrderMetadataFieldToPosState("reference", orderData.reference);
|
||||||
|
applyOrderMetadataFieldToPosState("notes", orderData.notes);
|
||||||
|
applyOrderMetadataFieldToPosState("po", orderData.po);
|
||||||
|
applyOrderMetadataFieldToPosState("safety_seal", orderData.safety_seal);
|
||||||
|
applyOrderMetadataFieldToPosState("reg_1", orderData.reg_1);
|
||||||
|
applyOrderMetadataFieldToPosState("reg_2", orderData.reg_2);
|
||||||
|
applyOrderMetadataFieldToPosState("reg_3", orderData.reg_3);
|
||||||
|
invoiceCollectionId.value = orderData.invoice_collection_id || null;
|
||||||
|
completed_at.value = orderData.completed_at || null;
|
||||||
|
|
||||||
|
if (includedCustomer && typeof includedCustomer === "object") {
|
||||||
|
const customerSource =
|
||||||
|
includedCustomer.economic_customer && typeof includedCustomer.economic_customer === "object"
|
||||||
|
? includedCustomer.economic_customer
|
||||||
|
: includedCustomer;
|
||||||
|
|
||||||
|
selectCustomer(
|
||||||
|
normalizeCustomerRecord(customerSource, {
|
||||||
|
...includedCustomer,
|
||||||
|
customerNumber: normalizedOrderCustomerNumber ?? resolveCustomerNumber(includedCustomer),
|
||||||
|
name: includedCustomer.name ?? includedCustomer.customer_name ?? orderData.customer_name ?? customer_name.value,
|
||||||
|
customer_name:
|
||||||
|
includedCustomer.customer_name ?? includedCustomer.name ?? orderData.customer_name ?? customer_name.value,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
} else if (normalizedOrderCustomerNumber) {
|
||||||
|
customer_id.value = normalizedOrderCustomerNumber;
|
||||||
|
if (
|
||||||
|
selectedCustomerBeforeHydration !== normalizedOrderCustomerNumber ||
|
||||||
|
customer_name.value === "" ||
|
||||||
|
!customer_data.value
|
||||||
|
) {
|
||||||
|
void searchAndSelectCustomer(normalizedOrderCustomerNumber, { forceRefresh: true });
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
clearSelectedCustomerState();
|
||||||
|
}
|
||||||
|
|
||||||
|
return orderData;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const saveOrderMetadataField = async (field, value, targetOrderId = order_id.value) => {
|
||||||
|
const normalizedOrderId = toPositiveInteger(targetOrderId);
|
||||||
|
const setter = SessionUser.objects.orders.set?.[field];
|
||||||
|
|
||||||
|
if (!normalizedOrderId || typeof setter !== "function") {
|
||||||
|
throw new Error(`Unable to save order field: ${field}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const mutationSequence = latestOrderMetadataMutationSequence + 1;
|
||||||
|
latestOrderMetadataMutationSequence = mutationSequence;
|
||||||
|
activeOrderMetadataMutationCount += 1;
|
||||||
|
const isRegistrationField = field === "reg_1" || field === "reg_2" || field === "reg_3";
|
||||||
|
const requestValue = isRegistrationField
|
||||||
|
? String(value ?? "").toUpperCase()
|
||||||
|
: normalizeOrderMetadataString(value);
|
||||||
|
const normalizedValue = isRegistrationField ? normalizeRegistrationValue(value) : requestValue;
|
||||||
|
try {
|
||||||
|
const response = await setter(normalizedOrderId, requestValue);
|
||||||
|
const updatedOrder = response?.data?.data;
|
||||||
|
|
||||||
|
if (updatedOrder && toPositiveInteger(updatedOrder.id) === normalizedOrderId) {
|
||||||
|
if (mutationSequence === latestOrderMetadataMutationSequence && activeOrderMetadataMutationCount === 1) {
|
||||||
|
applyOrderDetailsToPosState(updatedOrder, response?.data?.includes ?? {});
|
||||||
|
}
|
||||||
|
return applyOrderMetadataFieldToPosState(field, updatedOrder[field] ?? normalizedValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
return applyOrderMetadataFieldToPosState(field, normalizedValue);
|
||||||
|
} finally {
|
||||||
|
activeOrderMetadataMutationCount = Math.max(0, activeOrderMetadataMutationCount - 1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/** Get the order details by order id */
|
/** Get the order details by order id */
|
||||||
export const getOrderDetails = async (id = null) => {
|
export const getOrderDetails = async (id = null) => {
|
||||||
const token = localStorage.getItem("token");
|
const token = localStorage.getItem("token");
|
||||||
@@ -791,6 +968,9 @@ export const getOrderDetails = async (id = null) => {
|
|||||||
if (!token || !targetOrderId) {
|
if (!token || !targetOrderId) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
const requestId = ++latestOrderDetailsRequestId;
|
||||||
|
const metadataMutationSequenceAtRequest = latestOrderMetadataMutationSequence;
|
||||||
|
const hadActiveMetadataMutationAtRequest = activeOrderMetadataMutationCount > 0;
|
||||||
return axios
|
return axios
|
||||||
.get(API_URL + "/order?id=" + targetOrderId, {
|
.get(API_URL + "/order?id=" + targetOrderId, {
|
||||||
headers: {
|
headers: {
|
||||||
@@ -799,54 +979,21 @@ export const getOrderDetails = async (id = null) => {
|
|||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
const order_data = response.data.data;
|
const order_data = response.data.data;
|
||||||
const includedCustomer = response?.data?.includes?.customer ?? null;
|
if (!order_data) {
|
||||||
const normalizedOrderCustomerNumber = resolveCustomerNumber(order_data?.customer_id);
|
return null;
|
||||||
const selectedCustomerBeforeHydration = getSelectedCustomerNumber();
|
}
|
||||||
// Set the order details
|
|
||||||
department_id.value = order_data.department_id;
|
|
||||||
reference.value = order_data.reference || "";
|
|
||||||
order_notes.value = order_data.notes || "";
|
|
||||||
order_po.value = order_data.po || "";
|
|
||||||
order_safety_seal.value = normalizeOrderMetadataString(order_data.safety_seal);
|
|
||||||
reg_1.value = order_data.reg_1 || "";
|
|
||||||
reg_2.value = order_data.reg_2 || "";
|
|
||||||
reg_3.value = order_data.reg_3 || "";
|
|
||||||
invoiceCollectionId.value = order_data.invoice_collection_id || null;
|
|
||||||
completed_at.value = order_data.completed_at || null;
|
|
||||||
|
|
||||||
if (includedCustomer && typeof includedCustomer === "object") {
|
const normalizedResponseOrderId = toPositiveInteger(order_data.id ?? targetOrderId);
|
||||||
const customerSource =
|
const normalizedCurrentOrderId = toPositiveInteger(order_id.value);
|
||||||
includedCustomer.economic_customer && typeof includedCustomer.economic_customer === "object"
|
const isStaleForDifferentOrder =
|
||||||
? includedCustomer.economic_customer
|
requestId !== latestOrderDetailsRequestId &&
|
||||||
: includedCustomer;
|
normalizedCurrentOrderId &&
|
||||||
|
normalizedResponseOrderId &&
|
||||||
|
normalizedCurrentOrderId !== normalizedResponseOrderId;
|
||||||
|
const isStaleBeforeMetadataMutation = metadataMutationSequenceAtRequest !== latestOrderMetadataMutationSequence;
|
||||||
|
|
||||||
selectCustomer(
|
if (!isStaleForDifferentOrder && !isStaleBeforeMetadataMutation && !hadActiveMetadataMutationAtRequest) {
|
||||||
normalizeCustomerRecord(customerSource, {
|
applyOrderDetailsToPosState(order_data, response?.data?.includes ?? {});
|
||||||
...includedCustomer,
|
|
||||||
customerNumber: normalizedOrderCustomerNumber ?? resolveCustomerNumber(includedCustomer),
|
|
||||||
name:
|
|
||||||
includedCustomer.name ??
|
|
||||||
includedCustomer.customer_name ??
|
|
||||||
order_data.customer_name ??
|
|
||||||
customer_name.value,
|
|
||||||
customer_name:
|
|
||||||
includedCustomer.customer_name ??
|
|
||||||
includedCustomer.name ??
|
|
||||||
order_data.customer_name ??
|
|
||||||
customer_name.value,
|
|
||||||
})
|
|
||||||
);
|
|
||||||
} else if (normalizedOrderCustomerNumber) {
|
|
||||||
customer_id.value = normalizedOrderCustomerNumber;
|
|
||||||
if (
|
|
||||||
selectedCustomerBeforeHydration !== normalizedOrderCustomerNumber ||
|
|
||||||
customer_name.value === "" ||
|
|
||||||
!customer_data.value
|
|
||||||
) {
|
|
||||||
void searchAndSelectCustomer(normalizedOrderCustomerNumber, { forceRefresh: true });
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
clearSelectedCustomerState();
|
|
||||||
}
|
}
|
||||||
// Return the order data
|
// Return the order data
|
||||||
return order_data;
|
return order_data;
|
||||||
@@ -1338,7 +1485,7 @@ const copyLastWashReferenceToEmptyCurrentOrder = async (sourceReference) => {
|
|||||||
|
|
||||||
const normalizedOrderId = toPositiveInteger(order_id.value);
|
const normalizedOrderId = toPositiveInteger(order_id.value);
|
||||||
if (normalizedOrderId) {
|
if (normalizedOrderId) {
|
||||||
await SessionUser.objects.orders.set.reference(normalizedOrderId, normalizedSourceReference);
|
await saveOrderMetadataField("reference", normalizedSourceReference, normalizedOrderId);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -2208,32 +2355,27 @@ export const hydrateSelectedOrderBookingForDesktop = async () => {
|
|||||||
|
|
||||||
const bookingReference = getOrderBookingReferenceValue(booking);
|
const bookingReference = getOrderBookingReferenceValue(booking);
|
||||||
if (bookingReference !== "" && bookingReference !== reference.value) {
|
if (bookingReference !== "" && bookingReference !== reference.value) {
|
||||||
await SessionUser.objects.orders.set.reference(normalizedOrderId, bookingReference);
|
reference.value = await saveOrderMetadataField("reference", bookingReference, normalizedOrderId);
|
||||||
reference.value = bookingReference;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const bookingReg1 = getOrderBookingReg1Value(booking);
|
const bookingReg1 = getOrderBookingReg1Value(booking);
|
||||||
if (bookingReg1 !== "" && bookingReg1 !== reg_1.value) {
|
if (bookingReg1 !== "" && bookingReg1 !== reg_1.value) {
|
||||||
await SessionUser.objects.orders.set.reg_1(normalizedOrderId, bookingReg1);
|
reg_1.value = await saveOrderMetadataField("reg_1", bookingReg1, normalizedOrderId);
|
||||||
reg_1.value = bookingReg1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const bookingReg2 = getOrderBookingReg2Value(booking);
|
const bookingReg2 = getOrderBookingReg2Value(booking);
|
||||||
if (bookingReg2 !== reg_2.value) {
|
if (bookingReg2 !== reg_2.value) {
|
||||||
await SessionUser.objects.orders.set.reg_2(normalizedOrderId, bookingReg2);
|
reg_2.value = await saveOrderMetadataField("reg_2", bookingReg2, normalizedOrderId);
|
||||||
reg_2.value = bookingReg2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const bookingNotes = getOrderBookingNotesValue(booking);
|
const bookingNotes = getOrderBookingNotesValue(booking);
|
||||||
if (bookingNotes !== "" && bookingNotes !== order_notes.value) {
|
if (bookingNotes !== "" && bookingNotes !== order_notes.value) {
|
||||||
await SessionUser.objects.orders.set.notes(normalizedOrderId, bookingNotes);
|
order_notes.value = await saveOrderMetadataField("notes", bookingNotes, normalizedOrderId);
|
||||||
order_notes.value = bookingNotes;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const bookingPo = String(booking?.po ?? "").trim();
|
const bookingPo = String(booking?.po ?? "").trim();
|
||||||
if (bookingPo !== "" && isBlankPosMetadataValue(order_po.value)) {
|
if (bookingPo !== "" && isBlankPosMetadataValue(order_po.value)) {
|
||||||
await SessionUser.objects.orders.set.po(normalizedOrderId, bookingPo);
|
order_po.value = await saveOrderMetadataField("po", bookingPo, normalizedOrderId);
|
||||||
order_po.value = bookingPo;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const currentOrderItems = await loadOrderItems();
|
const currentOrderItems = await loadOrderItems();
|
||||||
|
|||||||
@@ -23,10 +23,12 @@ export const useOrderMetadataAutosave = ({
|
|||||||
const draft = ref(normalizeValue(resolveSourceValue(source)));
|
const draft = ref(normalizeValue(resolveSourceValue(source)));
|
||||||
const lastSavedValue = ref(normalizeValue(resolveSourceValue(source)));
|
const lastSavedValue = ref(normalizeValue(resolveSourceValue(source)));
|
||||||
const isSaving = ref(false);
|
const isSaving = ref(false);
|
||||||
|
const lastError = ref(null);
|
||||||
const isDirty = computed(() => normalizeValue(draft.value) !== normalizeValue(lastSavedValue.value));
|
const isDirty = computed(() => normalizeValue(draft.value) !== normalizeValue(lastSavedValue.value));
|
||||||
|
|
||||||
let timerId = null;
|
let timerId = null;
|
||||||
let saveAgainAfterCurrentRequest = false;
|
let saveAgainAfterCurrentRequest = false;
|
||||||
|
let activeSavePromise = null;
|
||||||
let nextSequence = 0;
|
let nextSequence = 0;
|
||||||
let lastAppliedSequence = 0;
|
let lastAppliedSequence = 0;
|
||||||
|
|
||||||
@@ -66,45 +68,57 @@ export const useOrderMetadataAutosave = ({
|
|||||||
const sequence = ++nextSequence;
|
const sequence = ++nextSequence;
|
||||||
let saveCompleted = false;
|
let saveCompleted = false;
|
||||||
isSaving.value = true;
|
isSaving.value = true;
|
||||||
|
lastError.value = null;
|
||||||
|
|
||||||
try {
|
const run = (async () => {
|
||||||
const result = await saveValue(requestedValue);
|
try {
|
||||||
const savedValue = normalizeValue(result ?? requestedValue);
|
const result = await saveValue(requestedValue);
|
||||||
|
const savedValue = normalizeValue(result ?? requestedValue);
|
||||||
|
|
||||||
if (sequence >= lastAppliedSequence) {
|
if (sequence >= lastAppliedSequence) {
|
||||||
lastAppliedSequence = sequence;
|
lastAppliedSequence = sequence;
|
||||||
lastSavedValue.value = savedValue;
|
lastSavedValue.value = savedValue;
|
||||||
|
|
||||||
if (normalizeValue(draft.value) === requestedValue) {
|
if (normalizeValue(draft.value) === requestedValue) {
|
||||||
draft.value = savedValue;
|
draft.value = savedValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof onSaved === "function") {
|
||||||
|
await onSaved(savedValue, requestedValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
saveCompleted = true;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
lastError.value = error;
|
||||||
|
if (typeof onError === "function") {
|
||||||
|
onError(error);
|
||||||
|
} else {
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
isSaving.value = false;
|
||||||
|
|
||||||
|
const shouldSaveAgain = saveAgainAfterCurrentRequest;
|
||||||
|
saveAgainAfterCurrentRequest = false;
|
||||||
|
|
||||||
|
if (saveCompleted && (shouldSaveAgain || isDirty.value) && isDirty.value) {
|
||||||
|
void persist();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
if (typeof onSaved === "function") {
|
const trackedSavePromise = run.finally(() => {
|
||||||
await onSaved(savedValue, requestedValue);
|
if (activeSavePromise === trackedSavePromise) {
|
||||||
|
activeSavePromise = null;
|
||||||
}
|
}
|
||||||
|
});
|
||||||
saveCompleted = true;
|
activeSavePromise = trackedSavePromise;
|
||||||
|
return trackedSavePromise;
|
||||||
return true;
|
|
||||||
} catch (error) {
|
|
||||||
if (typeof onError === "function") {
|
|
||||||
onError(error);
|
|
||||||
} else {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
} finally {
|
|
||||||
isSaving.value = false;
|
|
||||||
|
|
||||||
const shouldSaveAgain = saveAgainAfterCurrentRequest;
|
|
||||||
saveAgainAfterCurrentRequest = false;
|
|
||||||
|
|
||||||
if (saveCompleted && (shouldSaveAgain || isDirty.value) && isDirty.value) {
|
|
||||||
void persist();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const scheduleSave = () => {
|
const scheduleSave = () => {
|
||||||
@@ -123,6 +137,34 @@ export const useOrderMetadataAutosave = ({
|
|||||||
return persist();
|
return persist();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const flushAndWait = async () => {
|
||||||
|
clearPendingSave();
|
||||||
|
|
||||||
|
while (isSaving.value && activeSavePromise) {
|
||||||
|
await activeSavePromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isDirty.value) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const didSave = await persist();
|
||||||
|
|
||||||
|
if (!didSave && isDirty.value) {
|
||||||
|
throw lastError.value || new Error("Unable to save order metadata");
|
||||||
|
}
|
||||||
|
|
||||||
|
while (isSaving.value && activeSavePromise) {
|
||||||
|
await activeSavePromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isDirty.value) {
|
||||||
|
return flushAndWait();
|
||||||
|
}
|
||||||
|
|
||||||
|
return didSave;
|
||||||
|
};
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
clearPendingSave();
|
clearPendingSave();
|
||||||
|
|
||||||
@@ -139,10 +181,12 @@ export const useOrderMetadataAutosave = ({
|
|||||||
return {
|
return {
|
||||||
draft,
|
draft,
|
||||||
lastSavedValue,
|
lastSavedValue,
|
||||||
|
lastError,
|
||||||
isDirty,
|
isDirty,
|
||||||
isSaving,
|
isSaving,
|
||||||
scheduleSave,
|
scheduleSave,
|
||||||
flush,
|
flush,
|
||||||
|
flushAndWait,
|
||||||
clearPendingSave,
|
clearPendingSave,
|
||||||
syncFromSource,
|
syncFromSource,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3478,17 +3478,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Rapporter fejl",
|
"button": "Rapporter fejl",
|
||||||
"title": "Rapporter fejl",
|
"title": "Rapporter fejl",
|
||||||
"subtitle": "Send det aktuelle skærmbillede og de seneste fejldetaljer til support.",
|
"subtitle": "Send de seneste fejldetaljer til support. Et skærmbillede vedhæftes, når det er muligt.",
|
||||||
"before_error": "Hvad lavede du, før fejlen opstod?",
|
"before_error": "Hvad lavede du, før fejlen opstod?",
|
||||||
"expected": "Hvad forventede du, der ville ske?",
|
"expected": "Hvad forventede du, der ville ske?",
|
||||||
"actual": "Hvad skete der faktisk?",
|
"actual": "Hvad skete der faktisk?",
|
||||||
"before_error_placeholder": "Beskriv handlingen, du var i gang med, for eksempel at åbne ordrer eller vælge en kunde.",
|
"before_error_placeholder": "Beskriv handlingen, du var i gang med, for eksempel at åbne ordrer eller vælge en kunde.",
|
||||||
"expected_placeholder": "Beskriv det resultat, du forventede at se.",
|
"expected_placeholder": "Beskriv det resultat, du forventede at se.",
|
||||||
"actual_placeholder": "Beskriv, hvad du så i stedet, inklusive eventuel fejltekst.",
|
"actual_placeholder": "Beskriv, hvad du så i stedet, inklusive eventuel fejltekst.",
|
||||||
"consent": "Jeg accepterer, at det aktuelle app-skærmbillede, de seneste request-fejl, Vue-fejl, browseroplysninger og mine svar indsamles til fejlfinding.",
|
"consent": "Jeg accepterer, at de seneste request-fejl, Vue-fejl, browseroplysninger, mine svar og et app-skærmbillede, når det er muligt, indsamles til fejlfinding.",
|
||||||
"submit": "Send rapport",
|
"submit": "Send rapport",
|
||||||
"submitted": "Fejlrapporten er sendt.",
|
"submitted": "Fejlrapporten er sendt.",
|
||||||
"capture_failed": "Skærmbilledet kunne ikke oprettes. Prøv igen.",
|
"capture_failed": "Skærmbilledet kunne ikke oprettes. Rapporten sendes uden skærmbillede.",
|
||||||
"submit_failed": "Fejlrapporten kunne ikke sendes.",
|
"submit_failed": "Fejlrapporten kunne ikke sendes.",
|
||||||
"required": "Alle felter og accept af dataindsamling er påkrævet.",
|
"required": "Alle felter og accept af dataindsamling er påkrævet.",
|
||||||
"page_subtitle": "Rapporterede skærme, request-fejl og Vue-fejl",
|
"page_subtitle": "Rapporterede skærme, request-fejl og Vue-fejl",
|
||||||
@@ -4846,6 +4846,97 @@
|
|||||||
"subtitle": "@.capitalize:{'words.generated.administreret'} @:{'words.replication.services.database'}-, @:{'words.replication.services.redis'}- @:{'words.generated.og'} @:{'words.replication.services.minio'}-@:{'words.generated.replikering'}"
|
"subtitle": "@.capitalize:{'words.generated.administreret'} @:{'words.replication.services.database'}-, @:{'words.replication.services.redis'}- @:{'words.generated.og'} @:{'words.replication.services.minio'}-@:{'words.generated.replikering'}"
|
||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Adgangsomrade",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Ryd gruppe",
|
||||||
|
"reload": "Genindlaes",
|
||||||
|
"retry": "Prov igen",
|
||||||
|
"select_all": "Vaelg gruppe"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktiveret",
|
||||||
|
"permission": "Tilladelse",
|
||||||
|
"route": "Rute",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Giver adgang til {name}.",
|
||||||
|
"empty": "Der er ingen tilladelser tilgaengelige.",
|
||||||
|
"empty_group": "Denne gruppe har ingen tilladelser.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Rolletilladelser kunne ikke indlaeses.",
|
||||||
|
"update": "En eller flere tilladelser kunne ikke opdateres. Rollens aktuelle tilladelser blev genindlaest."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} matcher",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Sidetype- og afdelingsadgang.",
|
||||||
|
"label": "Adgang"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Tilladelser til bookinger, tidsbookinger og planlaegning.",
|
||||||
|
"label": "Bookinger"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Tilladelser til kunder, brugere, medarbejdere, roller og login.",
|
||||||
|
"label": "Kunder og brugere"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Afdelingsdrift, baner, relaer, notifikationer, rapporter og mal.",
|
||||||
|
"label": "Afdelinger og drift"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Tilladelser til fakturaer, faktureringsperioder, opkraevning og e-conomic.",
|
||||||
|
"label": "Fakturering og e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Tilladelser til ordrer, POS, betalinger og ordrelinjer.",
|
||||||
|
"label": "Ordrer og POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Tilladelser, der ikke matcher en anden gruppe.",
|
||||||
|
"label": "Andet"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Tilladelser til produkter, priser, rabatter og valuta.",
|
||||||
|
"label": "Produkter og priser"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Tilladelser til selvbetjening, vask, scannere, gateways og edge-udstyr.",
|
||||||
|
"label": "Selvbetjening og edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, konfiguration, release, replikering og integrationer.",
|
||||||
|
"label": "System og konfiguration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Der er ingen beskrivelse.",
|
||||||
|
"no_search_results": "Ingen tilladelser matcher sogningen.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Giver adgang til administrationssider.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Giver adgang til superbrugersider.",
|
||||||
|
"label": "Superbruger"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Giver adgang til brugersider.",
|
||||||
|
"label": "Bruger"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Sog i tilladelser",
|
||||||
|
"search_placeholder": "Sog pa label, nogle, beskrivelse, rute eller metode",
|
||||||
|
"selected_summary": "{selected} af {total} valgt",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Deaktiveret",
|
||||||
|
"enabled": "Aktiveret"
|
||||||
|
},
|
||||||
|
"subtitle": "Rolletilladelser",
|
||||||
|
"title": "Tilladelser for rolle {id}",
|
||||||
|
"title_with_name": "Tilladelser for {name}"
|
||||||
|
},
|
||||||
"subtitle": "@.capitalize:{'words.generated.brugerroller'}"
|
"subtitle": "@.capitalize:{'words.generated.brugerroller'}"
|
||||||
},
|
},
|
||||||
"self_wash": {
|
"self_wash": {
|
||||||
@@ -5841,6 +5932,20 @@
|
|||||||
},
|
},
|
||||||
"vehicles": {
|
"vehicles": {
|
||||||
"add": "@:{'words.generated.tilføj'} @:{'words.generated.køretøj'}",
|
"add": "@:{'words.generated.tilføj'} @:{'words.generated.køretøj'}",
|
||||||
|
"add_modal": {
|
||||||
|
"customer_label": "Kunde",
|
||||||
|
"customer_placeholder": "Søg efter kundenavn eller kundenummer",
|
||||||
|
"error": "Køretøjet kunne ikke tilføjes.",
|
||||||
|
"no_customer_results": "Ingen kunder fundet",
|
||||||
|
"reference_placeholder": "Valgfri reference",
|
||||||
|
"registration_placeholder": "Registreringsnummer",
|
||||||
|
"selected_customer": "Valgt kunde",
|
||||||
|
"submit": "Tilføj køretøj",
|
||||||
|
"title": "Tilføj køretøj",
|
||||||
|
"type_load_error": "Køretøjstyper kunne ikke indlæses.",
|
||||||
|
"type_placeholder": "Vælg køretøjstype",
|
||||||
|
"validation_error": "Vælg kunde, registreringsnummer og køretøjstype."
|
||||||
|
},
|
||||||
"brand": "@:{'templates.generated.compat.admin.pos.make'}",
|
"brand": "@:{'templates.generated.compat.admin.pos.make'}",
|
||||||
"color": "Farve",
|
"color": "Farve",
|
||||||
"delete_vehicle": "@:{'templates.generated.compat.vehicles.delete'}",
|
"delete_vehicle": "@:{'templates.generated.compat.vehicles.delete'}",
|
||||||
|
|||||||
@@ -3589,17 +3589,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Fehler melden",
|
"button": "Fehler melden",
|
||||||
"title": "Fehler melden",
|
"title": "Fehler melden",
|
||||||
"subtitle": "Sende den aktuellen Bildschirm und die letzten Fehlerdetails an den Support.",
|
"subtitle": "Sende die letzten Fehlerdetails an den Support. Ein Screenshot wird angehängt, wenn möglich.",
|
||||||
"before_error": "Was haben Sie getan, bevor der Fehler auftrat?",
|
"before_error": "Was haben Sie getan, bevor der Fehler auftrat?",
|
||||||
"expected": "Was hatten Sie erwartet?",
|
"expected": "Was hatten Sie erwartet?",
|
||||||
"actual": "Was ist tatsächlich passiert?",
|
"actual": "Was ist tatsächlich passiert?",
|
||||||
"before_error_placeholder": "Beschreiben Sie die Aktion, zum Beispiel Bestellungen öffnen oder einen Kunden auswählen.",
|
"before_error_placeholder": "Beschreiben Sie die Aktion, zum Beispiel Bestellungen öffnen oder einen Kunden auswählen.",
|
||||||
"expected_placeholder": "Beschreiben Sie das erwartete Ergebnis.",
|
"expected_placeholder": "Beschreiben Sie das erwartete Ergebnis.",
|
||||||
"actual_placeholder": "Beschreiben Sie, was stattdessen zu sehen war, inklusive Fehlermeldung.",
|
"actual_placeholder": "Beschreiben Sie, was stattdessen zu sehen war, inklusive Fehlermeldung.",
|
||||||
"consent": "Ich akzeptiere, dass der aktuelle App-Bildschirm, letzte Request-Fehler, Vue-Fehler, Browserdetails und meine Antworten zur Fehlersuche erfasst werden.",
|
"consent": "Ich akzeptiere, dass letzte Request-Fehler, Vue-Fehler, Browserdetails, meine Antworten und ein App-Screenshot, wenn möglich, zur Fehlersuche erfasst werden.",
|
||||||
"submit": "Bericht senden",
|
"submit": "Bericht senden",
|
||||||
"submitted": "Fehlerbericht gesendet.",
|
"submitted": "Fehlerbericht gesendet.",
|
||||||
"capture_failed": "Der Screenshot konnte nicht erstellt werden. Bitte versuchen Sie es erneut.",
|
"capture_failed": "Der Screenshot konnte nicht erstellt werden. Der Bericht wird ohne Screenshot gesendet.",
|
||||||
"submit_failed": "Der Fehlerbericht konnte nicht gesendet werden.",
|
"submit_failed": "Der Fehlerbericht konnte nicht gesendet werden.",
|
||||||
"required": "Alle Felder und die Zustimmung zur Datenerfassung sind erforderlich.",
|
"required": "Alle Felder und die Zustimmung zur Datenerfassung sind erforderlich.",
|
||||||
"page_subtitle": "Gemeldete Bildschirme, Request-Fehler und Vue-Fehler",
|
"page_subtitle": "Gemeldete Bildschirme, Request-Fehler und Vue-Fehler",
|
||||||
@@ -4957,6 +4957,97 @@
|
|||||||
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.generated.database'} @:{'words.generated.and'} @:{'words.replication.services.redis'} @:{'words.generated.replication'}"
|
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.generated.database'} @:{'words.generated.and'} @:{'words.replication.services.redis'} @:{'words.generated.replication'}"
|
||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Zugriffsbereich",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Gruppe leeren",
|
||||||
|
"reload": "Neu laden",
|
||||||
|
"retry": "Erneut versuchen",
|
||||||
|
"select_all": "Gruppe auswaehlen"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktiviert",
|
||||||
|
"permission": "Berechtigung",
|
||||||
|
"route": "Route",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Erlaubt Zugriff auf {name}.",
|
||||||
|
"empty": "Es sind keine Berechtigungen verfuegbar.",
|
||||||
|
"empty_group": "Diese Gruppe hat keine Berechtigungen.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Rollenberechtigungen konnten nicht geladen werden.",
|
||||||
|
"update": "Eine oder mehrere Berechtigungen konnten nicht aktualisiert werden. Die aktuellen Rollenberechtigungen wurden neu geladen."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} Treffer",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Seitentyp- und Abteilungszugriff.",
|
||||||
|
"label": "Zugriff"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Berechtigungen fuer Buchungen, Zeitbuchungen und Planung.",
|
||||||
|
"label": "Buchungen"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Berechtigungen fuer Kunden, Benutzer, Mitarbeiter, Rollen und Anmeldung.",
|
||||||
|
"label": "Kunden und Benutzer"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Abteilungsbetrieb, Spuren, Relais, Benachrichtigungen, Berichte und Ziele.",
|
||||||
|
"label": "Abteilungen und Betrieb"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Berechtigungen fuer Rechnungen, Abrechnungsperioden, Inkasso und e-conomic.",
|
||||||
|
"label": "Rechnungen und e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Berechtigungen fuer Auftraege, POS, Zahlungen und Auftragszeilen.",
|
||||||
|
"label": "Auftraege und POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Berechtigungen, die keiner anderen Gruppe entsprechen.",
|
||||||
|
"label": "Sonstige"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Berechtigungen fuer Produkte, Preise, Rabatte und Waehrungen.",
|
||||||
|
"label": "Produkte und Preise"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Berechtigungen fuer Self-Service, Waschen, Scanner, Gateways und Edge-Hardware.",
|
||||||
|
"label": "Self-Service und Edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, Konfiguration, Release, Replikation und Integrationen.",
|
||||||
|
"label": "System und Konfiguration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Keine Beschreibung verfuegbar.",
|
||||||
|
"no_search_results": "Keine Berechtigungen entsprechen der Suche.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Erlaubt Zugriff auf Admin-Dashboardseiten.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Erlaubt Zugriff auf Superuser-Dashboardseiten.",
|
||||||
|
"label": "Superuser"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Erlaubt Zugriff auf Benutzer-Dashboardseiten.",
|
||||||
|
"label": "Benutzer"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Berechtigungen suchen",
|
||||||
|
"search_placeholder": "Nach Label, Schluessel, Beschreibung, Route oder Methode suchen",
|
||||||
|
"selected_summary": "{selected} von {total} ausgewaehlt",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Deaktiviert",
|
||||||
|
"enabled": "Aktiviert"
|
||||||
|
},
|
||||||
|
"subtitle": "Rollenberechtigungen",
|
||||||
|
"title": "Berechtigungen fuer Rolle {id}",
|
||||||
|
"title_with_name": "Berechtigungen fuer {name}"
|
||||||
|
},
|
||||||
"subtitle": "Benutzerrollen"
|
"subtitle": "Benutzerrollen"
|
||||||
},
|
},
|
||||||
"self_wash": {
|
"self_wash": {
|
||||||
|
|||||||
@@ -3310,17 +3310,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Report error",
|
"button": "Report error",
|
||||||
"title": "Report error",
|
"title": "Report error",
|
||||||
"subtitle": "Send the current screen and recent error details to support.",
|
"subtitle": "Send recent error details to support. A screenshot is attached when available.",
|
||||||
"before_error": "What were you doing before the error occurred?",
|
"before_error": "What were you doing before the error occurred?",
|
||||||
"expected": "What did you expect would happen?",
|
"expected": "What did you expect would happen?",
|
||||||
"actual": "What actually happened?",
|
"actual": "What actually happened?",
|
||||||
"before_error_placeholder": "Describe the action you were taking, for example opening orders or selecting a customer.",
|
"before_error_placeholder": "Describe the action you were taking, for example opening orders or selecting a customer.",
|
||||||
"expected_placeholder": "Describe the result you expected to see.",
|
"expected_placeholder": "Describe the result you expected to see.",
|
||||||
"actual_placeholder": "Describe what you saw instead, including any error text.",
|
"actual_placeholder": "Describe what you saw instead, including any error text.",
|
||||||
"consent": "I accept that the current app screen, recent request errors, Vue errors, browser details, and my answers are collected for troubleshooting.",
|
"consent": "I accept that recent request errors, Vue errors, browser details, my answers, and an app screenshot when available are collected for troubleshooting.",
|
||||||
"submit": "Submit report",
|
"submit": "Submit report",
|
||||||
"submitted": "Error report submitted.",
|
"submitted": "Error report submitted.",
|
||||||
"capture_failed": "The screen capture failed. Please try again.",
|
"capture_failed": "The screen capture failed. The report will be sent without a screenshot.",
|
||||||
"submit_failed": "The error report could not be submitted.",
|
"submit_failed": "The error report could not be submitted.",
|
||||||
"required": "All fields and data collection acceptance are required.",
|
"required": "All fields and data collection acceptance are required.",
|
||||||
"page_subtitle": "Reported screens, request failures, and Vue errors",
|
"page_subtitle": "Reported screens, request failures, and Vue errors",
|
||||||
@@ -4678,6 +4678,97 @@
|
|||||||
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.replication.services.database'}, @:{'words.replication.services.redis'}, @:{'words.generated.and'} @:{'words.replication.services.minio'} @:{'words.generated.replication'}"
|
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.replication.services.database'}, @:{'words.replication.services.redis'}, @:{'words.generated.and'} @:{'words.replication.services.minio'} @:{'words.generated.replication'}"
|
||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Access scope",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Clear group",
|
||||||
|
"reload": "Reload",
|
||||||
|
"retry": "Try again",
|
||||||
|
"select_all": "Select group"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Enabled",
|
||||||
|
"permission": "Permission",
|
||||||
|
"route": "Route",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Allows access to {name}.",
|
||||||
|
"empty": "No permissions are available.",
|
||||||
|
"empty_group": "This group has no permissions.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Could not load role permissions.",
|
||||||
|
"update": "Could not update one or more permissions. The current role permissions were reloaded."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} matching",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Page type and department access permissions.",
|
||||||
|
"label": "Access"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Booking, time booking, and planning permissions.",
|
||||||
|
"label": "Bookings"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Customer, user, employee, role, and authentication permissions.",
|
||||||
|
"label": "Customers and users"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Department operations, lanes, relays, notifications, reports, and goals.",
|
||||||
|
"label": "Departments and operations"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Invoice, billing period, collection, and e-conomic permissions.",
|
||||||
|
"label": "Invoicing and e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Order, POS, payment, and order line permissions.",
|
||||||
|
"label": "Orders and POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Permissions that do not match another group.",
|
||||||
|
"label": "Other"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Product, price, discount, and currency permissions.",
|
||||||
|
"label": "Products and pricing"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Self-serve, wash, scanner, gateway, and edge hardware permissions.",
|
||||||
|
"label": "Self-serve and edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, configuration, release, replication, and integration permissions.",
|
||||||
|
"label": "System and configuration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "No description is available.",
|
||||||
|
"no_search_results": "No permissions match the current search.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Allows access to admin dashboard pages.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Allows access to superuser dashboard pages.",
|
||||||
|
"label": "Superuser"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Allows access to user dashboard pages.",
|
||||||
|
"label": "User"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Search permissions",
|
||||||
|
"search_placeholder": "Search by label, key, description, route, or method",
|
||||||
|
"selected_summary": "{selected} of {total} selected",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Disabled",
|
||||||
|
"enabled": "Enabled"
|
||||||
|
},
|
||||||
|
"subtitle": "Role permissions",
|
||||||
|
"title": "Role {id} permissions",
|
||||||
|
"title_with_name": "{name} permissions"
|
||||||
|
},
|
||||||
"subtitle": "@.capitalize:{'words.generated.user'} @:{'words.generated.roles'}"
|
"subtitle": "@.capitalize:{'words.generated.user'} @:{'words.generated.roles'}"
|
||||||
},
|
},
|
||||||
"self_wash": {
|
"self_wash": {
|
||||||
@@ -5673,6 +5764,20 @@
|
|||||||
},
|
},
|
||||||
"vehicles": {
|
"vehicles": {
|
||||||
"add": "@.capitalize:{'words.generated.add'} @:{'words.generated.vehicle'}",
|
"add": "@.capitalize:{'words.generated.add'} @:{'words.generated.vehicle'}",
|
||||||
|
"add_modal": {
|
||||||
|
"customer_label": "Customer",
|
||||||
|
"customer_placeholder": "Search by customer name or number",
|
||||||
|
"error": "Unable to add vehicle.",
|
||||||
|
"no_customer_results": "No customers found",
|
||||||
|
"reference_placeholder": "Optional reference",
|
||||||
|
"registration_placeholder": "Registration number",
|
||||||
|
"selected_customer": "Selected customer",
|
||||||
|
"submit": "Add vehicle",
|
||||||
|
"title": "Add vehicle",
|
||||||
|
"type_load_error": "Unable to load vehicle types.",
|
||||||
|
"type_placeholder": "Select vehicle type",
|
||||||
|
"validation_error": "Select a customer, registration number, and vehicle type."
|
||||||
|
},
|
||||||
"brand": "Brand",
|
"brand": "Brand",
|
||||||
"color": "Color",
|
"color": "Color",
|
||||||
"delete_vehicle": "@:{'templates.generated.compat.vehicles.delete'}",
|
"delete_vehicle": "@:{'templates.generated.compat.vehicles.delete'}",
|
||||||
|
|||||||
@@ -4255,6 +4255,97 @@
|
|||||||
"title": "@:replication.labels.replication"
|
"title": "@:replication.labels.replication"
|
||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "@:{'templates.generated.compat.roles.permissions.access_scope'}",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "@:{'templates.generated.compat.roles.permissions.actions.clear_all'}",
|
||||||
|
"reload": "@:{'templates.generated.compat.roles.permissions.actions.reload'}",
|
||||||
|
"retry": "@:{'templates.generated.compat.roles.permissions.actions.retry'}",
|
||||||
|
"select_all": "@:{'templates.generated.compat.roles.permissions.actions.select_all'}"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "@:{'templates.generated.compat.roles.permissions.columns.enabled'}",
|
||||||
|
"permission": "@:{'templates.generated.compat.roles.permissions.columns.permission'}",
|
||||||
|
"route": "@:{'templates.generated.compat.roles.permissions.columns.route'}",
|
||||||
|
"status": "@:{'templates.generated.compat.roles.permissions.columns.status'}"
|
||||||
|
},
|
||||||
|
"department_access_description": "@:{'templates.generated.compat.roles.permissions.department_access_description'}",
|
||||||
|
"empty": "@:{'templates.generated.compat.roles.permissions.empty'}",
|
||||||
|
"empty_group": "@:{'templates.generated.compat.roles.permissions.empty_group'}",
|
||||||
|
"errors": {
|
||||||
|
"load": "@:{'templates.generated.compat.roles.permissions.errors.load'}",
|
||||||
|
"update": "@:{'templates.generated.compat.roles.permissions.errors.update'}"
|
||||||
|
},
|
||||||
|
"filtered_summary": "@:{'templates.generated.compat.roles.permissions.filtered_summary'}",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.access.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.access.label'}"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.bookings.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.bookings.label'}"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.customers_users.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.customers_users.label'}"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.departments_operations.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.departments_operations.label'}"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.invoicing_economic.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.invoicing_economic.label'}"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.orders_pos.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.orders_pos.label'}"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.other.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.other.label'}"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.products_pricing.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.products_pricing.label'}"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.selfserve_edge.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.selfserve_edge.label'}"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.groups.system_config.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.groups.system_config.label'}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "@:{'templates.generated.compat.roles.permissions.no_description'}",
|
||||||
|
"no_search_results": "@:{'templates.generated.compat.roles.permissions.no_search_results'}",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.page_access.admin.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.page_access.admin.label'}"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.page_access.superuser.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.page_access.superuser.label'}"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "@:{'templates.generated.compat.roles.permissions.page_access.user.description'}",
|
||||||
|
"label": "@:{'templates.generated.compat.roles.permissions.page_access.user.label'}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "@:{'templates.generated.compat.roles.permissions.search_label'}",
|
||||||
|
"search_placeholder": "@:{'templates.generated.compat.roles.permissions.search_placeholder'}",
|
||||||
|
"selected_summary": "@:{'templates.generated.compat.roles.permissions.selected_summary'}",
|
||||||
|
"status": {
|
||||||
|
"disabled": "@:{'templates.generated.compat.roles.permissions.status.disabled'}",
|
||||||
|
"enabled": "@:{'templates.generated.compat.roles.permissions.status.enabled'}"
|
||||||
|
},
|
||||||
|
"subtitle": "@:{'templates.generated.compat.roles.permissions.subtitle'}",
|
||||||
|
"title": "@:{'templates.generated.compat.roles.permissions.title'}",
|
||||||
|
"title_with_name": "@:{'templates.generated.compat.roles.permissions.title_with_name'}"
|
||||||
|
},
|
||||||
"subtitle": "@:{'templates.generated.compat.roles.subtitle'}",
|
"subtitle": "@:{'templates.generated.compat.roles.subtitle'}",
|
||||||
"title": "@:{'templates.generated.compat.common.roles'}"
|
"title": "@:{'templates.generated.compat.common.roles'}"
|
||||||
},
|
},
|
||||||
@@ -5743,6 +5834,20 @@
|
|||||||
"vehicles": {
|
"vehicles": {
|
||||||
"actions": "@:common.actions",
|
"actions": "@:common.actions",
|
||||||
"add": "@:{'templates.generated.compat.vehicles.add'}",
|
"add": "@:{'templates.generated.compat.vehicles.add'}",
|
||||||
|
"add_modal": {
|
||||||
|
"customer_label": "@:{'templates.generated.compat.vehicles.add_modal.customer_label'}",
|
||||||
|
"customer_placeholder": "@:{'templates.generated.compat.vehicles.add_modal.customer_placeholder'}",
|
||||||
|
"error": "@:{'templates.generated.compat.vehicles.add_modal.error'}",
|
||||||
|
"no_customer_results": "@:{'templates.generated.compat.vehicles.add_modal.no_customer_results'}",
|
||||||
|
"reference_placeholder": "@:{'templates.generated.compat.vehicles.add_modal.reference_placeholder'}",
|
||||||
|
"registration_placeholder": "@:{'templates.generated.compat.vehicles.add_modal.registration_placeholder'}",
|
||||||
|
"selected_customer": "@:{'templates.generated.compat.vehicles.add_modal.selected_customer'}",
|
||||||
|
"submit": "@:{'templates.generated.compat.vehicles.add_modal.submit'}",
|
||||||
|
"title": "@:{'templates.generated.compat.vehicles.add_modal.title'}",
|
||||||
|
"type_load_error": "@:{'templates.generated.compat.vehicles.add_modal.type_load_error'}",
|
||||||
|
"type_placeholder": "@:{'templates.generated.compat.vehicles.add_modal.type_placeholder'}",
|
||||||
|
"validation_error": "@:{'templates.generated.compat.vehicles.add_modal.validation_error'}"
|
||||||
|
},
|
||||||
"brand": "@:{'templates.generated.compat.vehicles.brand'}",
|
"brand": "@:{'templates.generated.compat.vehicles.brand'}",
|
||||||
"color": "@:{'templates.generated.compat.vehicles.color'}",
|
"color": "@:{'templates.generated.compat.vehicles.color'}",
|
||||||
"created_at": "@:{'templates.generated.compat.global.generated'}",
|
"created_at": "@:{'templates.generated.compat.global.generated'}",
|
||||||
|
|||||||
@@ -3592,17 +3592,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Rapporter feil",
|
"button": "Rapporter feil",
|
||||||
"title": "Rapporter feil",
|
"title": "Rapporter feil",
|
||||||
"subtitle": "Send gjeldende skjermbilde og de siste feildetaljene til support.",
|
"subtitle": "Send de siste feildetaljene til support. Et skjermbilde legges ved når det er mulig.",
|
||||||
"before_error": "Hva gjorde du før feilen oppstod?",
|
"before_error": "Hva gjorde du før feilen oppstod?",
|
||||||
"expected": "Hva forventet du at skulle skje?",
|
"expected": "Hva forventet du at skulle skje?",
|
||||||
"actual": "Hva skjedde faktisk?",
|
"actual": "Hva skjedde faktisk?",
|
||||||
"before_error_placeholder": "Beskriv handlingen du utførte, for eksempel å åpne ordre eller velge en kunde.",
|
"before_error_placeholder": "Beskriv handlingen du utførte, for eksempel å åpne ordre eller velge en kunde.",
|
||||||
"expected_placeholder": "Beskriv resultatet du forventet å se.",
|
"expected_placeholder": "Beskriv resultatet du forventet å se.",
|
||||||
"actual_placeholder": "Beskriv hva du så i stedet, inkludert eventuell feiltekst.",
|
"actual_placeholder": "Beskriv hva du så i stedet, inkludert eventuell feiltekst.",
|
||||||
"consent": "Jeg godtar at gjeldende app-skjermbilde, siste request-feil, Vue-feil, nettleserdetaljer og svarene mine samles inn for feilsøking.",
|
"consent": "Jeg godtar at siste request-feil, Vue-feil, nettleserdetaljer, svarene mine og et app-skjermbilde når det er mulig, samles inn for feilsøking.",
|
||||||
"submit": "Send rapport",
|
"submit": "Send rapport",
|
||||||
"submitted": "Feilrapport sendt.",
|
"submitted": "Feilrapport sendt.",
|
||||||
"capture_failed": "Skjermbildet kunne ikke tas. Prøv igjen.",
|
"capture_failed": "Skjermbildet kunne ikke tas. Rapporten sendes uten skjermbilde.",
|
||||||
"submit_failed": "Feilrapporten kunne ikke sendes.",
|
"submit_failed": "Feilrapporten kunne ikke sendes.",
|
||||||
"required": "Alle felter og godkjenning av datainnsamling er påkrevd.",
|
"required": "Alle felter og godkjenning av datainnsamling er påkrevd.",
|
||||||
"page_subtitle": "Rapporterte skjermer, request-feil og Vue-feil",
|
"page_subtitle": "Rapporterte skjermer, request-feil og Vue-feil",
|
||||||
@@ -4960,6 +4960,97 @@
|
|||||||
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.replication.services.database'} @:{'words.generated.and'} @:{'words.replication.services.redis'} @:{'words.generated.replication'}"
|
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.replication.services.database'} @:{'words.generated.and'} @:{'words.replication.services.redis'} @:{'words.generated.replication'}"
|
||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Tilgangsomrade",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Tomm gruppe",
|
||||||
|
"reload": "Last inn pa nytt",
|
||||||
|
"retry": "Prov igjen",
|
||||||
|
"select_all": "Velg gruppe"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktivert",
|
||||||
|
"permission": "Tillatelse",
|
||||||
|
"route": "Rute",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Gir tilgang til {name}.",
|
||||||
|
"empty": "Ingen tillatelser er tilgjengelige.",
|
||||||
|
"empty_group": "Denne gruppen har ingen tillatelser.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Kunne ikke laste rolletillatelser.",
|
||||||
|
"update": "En eller flere tillatelser kunne ikke oppdateres. De gjeldende rolletillatelsene ble lastet inn pa nytt."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} treff",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Sidetype- og avdelingstilgang.",
|
||||||
|
"label": "Tilgang"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Tillatelser for bookinger, tidsbookinger og planlegging.",
|
||||||
|
"label": "Bookinger"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Tillatelser for kunder, brukere, ansatte, roller og innlogging.",
|
||||||
|
"label": "Kunder og brukere"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Avdelingsdrift, baner, releer, varsler, rapporter og mal.",
|
||||||
|
"label": "Avdelinger og drift"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Tillatelser for fakturaer, faktureringsperioder, innkreving og e-conomic.",
|
||||||
|
"label": "Fakturering og e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Tillatelser for ordrer, POS, betalinger og ordrelinjer.",
|
||||||
|
"label": "Ordrer og POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Tillatelser som ikke matcher en annen gruppe.",
|
||||||
|
"label": "Annet"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Tillatelser for produkter, priser, rabatter og valuta.",
|
||||||
|
"label": "Produkter og priser"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Tillatelser for selvbetjening, vask, skannere, gatewayer og edge-utstyr.",
|
||||||
|
"label": "Selvbetjening og edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, konfigurasjon, release, replikering og integrasjoner.",
|
||||||
|
"label": "System og konfigurasjon"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Ingen beskrivelse er tilgjengelig.",
|
||||||
|
"no_search_results": "Ingen tillatelser matcher soket.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Gir tilgang til administrasjonssider.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Gir tilgang til superbrukersider.",
|
||||||
|
"label": "Superbruker"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Gir tilgang til brukersider.",
|
||||||
|
"label": "Bruker"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Sok i tillatelser",
|
||||||
|
"search_placeholder": "Sok pa label, nokkel, beskrivelse, rute eller metode",
|
||||||
|
"selected_summary": "{selected} av {total} valgt",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Deaktivert",
|
||||||
|
"enabled": "Aktivert"
|
||||||
|
},
|
||||||
|
"subtitle": "Rolletillatelser",
|
||||||
|
"title": "Tillatelser for rolle {id}",
|
||||||
|
"title_with_name": "Tillatelser for {name}"
|
||||||
|
},
|
||||||
"subtitle": "@.capitalize:{'words.generated.user'} roles"
|
"subtitle": "@.capitalize:{'words.generated.user'} roles"
|
||||||
},
|
},
|
||||||
"self_wash": {
|
"self_wash": {
|
||||||
|
|||||||
@@ -3642,17 +3642,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Rapportera fel",
|
"button": "Rapportera fel",
|
||||||
"title": "Rapportera fel",
|
"title": "Rapportera fel",
|
||||||
"subtitle": "Skicka aktuell skärm och de senaste feldetaljerna till support.",
|
"subtitle": "Skicka de senaste feldetaljerna till support. En skärmbild bifogas när det är möjligt.",
|
||||||
"before_error": "Vad gjorde du innan felet uppstod?",
|
"before_error": "Vad gjorde du innan felet uppstod?",
|
||||||
"expected": "Vad förväntade du dig skulle hända?",
|
"expected": "Vad förväntade du dig skulle hända?",
|
||||||
"actual": "Vad hände faktiskt?",
|
"actual": "Vad hände faktiskt?",
|
||||||
"before_error_placeholder": "Beskriv åtgärden du gjorde, till exempel att öppna ordrar eller välja en kund.",
|
"before_error_placeholder": "Beskriv åtgärden du gjorde, till exempel att öppna ordrar eller välja en kund.",
|
||||||
"expected_placeholder": "Beskriv resultatet du förväntade dig att se.",
|
"expected_placeholder": "Beskriv resultatet du förväntade dig att se.",
|
||||||
"actual_placeholder": "Beskriv vad du såg i stället, inklusive eventuell feltext.",
|
"actual_placeholder": "Beskriv vad du såg i stället, inklusive eventuell feltext.",
|
||||||
"consent": "Jag accepterar att aktuell app-skärm, senaste request-fel, Vue-fel, webbläsardetaljer och mina svar samlas in för felsökning.",
|
"consent": "Jag accepterar att senaste request-fel, Vue-fel, webbläsardetaljer, mina svar och en app-skärmbild när det är möjligt samlas in för felsökning.",
|
||||||
"submit": "Skicka rapport",
|
"submit": "Skicka rapport",
|
||||||
"submitted": "Felrapport skickad.",
|
"submitted": "Felrapport skickad.",
|
||||||
"capture_failed": "Skärmbilden kunde inte tas. Försök igen.",
|
"capture_failed": "Skärmbilden kunde inte tas. Rapporten skickas utan skärmbild.",
|
||||||
"submit_failed": "Felrapporten kunde inte skickas.",
|
"submit_failed": "Felrapporten kunde inte skickas.",
|
||||||
"required": "Alla fält och godkännande av datainsamling krävs.",
|
"required": "Alla fält och godkännande av datainsamling krävs.",
|
||||||
"page_subtitle": "Rapporterade skärmar, request-fel och Vue-fel",
|
"page_subtitle": "Rapporterade skärmar, request-fel och Vue-fel",
|
||||||
@@ -5010,6 +5010,97 @@
|
|||||||
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.generated.database'} @:{'words.generated.and'} @:{'words.replication.services.redis'} @:{'words.generated.replication'}"
|
"subtitle": "@.capitalize:{'words.generated.managed'} @:{'words.generated.database'} @:{'words.generated.and'} @:{'words.replication.services.redis'} @:{'words.generated.replication'}"
|
||||||
},
|
},
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Atkomstomrade",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Rensa grupp",
|
||||||
|
"reload": "Ladda om",
|
||||||
|
"retry": "Forsok igen",
|
||||||
|
"select_all": "Valj grupp"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktiverad",
|
||||||
|
"permission": "Behorighet",
|
||||||
|
"route": "Rutt",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Ger atkomst till {name}.",
|
||||||
|
"empty": "Inga behorigheter ar tillgangliga.",
|
||||||
|
"empty_group": "Den har gruppen har inga behorigheter.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Kunde inte lasa in rollbehorigheter.",
|
||||||
|
"update": "En eller flera behorigheter kunde inte uppdateras. Rollens aktuella behorigheter laddades om."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} traffar",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Sidtyp- och avdelningsatkomst.",
|
||||||
|
"label": "Atkomst"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Behorigheter for bokningar, tidsbokningar och planering.",
|
||||||
|
"label": "Bokningar"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Behorigheter for kunder, anvandare, medarbetare, roller och inloggning.",
|
||||||
|
"label": "Kunder och anvandare"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Avdelningsdrift, banor, relan, aviseringar, rapporter och mal.",
|
||||||
|
"label": "Avdelningar och drift"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Behorigheter for fakturor, faktureringsperioder, inkasso och e-conomic.",
|
||||||
|
"label": "Fakturering och e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Behorigheter for ordrar, POS, betalningar och orderrader.",
|
||||||
|
"label": "Ordrar och POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Behorigheter som inte matchar nagon annan grupp.",
|
||||||
|
"label": "Ovrigt"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Behorigheter for produkter, priser, rabatter och valuta.",
|
||||||
|
"label": "Produkter och priser"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Behorigheter for sjalvbetjaning, tvatt, skannrar, gateways och edge-utrustning.",
|
||||||
|
"label": "Sjalvbetjaning och edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, konfiguration, release, replikering och integrationer.",
|
||||||
|
"label": "System och konfiguration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Ingen beskrivning ar tillganglig.",
|
||||||
|
"no_search_results": "Inga behorigheter matchar aktuell sokning.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Ger atkomst till administrationssidor.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Ger atkomst till superuser-sidor.",
|
||||||
|
"label": "Superuser"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Ger atkomst till anvandarsidor.",
|
||||||
|
"label": "Anvandare"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Sok behorigheter",
|
||||||
|
"search_placeholder": "Sok pa label, nyckel, beskrivning, rutt eller metod",
|
||||||
|
"selected_summary": "{selected} av {total} valda",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Inaktiverad",
|
||||||
|
"enabled": "Aktiverad"
|
||||||
|
},
|
||||||
|
"subtitle": "Rollbehorigheter",
|
||||||
|
"title": "Behorigheter for roll {id}",
|
||||||
|
"title_with_name": "Behorigheter for {name}"
|
||||||
|
},
|
||||||
"subtitle": "@.capitalize:{'words.generated.user'} @:{'words.generated.roles'}"
|
"subtitle": "@.capitalize:{'words.generated.user'} @:{'words.generated.roles'}"
|
||||||
},
|
},
|
||||||
"self_wash": {
|
"self_wash": {
|
||||||
|
|||||||
@@ -3,17 +3,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Rapporter fejl",
|
"button": "Rapporter fejl",
|
||||||
"title": "Rapporter fejl",
|
"title": "Rapporter fejl",
|
||||||
"subtitle": "Send det aktuelle skærmbillede og de seneste fejldetaljer til support.",
|
"subtitle": "Send de seneste fejldetaljer til support. Et skærmbillede vedhæftes, når det er muligt.",
|
||||||
"before_error": "Hvad lavede du, før fejlen opstod?",
|
"before_error": "Hvad lavede du, før fejlen opstod?",
|
||||||
"expected": "Hvad forventede du, der ville ske?",
|
"expected": "Hvad forventede du, der ville ske?",
|
||||||
"actual": "Hvad skete der faktisk?",
|
"actual": "Hvad skete der faktisk?",
|
||||||
"before_error_placeholder": "Beskriv handlingen, du var i gang med, for eksempel at åbne ordrer eller vælge en kunde.",
|
"before_error_placeholder": "Beskriv handlingen, du var i gang med, for eksempel at åbne ordrer eller vælge en kunde.",
|
||||||
"expected_placeholder": "Beskriv det resultat, du forventede at se.",
|
"expected_placeholder": "Beskriv det resultat, du forventede at se.",
|
||||||
"actual_placeholder": "Beskriv, hvad du så i stedet, inklusive eventuel fejltekst.",
|
"actual_placeholder": "Beskriv, hvad du så i stedet, inklusive eventuel fejltekst.",
|
||||||
"consent": "Jeg accepterer, at det aktuelle app-skærmbillede, de seneste request-fejl, Vue-fejl, browseroplysninger og mine svar indsamles til fejlfinding.",
|
"consent": "Jeg accepterer, at de seneste request-fejl, Vue-fejl, browseroplysninger, mine svar og et app-skærmbillede, når det er muligt, indsamles til fejlfinding.",
|
||||||
"submit": "Send rapport",
|
"submit": "Send rapport",
|
||||||
"submitted": "Fejlrapporten er sendt.",
|
"submitted": "Fejlrapporten er sendt.",
|
||||||
"capture_failed": "Skærmbilledet kunne ikke oprettes. Prøv igen.",
|
"capture_failed": "Skærmbilledet kunne ikke oprettes. Rapporten sendes uden skærmbillede.",
|
||||||
"submit_failed": "Fejlrapporten kunne ikke sendes.",
|
"submit_failed": "Fejlrapporten kunne ikke sendes.",
|
||||||
"required": "Alle felter og accept af dataindsamling er påkrævet.",
|
"required": "Alle felter og accept af dataindsamling er påkrævet.",
|
||||||
"page_subtitle": "Rapporterede skærme, request-fejl og Vue-fejl",
|
"page_subtitle": "Rapporterede skærme, request-fejl og Vue-fejl",
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"compat": {
|
||||||
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Adgangsomrade",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Ryd gruppe",
|
||||||
|
"reload": "Genindlaes",
|
||||||
|
"retry": "Prov igen",
|
||||||
|
"select_all": "Vaelg gruppe"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktiveret",
|
||||||
|
"permission": "Tilladelse",
|
||||||
|
"route": "Rute",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Giver adgang til {name}.",
|
||||||
|
"empty": "Der er ingen tilladelser tilgaengelige.",
|
||||||
|
"empty_group": "Denne gruppe har ingen tilladelser.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Rolletilladelser kunne ikke indlaeses.",
|
||||||
|
"update": "En eller flere tilladelser kunne ikke opdateres. Rollens aktuelle tilladelser blev genindlaest."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} matcher",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Sidetype- og afdelingsadgang.",
|
||||||
|
"label": "Adgang"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Tilladelser til bookinger, tidsbookinger og planlaegning.",
|
||||||
|
"label": "Bookinger"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Tilladelser til kunder, brugere, medarbejdere, roller og login.",
|
||||||
|
"label": "Kunder og brugere"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Afdelingsdrift, baner, relaer, notifikationer, rapporter og mal.",
|
||||||
|
"label": "Afdelinger og drift"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Tilladelser til fakturaer, faktureringsperioder, opkraevning og e-conomic.",
|
||||||
|
"label": "Fakturering og e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Tilladelser til ordrer, POS, betalinger og ordrelinjer.",
|
||||||
|
"label": "Ordrer og POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Tilladelser, der ikke matcher en anden gruppe.",
|
||||||
|
"label": "Andet"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Tilladelser til produkter, priser, rabatter og valuta.",
|
||||||
|
"label": "Produkter og priser"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Tilladelser til selvbetjening, vask, scannere, gateways og edge-udstyr.",
|
||||||
|
"label": "Selvbetjening og edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, konfiguration, release, replikering og integrationer.",
|
||||||
|
"label": "System og konfiguration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Der er ingen beskrivelse.",
|
||||||
|
"no_search_results": "Ingen tilladelser matcher sogningen.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Giver adgang til administrationssider.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Giver adgang til superbrugersider.",
|
||||||
|
"label": "Superbruger"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Giver adgang til brugersider.",
|
||||||
|
"label": "Bruger"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Sog i tilladelser",
|
||||||
|
"search_placeholder": "Sog pa label, nogle, beskrivelse, rute eller metode",
|
||||||
|
"selected_summary": "{selected} af {total} valgt",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Deaktiveret",
|
||||||
|
"enabled": "Aktiveret"
|
||||||
|
},
|
||||||
|
"subtitle": "Rolletilladelser",
|
||||||
|
"title": "Tilladelser for rolle {id}",
|
||||||
|
"title_with_name": "Tilladelser for {name}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,20 @@
|
|||||||
"compat": {
|
"compat": {
|
||||||
"vehicles": {
|
"vehicles": {
|
||||||
"add": "@:{'terms.glossary.tilføj'} @:{'terms.glossary.køretøj'}",
|
"add": "@:{'terms.glossary.tilføj'} @:{'terms.glossary.køretøj'}",
|
||||||
|
"add_modal": {
|
||||||
|
"customer_label": "Kunde",
|
||||||
|
"customer_placeholder": "Søg efter kundenavn eller kundenummer",
|
||||||
|
"error": "Køretøjet kunne ikke tilføjes.",
|
||||||
|
"no_customer_results": "Ingen kunder fundet",
|
||||||
|
"reference_placeholder": "Valgfri reference",
|
||||||
|
"registration_placeholder": "Registreringsnummer",
|
||||||
|
"selected_customer": "Valgt kunde",
|
||||||
|
"submit": "Tilføj køretøj",
|
||||||
|
"title": "Tilføj køretøj",
|
||||||
|
"type_load_error": "Køretøjstyper kunne ikke indlæses.",
|
||||||
|
"type_placeholder": "Vælg køretøjstype",
|
||||||
|
"validation_error": "Vælg kunde, registreringsnummer og køretøjstype."
|
||||||
|
},
|
||||||
"brand": "@:{'phrases.compat.admin.pos.make'}",
|
"brand": "@:{'phrases.compat.admin.pos.make'}",
|
||||||
"color": "Farve",
|
"color": "Farve",
|
||||||
"delete_vehicle": "@:{'phrases.compat.vehicles.delete'}",
|
"delete_vehicle": "@:{'phrases.compat.vehicles.delete'}",
|
||||||
|
|||||||
@@ -3,17 +3,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Fehler melden",
|
"button": "Fehler melden",
|
||||||
"title": "Fehler melden",
|
"title": "Fehler melden",
|
||||||
"subtitle": "Sende den aktuellen Bildschirm und die letzten Fehlerdetails an den Support.",
|
"subtitle": "Sende die letzten Fehlerdetails an den Support. Ein Screenshot wird angehängt, wenn möglich.",
|
||||||
"before_error": "Was haben Sie getan, bevor der Fehler auftrat?",
|
"before_error": "Was haben Sie getan, bevor der Fehler auftrat?",
|
||||||
"expected": "Was hatten Sie erwartet?",
|
"expected": "Was hatten Sie erwartet?",
|
||||||
"actual": "Was ist tatsächlich passiert?",
|
"actual": "Was ist tatsächlich passiert?",
|
||||||
"before_error_placeholder": "Beschreiben Sie die Aktion, zum Beispiel Bestellungen öffnen oder einen Kunden auswählen.",
|
"before_error_placeholder": "Beschreiben Sie die Aktion, zum Beispiel Bestellungen öffnen oder einen Kunden auswählen.",
|
||||||
"expected_placeholder": "Beschreiben Sie das erwartete Ergebnis.",
|
"expected_placeholder": "Beschreiben Sie das erwartete Ergebnis.",
|
||||||
"actual_placeholder": "Beschreiben Sie, was stattdessen zu sehen war, inklusive Fehlermeldung.",
|
"actual_placeholder": "Beschreiben Sie, was stattdessen zu sehen war, inklusive Fehlermeldung.",
|
||||||
"consent": "Ich akzeptiere, dass der aktuelle App-Bildschirm, letzte Request-Fehler, Vue-Fehler, Browserdetails und meine Antworten zur Fehlersuche erfasst werden.",
|
"consent": "Ich akzeptiere, dass letzte Request-Fehler, Vue-Fehler, Browserdetails, meine Antworten und ein App-Screenshot, wenn möglich, zur Fehlersuche erfasst werden.",
|
||||||
"submit": "Bericht senden",
|
"submit": "Bericht senden",
|
||||||
"submitted": "Fehlerbericht gesendet.",
|
"submitted": "Fehlerbericht gesendet.",
|
||||||
"capture_failed": "Der Screenshot konnte nicht erstellt werden. Bitte versuchen Sie es erneut.",
|
"capture_failed": "Der Screenshot konnte nicht erstellt werden. Der Bericht wird ohne Screenshot gesendet.",
|
||||||
"submit_failed": "Der Fehlerbericht konnte nicht gesendet werden.",
|
"submit_failed": "Der Fehlerbericht konnte nicht gesendet werden.",
|
||||||
"required": "Alle Felder und die Zustimmung zur Datenerfassung sind erforderlich.",
|
"required": "Alle Felder und die Zustimmung zur Datenerfassung sind erforderlich.",
|
||||||
"page_subtitle": "Gemeldete Bildschirme, Request-Fehler und Vue-Fehler",
|
"page_subtitle": "Gemeldete Bildschirme, Request-Fehler und Vue-Fehler",
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"compat": {
|
||||||
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Zugriffsbereich",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Gruppe leeren",
|
||||||
|
"reload": "Neu laden",
|
||||||
|
"retry": "Erneut versuchen",
|
||||||
|
"select_all": "Gruppe auswaehlen"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktiviert",
|
||||||
|
"permission": "Berechtigung",
|
||||||
|
"route": "Route",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Erlaubt Zugriff auf {name}.",
|
||||||
|
"empty": "Es sind keine Berechtigungen verfuegbar.",
|
||||||
|
"empty_group": "Diese Gruppe hat keine Berechtigungen.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Rollenberechtigungen konnten nicht geladen werden.",
|
||||||
|
"update": "Eine oder mehrere Berechtigungen konnten nicht aktualisiert werden. Die aktuellen Rollenberechtigungen wurden neu geladen."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} Treffer",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Seitentyp- und Abteilungszugriff.",
|
||||||
|
"label": "Zugriff"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Berechtigungen fuer Buchungen, Zeitbuchungen und Planung.",
|
||||||
|
"label": "Buchungen"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Berechtigungen fuer Kunden, Benutzer, Mitarbeiter, Rollen und Anmeldung.",
|
||||||
|
"label": "Kunden und Benutzer"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Abteilungsbetrieb, Spuren, Relais, Benachrichtigungen, Berichte und Ziele.",
|
||||||
|
"label": "Abteilungen und Betrieb"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Berechtigungen fuer Rechnungen, Abrechnungsperioden, Inkasso und e-conomic.",
|
||||||
|
"label": "Rechnungen und e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Berechtigungen fuer Auftraege, POS, Zahlungen und Auftragszeilen.",
|
||||||
|
"label": "Auftraege und POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Berechtigungen, die keiner anderen Gruppe entsprechen.",
|
||||||
|
"label": "Sonstige"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Berechtigungen fuer Produkte, Preise, Rabatte und Waehrungen.",
|
||||||
|
"label": "Produkte und Preise"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Berechtigungen fuer Self-Service, Waschen, Scanner, Gateways und Edge-Hardware.",
|
||||||
|
"label": "Self-Service und Edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, Konfiguration, Release, Replikation und Integrationen.",
|
||||||
|
"label": "System und Konfiguration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Keine Beschreibung verfuegbar.",
|
||||||
|
"no_search_results": "Keine Berechtigungen entsprechen der Suche.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Erlaubt Zugriff auf Admin-Dashboardseiten.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Erlaubt Zugriff auf Superuser-Dashboardseiten.",
|
||||||
|
"label": "Superuser"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Erlaubt Zugriff auf Benutzer-Dashboardseiten.",
|
||||||
|
"label": "Benutzer"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Berechtigungen suchen",
|
||||||
|
"search_placeholder": "Nach Label, Schluessel, Beschreibung, Route oder Methode suchen",
|
||||||
|
"selected_summary": "{selected} von {total} ausgewaehlt",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Deaktiviert",
|
||||||
|
"enabled": "Aktiviert"
|
||||||
|
},
|
||||||
|
"subtitle": "Rollenberechtigungen",
|
||||||
|
"title": "Berechtigungen fuer Rolle {id}",
|
||||||
|
"title_with_name": "Berechtigungen fuer {name}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,17 +3,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Report error",
|
"button": "Report error",
|
||||||
"title": "Report error",
|
"title": "Report error",
|
||||||
"subtitle": "Send the current screen and recent error details to support.",
|
"subtitle": "Send recent error details to support. A screenshot is attached when available.",
|
||||||
"before_error": "What were you doing before the error occurred?",
|
"before_error": "What were you doing before the error occurred?",
|
||||||
"expected": "What did you expect would happen?",
|
"expected": "What did you expect would happen?",
|
||||||
"actual": "What actually happened?",
|
"actual": "What actually happened?",
|
||||||
"before_error_placeholder": "Describe the action you were taking, for example opening orders or selecting a customer.",
|
"before_error_placeholder": "Describe the action you were taking, for example opening orders or selecting a customer.",
|
||||||
"expected_placeholder": "Describe the result you expected to see.",
|
"expected_placeholder": "Describe the result you expected to see.",
|
||||||
"actual_placeholder": "Describe what you saw instead, including any error text.",
|
"actual_placeholder": "Describe what you saw instead, including any error text.",
|
||||||
"consent": "I accept that the current app screen, recent request errors, Vue errors, browser details, and my answers are collected for troubleshooting.",
|
"consent": "I accept that recent request errors, Vue errors, browser details, my answers, and an app screenshot when available are collected for troubleshooting.",
|
||||||
"submit": "Submit report",
|
"submit": "Submit report",
|
||||||
"submitted": "Error report submitted.",
|
"submitted": "Error report submitted.",
|
||||||
"capture_failed": "The screen capture failed. Please try again.",
|
"capture_failed": "The screen capture failed. The report will be sent without a screenshot.",
|
||||||
"submit_failed": "The error report could not be submitted.",
|
"submit_failed": "The error report could not be submitted.",
|
||||||
"required": "All fields and data collection acceptance are required.",
|
"required": "All fields and data collection acceptance are required.",
|
||||||
"page_subtitle": "Reported screens, request failures, and Vue errors",
|
"page_subtitle": "Reported screens, request failures, and Vue errors",
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"compat": {
|
||||||
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Access scope",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Clear group",
|
||||||
|
"reload": "Reload",
|
||||||
|
"retry": "Try again",
|
||||||
|
"select_all": "Select group"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Enabled",
|
||||||
|
"permission": "Permission",
|
||||||
|
"route": "Route",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Allows access to {name}.",
|
||||||
|
"empty": "No permissions are available.",
|
||||||
|
"empty_group": "This group has no permissions.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Could not load role permissions.",
|
||||||
|
"update": "Could not update one or more permissions. The current role permissions were reloaded."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} matching",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Page type and department access permissions.",
|
||||||
|
"label": "Access"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Booking, time booking, and planning permissions.",
|
||||||
|
"label": "Bookings"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Customer, user, employee, role, and authentication permissions.",
|
||||||
|
"label": "Customers and users"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Department operations, lanes, relays, notifications, reports, and goals.",
|
||||||
|
"label": "Departments and operations"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Invoice, billing period, collection, and e-conomic permissions.",
|
||||||
|
"label": "Invoicing and e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Order, POS, payment, and order line permissions.",
|
||||||
|
"label": "Orders and POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Permissions that do not match another group.",
|
||||||
|
"label": "Other"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Product, price, discount, and currency permissions.",
|
||||||
|
"label": "Products and pricing"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Self-serve, wash, scanner, gateway, and edge hardware permissions.",
|
||||||
|
"label": "Self-serve and edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, configuration, release, replication, and integration permissions.",
|
||||||
|
"label": "System and configuration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "No description is available.",
|
||||||
|
"no_search_results": "No permissions match the current search.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Allows access to admin dashboard pages.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Allows access to superuser dashboard pages.",
|
||||||
|
"label": "Superuser"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Allows access to user dashboard pages.",
|
||||||
|
"label": "User"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Search permissions",
|
||||||
|
"search_placeholder": "Search by label, key, description, route, or method",
|
||||||
|
"selected_summary": "{selected} of {total} selected",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Disabled",
|
||||||
|
"enabled": "Enabled"
|
||||||
|
},
|
||||||
|
"subtitle": "Role permissions",
|
||||||
|
"title": "Role {id} permissions",
|
||||||
|
"title_with_name": "{name} permissions"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,20 @@
|
|||||||
"compat": {
|
"compat": {
|
||||||
"vehicles": {
|
"vehicles": {
|
||||||
"add": "@.capitalize:{'terms.glossary.add'} @:{'terms.glossary.vehicle'}",
|
"add": "@.capitalize:{'terms.glossary.add'} @:{'terms.glossary.vehicle'}",
|
||||||
|
"add_modal": {
|
||||||
|
"customer_label": "Customer",
|
||||||
|
"customer_placeholder": "Search by customer name or number",
|
||||||
|
"error": "Unable to add vehicle.",
|
||||||
|
"no_customer_results": "No customers found",
|
||||||
|
"reference_placeholder": "Optional reference",
|
||||||
|
"registration_placeholder": "Registration number",
|
||||||
|
"selected_customer": "Selected customer",
|
||||||
|
"submit": "Add vehicle",
|
||||||
|
"title": "Add vehicle",
|
||||||
|
"type_load_error": "Unable to load vehicle types.",
|
||||||
|
"type_placeholder": "Select vehicle type",
|
||||||
|
"validation_error": "Select a customer, registration number, and vehicle type."
|
||||||
|
},
|
||||||
"brand": "Brand",
|
"brand": "Brand",
|
||||||
"color": "Color",
|
"color": "Color",
|
||||||
"delete_vehicle": "@:{'phrases.compat.vehicles.delete'}",
|
"delete_vehicle": "@:{'phrases.compat.vehicles.delete'}",
|
||||||
|
|||||||
@@ -1,5 +1,96 @@
|
|||||||
{
|
{
|
||||||
"roles": {
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "@:{'phrases.compat.roles.permissions.access_scope'}",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "@:{'phrases.compat.roles.permissions.actions.clear_all'}",
|
||||||
|
"reload": "@:{'phrases.compat.roles.permissions.actions.reload'}",
|
||||||
|
"retry": "@:{'phrases.compat.roles.permissions.actions.retry'}",
|
||||||
|
"select_all": "@:{'phrases.compat.roles.permissions.actions.select_all'}"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "@:{'phrases.compat.roles.permissions.columns.enabled'}",
|
||||||
|
"permission": "@:{'phrases.compat.roles.permissions.columns.permission'}",
|
||||||
|
"route": "@:{'phrases.compat.roles.permissions.columns.route'}",
|
||||||
|
"status": "@:{'phrases.compat.roles.permissions.columns.status'}"
|
||||||
|
},
|
||||||
|
"department_access_description": "@:{'phrases.compat.roles.permissions.department_access_description'}",
|
||||||
|
"empty": "@:{'phrases.compat.roles.permissions.empty'}",
|
||||||
|
"empty_group": "@:{'phrases.compat.roles.permissions.empty_group'}",
|
||||||
|
"errors": {
|
||||||
|
"load": "@:{'phrases.compat.roles.permissions.errors.load'}",
|
||||||
|
"update": "@:{'phrases.compat.roles.permissions.errors.update'}"
|
||||||
|
},
|
||||||
|
"filtered_summary": "@:{'phrases.compat.roles.permissions.filtered_summary'}",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.access.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.access.label'}"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.bookings.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.bookings.label'}"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.customers_users.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.customers_users.label'}"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.departments_operations.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.departments_operations.label'}"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.invoicing_economic.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.invoicing_economic.label'}"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.orders_pos.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.orders_pos.label'}"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.other.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.other.label'}"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.products_pricing.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.products_pricing.label'}"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.selfserve_edge.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.selfserve_edge.label'}"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.groups.system_config.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.groups.system_config.label'}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "@:{'phrases.compat.roles.permissions.no_description'}",
|
||||||
|
"no_search_results": "@:{'phrases.compat.roles.permissions.no_search_results'}",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.page_access.admin.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.page_access.admin.label'}"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.page_access.superuser.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.page_access.superuser.label'}"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "@:{'phrases.compat.roles.permissions.page_access.user.description'}",
|
||||||
|
"label": "@:{'phrases.compat.roles.permissions.page_access.user.label'}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "@:{'phrases.compat.roles.permissions.search_label'}",
|
||||||
|
"search_placeholder": "@:{'phrases.compat.roles.permissions.search_placeholder'}",
|
||||||
|
"selected_summary": "@:{'phrases.compat.roles.permissions.selected_summary'}",
|
||||||
|
"status": {
|
||||||
|
"disabled": "@:{'phrases.compat.roles.permissions.status.disabled'}",
|
||||||
|
"enabled": "@:{'phrases.compat.roles.permissions.status.enabled'}"
|
||||||
|
},
|
||||||
|
"subtitle": "@:{'phrases.compat.roles.permissions.subtitle'}",
|
||||||
|
"title": "@:{'phrases.compat.roles.permissions.title'}",
|
||||||
|
"title_with_name": "@:{'phrases.compat.roles.permissions.title_with_name'}"
|
||||||
|
},
|
||||||
"subtitle": "@:{'phrases.compat.roles.subtitle'}",
|
"subtitle": "@:{'phrases.compat.roles.subtitle'}",
|
||||||
"title": "@:{'phrases.compat.common.roles'}"
|
"title": "@:{'phrases.compat.common.roles'}"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,20 @@
|
|||||||
"vehicles": {
|
"vehicles": {
|
||||||
"actions": "@:common.actions",
|
"actions": "@:common.actions",
|
||||||
"add": "@:{'phrases.compat.vehicles.add'}",
|
"add": "@:{'phrases.compat.vehicles.add'}",
|
||||||
|
"add_modal": {
|
||||||
|
"customer_label": "@:{'phrases.compat.vehicles.add_modal.customer_label'}",
|
||||||
|
"customer_placeholder": "@:{'phrases.compat.vehicles.add_modal.customer_placeholder'}",
|
||||||
|
"error": "@:{'phrases.compat.vehicles.add_modal.error'}",
|
||||||
|
"no_customer_results": "@:{'phrases.compat.vehicles.add_modal.no_customer_results'}",
|
||||||
|
"reference_placeholder": "@:{'phrases.compat.vehicles.add_modal.reference_placeholder'}",
|
||||||
|
"registration_placeholder": "@:{'phrases.compat.vehicles.add_modal.registration_placeholder'}",
|
||||||
|
"selected_customer": "@:{'phrases.compat.vehicles.add_modal.selected_customer'}",
|
||||||
|
"submit": "@:{'phrases.compat.vehicles.add_modal.submit'}",
|
||||||
|
"title": "@:{'phrases.compat.vehicles.add_modal.title'}",
|
||||||
|
"type_load_error": "@:{'phrases.compat.vehicles.add_modal.type_load_error'}",
|
||||||
|
"type_placeholder": "@:{'phrases.compat.vehicles.add_modal.type_placeholder'}",
|
||||||
|
"validation_error": "@:{'phrases.compat.vehicles.add_modal.validation_error'}"
|
||||||
|
},
|
||||||
"brand": "@:{'phrases.compat.vehicles.brand'}",
|
"brand": "@:{'phrases.compat.vehicles.brand'}",
|
||||||
"color": "@:{'phrases.compat.vehicles.color'}",
|
"color": "@:{'phrases.compat.vehicles.color'}",
|
||||||
"created_at": "@:{'phrases.compat.global.generated'}",
|
"created_at": "@:{'phrases.compat.global.generated'}",
|
||||||
|
|||||||
@@ -3,17 +3,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Rapporter feil",
|
"button": "Rapporter feil",
|
||||||
"title": "Rapporter feil",
|
"title": "Rapporter feil",
|
||||||
"subtitle": "Send gjeldende skjermbilde og de siste feildetaljene til support.",
|
"subtitle": "Send de siste feildetaljene til support. Et skjermbilde legges ved når det er mulig.",
|
||||||
"before_error": "Hva gjorde du før feilen oppstod?",
|
"before_error": "Hva gjorde du før feilen oppstod?",
|
||||||
"expected": "Hva forventet du at skulle skje?",
|
"expected": "Hva forventet du at skulle skje?",
|
||||||
"actual": "Hva skjedde faktisk?",
|
"actual": "Hva skjedde faktisk?",
|
||||||
"before_error_placeholder": "Beskriv handlingen du utførte, for eksempel å åpne ordre eller velge en kunde.",
|
"before_error_placeholder": "Beskriv handlingen du utførte, for eksempel å åpne ordre eller velge en kunde.",
|
||||||
"expected_placeholder": "Beskriv resultatet du forventet å se.",
|
"expected_placeholder": "Beskriv resultatet du forventet å se.",
|
||||||
"actual_placeholder": "Beskriv hva du så i stedet, inkludert eventuell feiltekst.",
|
"actual_placeholder": "Beskriv hva du så i stedet, inkludert eventuell feiltekst.",
|
||||||
"consent": "Jeg godtar at gjeldende app-skjermbilde, siste request-feil, Vue-feil, nettleserdetaljer og svarene mine samles inn for feilsøking.",
|
"consent": "Jeg godtar at siste request-feil, Vue-feil, nettleserdetaljer, svarene mine og et app-skjermbilde når det er mulig, samles inn for feilsøking.",
|
||||||
"submit": "Send rapport",
|
"submit": "Send rapport",
|
||||||
"submitted": "Feilrapport sendt.",
|
"submitted": "Feilrapport sendt.",
|
||||||
"capture_failed": "Skjermbildet kunne ikke tas. Prøv igjen.",
|
"capture_failed": "Skjermbildet kunne ikke tas. Rapporten sendes uten skjermbilde.",
|
||||||
"submit_failed": "Feilrapporten kunne ikke sendes.",
|
"submit_failed": "Feilrapporten kunne ikke sendes.",
|
||||||
"required": "Alle felter og godkjenning av datainnsamling er påkrevd.",
|
"required": "Alle felter og godkjenning av datainnsamling er påkrevd.",
|
||||||
"page_subtitle": "Rapporterte skjermer, request-feil og Vue-feil",
|
"page_subtitle": "Rapporterte skjermer, request-feil og Vue-feil",
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"compat": {
|
||||||
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Tilgangsomrade",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Tomm gruppe",
|
||||||
|
"reload": "Last inn pa nytt",
|
||||||
|
"retry": "Prov igjen",
|
||||||
|
"select_all": "Velg gruppe"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktivert",
|
||||||
|
"permission": "Tillatelse",
|
||||||
|
"route": "Rute",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Gir tilgang til {name}.",
|
||||||
|
"empty": "Ingen tillatelser er tilgjengelige.",
|
||||||
|
"empty_group": "Denne gruppen har ingen tillatelser.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Kunne ikke laste rolletillatelser.",
|
||||||
|
"update": "En eller flere tillatelser kunne ikke oppdateres. De gjeldende rolletillatelsene ble lastet inn pa nytt."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} treff",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Sidetype- og avdelingstilgang.",
|
||||||
|
"label": "Tilgang"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Tillatelser for bookinger, tidsbookinger og planlegging.",
|
||||||
|
"label": "Bookinger"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Tillatelser for kunder, brukere, ansatte, roller og innlogging.",
|
||||||
|
"label": "Kunder og brukere"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Avdelingsdrift, baner, releer, varsler, rapporter og mal.",
|
||||||
|
"label": "Avdelinger og drift"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Tillatelser for fakturaer, faktureringsperioder, innkreving og e-conomic.",
|
||||||
|
"label": "Fakturering og e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Tillatelser for ordrer, POS, betalinger og ordrelinjer.",
|
||||||
|
"label": "Ordrer og POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Tillatelser som ikke matcher en annen gruppe.",
|
||||||
|
"label": "Annet"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Tillatelser for produkter, priser, rabatter og valuta.",
|
||||||
|
"label": "Produkter og priser"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Tillatelser for selvbetjening, vask, skannere, gatewayer og edge-utstyr.",
|
||||||
|
"label": "Selvbetjening og edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, konfigurasjon, release, replikering og integrasjoner.",
|
||||||
|
"label": "System og konfigurasjon"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Ingen beskrivelse er tilgjengelig.",
|
||||||
|
"no_search_results": "Ingen tillatelser matcher soket.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Gir tilgang til administrasjonssider.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Gir tilgang til superbrukersider.",
|
||||||
|
"label": "Superbruker"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Gir tilgang til brukersider.",
|
||||||
|
"label": "Bruker"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Sok i tillatelser",
|
||||||
|
"search_placeholder": "Sok pa label, nokkel, beskrivelse, rute eller metode",
|
||||||
|
"selected_summary": "{selected} av {total} valgt",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Deaktivert",
|
||||||
|
"enabled": "Aktivert"
|
||||||
|
},
|
||||||
|
"subtitle": "Rolletillatelser",
|
||||||
|
"title": "Tillatelser for rolle {id}",
|
||||||
|
"title_with_name": "Tillatelser for {name}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,17 +3,17 @@
|
|||||||
"error_report": {
|
"error_report": {
|
||||||
"button": "Rapportera fel",
|
"button": "Rapportera fel",
|
||||||
"title": "Rapportera fel",
|
"title": "Rapportera fel",
|
||||||
"subtitle": "Skicka aktuell skärm och de senaste feldetaljerna till support.",
|
"subtitle": "Skicka de senaste feldetaljerna till support. En skärmbild bifogas när det är möjligt.",
|
||||||
"before_error": "Vad gjorde du innan felet uppstod?",
|
"before_error": "Vad gjorde du innan felet uppstod?",
|
||||||
"expected": "Vad förväntade du dig skulle hända?",
|
"expected": "Vad förväntade du dig skulle hända?",
|
||||||
"actual": "Vad hände faktiskt?",
|
"actual": "Vad hände faktiskt?",
|
||||||
"before_error_placeholder": "Beskriv åtgärden du gjorde, till exempel att öppna ordrar eller välja en kund.",
|
"before_error_placeholder": "Beskriv åtgärden du gjorde, till exempel att öppna ordrar eller välja en kund.",
|
||||||
"expected_placeholder": "Beskriv resultatet du förväntade dig att se.",
|
"expected_placeholder": "Beskriv resultatet du förväntade dig att se.",
|
||||||
"actual_placeholder": "Beskriv vad du såg i stället, inklusive eventuell feltext.",
|
"actual_placeholder": "Beskriv vad du såg i stället, inklusive eventuell feltext.",
|
||||||
"consent": "Jag accepterar att aktuell app-skärm, senaste request-fel, Vue-fel, webbläsardetaljer och mina svar samlas in för felsökning.",
|
"consent": "Jag accepterar att senaste request-fel, Vue-fel, webbläsardetaljer, mina svar och en app-skärmbild när det är möjligt samlas in för felsökning.",
|
||||||
"submit": "Skicka rapport",
|
"submit": "Skicka rapport",
|
||||||
"submitted": "Felrapport skickad.",
|
"submitted": "Felrapport skickad.",
|
||||||
"capture_failed": "Skärmbilden kunde inte tas. Försök igen.",
|
"capture_failed": "Skärmbilden kunde inte tas. Rapporten skickas utan skärmbild.",
|
||||||
"submit_failed": "Felrapporten kunde inte skickas.",
|
"submit_failed": "Felrapporten kunde inte skickas.",
|
||||||
"required": "Alla fält och godkännande av datainsamling krävs.",
|
"required": "Alla fält och godkännande av datainsamling krävs.",
|
||||||
"page_subtitle": "Rapporterade skärmar, request-fel och Vue-fel",
|
"page_subtitle": "Rapporterade skärmar, request-fel och Vue-fel",
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"compat": {
|
||||||
|
"roles": {
|
||||||
|
"permissions": {
|
||||||
|
"access_scope": "Atkomstomrade",
|
||||||
|
"actions": {
|
||||||
|
"clear_all": "Rensa grupp",
|
||||||
|
"reload": "Ladda om",
|
||||||
|
"retry": "Forsok igen",
|
||||||
|
"select_all": "Valj grupp"
|
||||||
|
},
|
||||||
|
"columns": {
|
||||||
|
"enabled": "Aktiverad",
|
||||||
|
"permission": "Behorighet",
|
||||||
|
"route": "Rutt",
|
||||||
|
"status": "Status"
|
||||||
|
},
|
||||||
|
"department_access_description": "Ger atkomst till {name}.",
|
||||||
|
"empty": "Inga behorigheter ar tillgangliga.",
|
||||||
|
"empty_group": "Den har gruppen har inga behorigheter.",
|
||||||
|
"errors": {
|
||||||
|
"load": "Kunde inte lasa in rollbehorigheter.",
|
||||||
|
"update": "En eller flera behorigheter kunde inte uppdateras. Rollens aktuella behorigheter laddades om."
|
||||||
|
},
|
||||||
|
"filtered_summary": "{count} traffar",
|
||||||
|
"groups": {
|
||||||
|
"access": {
|
||||||
|
"description": "Sidtyp- och avdelningsatkomst.",
|
||||||
|
"label": "Atkomst"
|
||||||
|
},
|
||||||
|
"bookings": {
|
||||||
|
"description": "Behorigheter for bokningar, tidsbokningar och planering.",
|
||||||
|
"label": "Bokningar"
|
||||||
|
},
|
||||||
|
"customers_users": {
|
||||||
|
"description": "Behorigheter for kunder, anvandare, medarbetare, roller och inloggning.",
|
||||||
|
"label": "Kunder och anvandare"
|
||||||
|
},
|
||||||
|
"departments_operations": {
|
||||||
|
"description": "Avdelningsdrift, banor, relan, aviseringar, rapporter och mal.",
|
||||||
|
"label": "Avdelningar och drift"
|
||||||
|
},
|
||||||
|
"invoicing_economic": {
|
||||||
|
"description": "Behorigheter for fakturor, faktureringsperioder, inkasso och e-conomic.",
|
||||||
|
"label": "Fakturering och e-conomic"
|
||||||
|
},
|
||||||
|
"orders_pos": {
|
||||||
|
"description": "Behorigheter for ordrar, POS, betalningar och orderrader.",
|
||||||
|
"label": "Ordrar och POS"
|
||||||
|
},
|
||||||
|
"other": {
|
||||||
|
"description": "Behorigheter som inte matchar nagon annan grupp.",
|
||||||
|
"label": "Ovrigt"
|
||||||
|
},
|
||||||
|
"products_pricing": {
|
||||||
|
"description": "Behorigheter for produkter, priser, rabatter och valuta.",
|
||||||
|
"label": "Produkter och priser"
|
||||||
|
},
|
||||||
|
"selfserve_edge": {
|
||||||
|
"description": "Behorigheter for sjalvbetjaning, tvatt, skannrar, gateways och edge-utrustning.",
|
||||||
|
"label": "Sjalvbetjaning och edge"
|
||||||
|
},
|
||||||
|
"system_config": {
|
||||||
|
"description": "System, konfiguration, release, replikering och integrationer.",
|
||||||
|
"label": "System och konfiguration"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no_description": "Ingen beskrivning ar tillganglig.",
|
||||||
|
"no_search_results": "Inga behorigheter matchar aktuell sokning.",
|
||||||
|
"page_access": {
|
||||||
|
"admin": {
|
||||||
|
"description": "Ger atkomst till administrationssidor.",
|
||||||
|
"label": "Admin"
|
||||||
|
},
|
||||||
|
"superuser": {
|
||||||
|
"description": "Ger atkomst till superuser-sidor.",
|
||||||
|
"label": "Superuser"
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"description": "Ger atkomst till anvandarsidor.",
|
||||||
|
"label": "Anvandare"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"search_label": "Sok behorigheter",
|
||||||
|
"search_placeholder": "Sok pa label, nyckel, beskrivning, rutt eller metod",
|
||||||
|
"selected_summary": "{selected} av {total} valda",
|
||||||
|
"status": {
|
||||||
|
"disabled": "Inaktiverad",
|
||||||
|
"enabled": "Aktiverad"
|
||||||
|
},
|
||||||
|
"subtitle": "Rollbehorigheter",
|
||||||
|
"title": "Behorigheter for roll {id}",
|
||||||
|
"title_with_name": "Behorigheter for {name}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
const DATE_ONLY_PATTERN = /^(\d{4})-(\d{2})-(\d{2})$/;
|
||||||
|
const DATE_ONLY_PREFIX_PATTERN = /^(\d{4}-\d{2}-\d{2})/;
|
||||||
|
|
||||||
|
const padDatePart = (value) => String(value).padStart(2, "0");
|
||||||
|
|
||||||
|
export const isValidDate = (value) => value instanceof Date && !Number.isNaN(value.getTime());
|
||||||
|
|
||||||
|
export const formatLocalDateOnly = (value = new Date()) => {
|
||||||
|
if (typeof value === "string") {
|
||||||
|
const directMatch = value.trim().match(DATE_ONLY_PREFIX_PATTERN);
|
||||||
|
if (directMatch) {
|
||||||
|
return directMatch[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const date = value instanceof Date ? value : new Date(value);
|
||||||
|
if (!isValidDate(date)) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
date.getFullYear(),
|
||||||
|
padDatePart(date.getMonth() + 1),
|
||||||
|
padDatePart(date.getDate()),
|
||||||
|
].join("-");
|
||||||
|
};
|
||||||
|
|
||||||
|
export const parseLocalDateOnly = (value) => {
|
||||||
|
if (value instanceof Date) {
|
||||||
|
return isValidDate(value)
|
||||||
|
? new Date(value.getFullYear(), value.getMonth(), value.getDate())
|
||||||
|
: new Date(Number.NaN);
|
||||||
|
}
|
||||||
|
|
||||||
|
const stringValue = String(value ?? "").trim();
|
||||||
|
const match = DATE_ONLY_PATTERN.exec(stringValue);
|
||||||
|
if (match) {
|
||||||
|
const year = Number(match[1]);
|
||||||
|
const month = Number(match[2]);
|
||||||
|
const day = Number(match[3]);
|
||||||
|
const parsed = new Date(year, month - 1, day);
|
||||||
|
|
||||||
|
if (
|
||||||
|
parsed.getFullYear() === year
|
||||||
|
&& parsed.getMonth() === month - 1
|
||||||
|
&& parsed.getDate() === day
|
||||||
|
) {
|
||||||
|
return parsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Date(Number.NaN);
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsed = new Date(stringValue);
|
||||||
|
return isValidDate(parsed)
|
||||||
|
? new Date(parsed.getFullYear(), parsed.getMonth(), parsed.getDate())
|
||||||
|
: parsed;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const todayLocalDateOnly = () => formatLocalDateOnly(new Date());
|
||||||
|
|
||||||
|
export const yesterdayLocalDateOnly = () => {
|
||||||
|
const yesterday = new Date();
|
||||||
|
yesterday.setDate(yesterday.getDate() - 1);
|
||||||
|
return formatLocalDateOnly(yesterday);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const startOfLocalDate = (value) => {
|
||||||
|
const date = parseLocalDateOnly(value);
|
||||||
|
if (!isValidDate(date)) {
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
date.setHours(0, 0, 0, 0);
|
||||||
|
return date;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const endOfLocalDate = (value) => {
|
||||||
|
const date = parseLocalDateOnly(value);
|
||||||
|
if (!isValidDate(date)) {
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
date.setHours(23, 59, 59, 999);
|
||||||
|
return date;
|
||||||
|
};
|
||||||
+4
-3
@@ -19,6 +19,7 @@ import DepartmentDashboardDailyReportNavigation from "@/views/dashboards/departm
|
|||||||
import DepartmentDashboardDailyReportProductSales from "@/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportProductSales.vue";
|
import DepartmentDashboardDailyReportProductSales from "@/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportProductSales.vue";
|
||||||
import DepartmentDashboardDailyReportTodayForm from "@/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportTodayForm.vue";
|
import DepartmentDashboardDailyReportTodayForm from "@/views/dashboards/departmentDashboard/modules/daily-report/displays/DepartmentDashboardDailyReportTodayForm.vue";
|
||||||
import DepartmentWeather from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentWeather.vue";
|
import DepartmentWeather from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentWeather.vue";
|
||||||
|
import { parseLocalDateOnly, todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
import {
|
import {
|
||||||
complaints_metric_state,
|
complaints_metric_state,
|
||||||
count_bookings,
|
count_bookings,
|
||||||
@@ -131,7 +132,7 @@ onMounted(() => {
|
|||||||
return [...accessibleDepartmentIds.value];
|
return [...accessibleDepartmentIds.value];
|
||||||
})();
|
})();
|
||||||
|
|
||||||
const initialDateFrom = typeof query.dateFrom === "string" ? query.dateFrom : new Date().toISOString().split("T")[0];
|
const initialDateFrom = typeof query.dateFrom === "string" ? query.dateFrom : todayLocalDateOnly();
|
||||||
const initialDateTo = typeof query.dateTo === "string" ? query.dateTo : initialDateFrom;
|
const initialDateTo = typeof query.dateTo === "string" ? query.dateTo : initialDateFrom;
|
||||||
|
|
||||||
initializeDailyReportFilters({
|
initializeDailyReportFilters({
|
||||||
@@ -170,7 +171,7 @@ watch(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const formatDateShort = (dateString) => {
|
const formatDateShort = (dateString) => {
|
||||||
const date = new Date(dateString);
|
const date = parseLocalDateOnly(dateString);
|
||||||
const dayName = date.toLocaleDateString("da-DK", { weekday: "long" });
|
const dayName = date.toLocaleDateString("da-DK", { weekday: "long" });
|
||||||
const dateValue = date.toLocaleDateString("da-DK", { day: "2-digit", month: "2-digit", year: "2-digit" });
|
const dateValue = date.toLocaleDateString("da-DK", { day: "2-digit", month: "2-digit", year: "2-digit" });
|
||||||
return `${dayName} d. ${dateValue}`;
|
return `${dayName} d. ${dateValue}`;
|
||||||
@@ -178,7 +179,7 @@ const formatDateShort = (dateString) => {
|
|||||||
|
|
||||||
const formatDateRangeSubtitle = (startDateString, endDateString) => {
|
const formatDateRangeSubtitle = (startDateString, endDateString) => {
|
||||||
const dateOptions = { day: "2-digit", month: "2-digit", year: "2-digit" };
|
const dateOptions = { day: "2-digit", month: "2-digit", year: "2-digit" };
|
||||||
return `${new Date(startDateString).toLocaleDateString("da-DK", dateOptions)} - ${new Date(endDateString).toLocaleDateString("da-DK", dateOptions)}`;
|
return `${parseLocalDateOnly(startDateString).toLocaleDateString("da-DK", dateOptions)} - ${parseLocalDateOnly(endDateString).toLocaleDateString("da-DK", dateOptions)}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
const formatSubtitle = (subtitle) => {
|
const formatSubtitle = (subtitle) => {
|
||||||
|
|||||||
+3
-5
@@ -2,18 +2,16 @@
|
|||||||
import { computed, ref, watch } from "vue";
|
import { computed, ref, watch } from "vue";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import { createEmptyOutsideHours, normalizeOutsideHours } from "@/views/dashboards/departmentDashboard/modules/daily-report/outsideHours.js";
|
import { createEmptyOutsideHours, normalizeOutsideHours } from "@/views/dashboards/departmentDashboard/modules/daily-report/outsideHours.js";
|
||||||
|
import { todayLocalDateOnly, yesterdayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const GENERATE_UNIQUE_ID = () => Math.random().toString(36).slice(2, 11);
|
const GENERATE_UNIQUE_ID = () => Math.random().toString(36).slice(2, 11);
|
||||||
|
|
||||||
const DATE_TODAY = () => {
|
const DATE_TODAY = () => {
|
||||||
const date = new Date();
|
return todayLocalDateOnly();
|
||||||
return date.toISOString().split("T")[0];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const DATE_YESTERDAY = () => {
|
const DATE_YESTERDAY = () => {
|
||||||
const date = new Date();
|
return yesterdayLocalDateOnly();
|
||||||
date.setDate(date.getDate() - 1);
|
|
||||||
return date.toISOString().split("T")[0];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const date_shortcuts = ref({
|
const date_shortcuts = ref({
|
||||||
|
|||||||
+3
-9
@@ -17,6 +17,7 @@ import {
|
|||||||
isLoading as departmentsStoreLoading,
|
isLoading as departmentsStoreLoading,
|
||||||
} from "@/components/pagination/departmentTabs.vue";
|
} from "@/components/pagination/departmentTabs.vue";
|
||||||
import { isAccessibleVisibleDepartment, sortByDepartmentPriorityOrder } from "@/services/departmentVisibility.js";
|
import { isAccessibleVisibleDepartment, sortByDepartmentPriorityOrder } from "@/services/departmentVisibility.js";
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Props:
|
* Props:
|
||||||
@@ -141,14 +142,7 @@ const toggleAllDepartments = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const formatDateSelectionValue = (date) => {
|
const formatDateSelectionValue = (date) => {
|
||||||
if (!(date instanceof Date) || Number.isNaN(date.getTime())) {
|
return formatLocalDateOnly(date);
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
const year = date.getFullYear();
|
|
||||||
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
||||||
const day = String(date.getDate()).padStart(2, "0");
|
|
||||||
return `${year}-${month}-${day}`;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const onDateSelectionChange = (startDate, endDate) => {
|
const onDateSelectionChange = (startDate, endDate) => {
|
||||||
@@ -161,7 +155,7 @@ const onDateSelectionChange = (startDate, endDate) => {
|
|||||||
<div class="column is-12" data-testid="daily-report-date-controls">
|
<div class="column is-12" data-testid="daily-report-date-controls">
|
||||||
<DatePeriodSelector
|
<DatePeriodSelector
|
||||||
:on-selection-change="onDateSelectionChange"
|
:on-selection-change="onDateSelectionChange"
|
||||||
:selection="{ startDate: new Date(selected_date), endDate: new Date(selected_date_to) }"
|
:selection="{ startDate: parseLocalDateOnly(selected_date), endDate: parseLocalDateOnly(selected_date_to) }"
|
||||||
:visibility="{
|
:visibility="{
|
||||||
showDailySelector: true,
|
showDailySelector: true,
|
||||||
showWeeklySelector: true,
|
showWeeklySelector: true,
|
||||||
|
|||||||
+4
-3
@@ -5,6 +5,7 @@ import { parseError, getError, clearErrors} from "@/components/request/HandleGlo
|
|||||||
import ShowErrorField from "@/components/global/ShowErrorField.vue";
|
import ShowErrorField from "@/components/global/ShowErrorField.vue";
|
||||||
import { selected_date, onChangeCall, selected_department_id} from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReportObject.vue";
|
import { selected_date, onChangeCall, selected_department_id} from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReportObject.vue";
|
||||||
import Swal from "sweetalert2";
|
import Swal from "sweetalert2";
|
||||||
|
import { parseLocalDateOnly, yesterdayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
department_id: Number,
|
department_id: Number,
|
||||||
@@ -23,7 +24,7 @@ const created_at = ref(null);
|
|||||||
const id = ref(null);
|
const id = ref(null);
|
||||||
const message = ref('');
|
const message = ref('');
|
||||||
const yesterday = ref({
|
const yesterday = ref({
|
||||||
date: new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().split('T')[0],
|
date: yesterdayLocalDateOnly(),
|
||||||
water_usage: 0,
|
water_usage: 0,
|
||||||
water_usage_morning: 0,
|
water_usage_morning: 0,
|
||||||
notes: null,
|
notes: null,
|
||||||
@@ -104,7 +105,7 @@ const getDailyReport = async () => {
|
|||||||
// Check if the date is today
|
// Check if the date is today
|
||||||
const created_at_val = new Date(response.data.data.created_at);
|
const created_at_val = new Date(response.data.data.created_at);
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
if (created_at_val.toDateString() === (selected_date.value ? new Date(selected_date.value) : today).toDateString()) {
|
if (created_at_val.toDateString() === (selected_date.value ? parseLocalDateOnly(selected_date.value) : today).toDateString()) {
|
||||||
// The daily report is today
|
// The daily report is today
|
||||||
// So we can set the values
|
// So we can set the values
|
||||||
water_usage.value = parseInt(response.data.data.water_usage);
|
water_usage.value = parseInt(response.data.data.water_usage);
|
||||||
@@ -212,4 +213,4 @@ onChangeCall(() => {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+4
-3
@@ -1,10 +1,11 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, watch } from 'vue';
|
import { ref, watch } from 'vue';
|
||||||
import { timeBookingsNewScheduler } from '@/views/dashboards/departmentDashboard/modules/time-bookings/book/TimeBookingsNewScheduler.vue';
|
import { timeBookingsNewScheduler } from '@/views/dashboards/departmentDashboard/modules/time-bookings/book/TimeBookingsNewScheduler.vue';
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
const date = ref();
|
const date = ref();
|
||||||
// Set the initial date to the current date YYYY-MM-DD format
|
// Set the initial date to the current date YYYY-MM-DD format
|
||||||
const formatDate = (date_input) => {
|
const formatDate = (date_input) => {
|
||||||
return date_input.toISOString().split('T')[0];
|
return formatLocalDateOnly(date_input);
|
||||||
};
|
};
|
||||||
date.value = formatDate(new Date());
|
date.value = formatDate(new Date());
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ watch(timeBookingsNewScheduler.date.selected, (newDate) => {
|
|||||||
|
|
||||||
watch(date, (newDate) => {
|
watch(date, (newDate) => {
|
||||||
// Update the selected date in the scheduler when the date input changes
|
// Update the selected date in the scheduler when the date input changes
|
||||||
timeBookingsNewScheduler.date.selected.value = new Date(newDate);
|
timeBookingsNewScheduler.date.selected.value = parseLocalDateOnly(newDate);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -63,4 +64,4 @@ watch(date, (newDate) => {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, watch } from 'vue';
|
import { ref, watch } from 'vue';
|
||||||
import { SessionUser } from '@/components/session/token/SessionUser.vue';
|
import { SessionUser } from '@/components/session/token/SessionUser.vue';
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
department_id: {
|
department_id: {
|
||||||
@@ -68,8 +69,7 @@ const getBookings = async () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const getDate = () => {
|
const getDate = () => {
|
||||||
const date = new Date();
|
return todayLocalDateOnly();
|
||||||
return date.toISOString().split('T')[0];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Get the department
|
// Get the department
|
||||||
|
|||||||
+4
-3
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import { selected_date, selected_date_to, selectDate as selectDailyReportDate } from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReportObject.vue";
|
import { selected_date, selected_date_to, selectDate as selectDailyReportDate } from "@/views/dashboards/departmentDashboard/modules/daily-report/DepartmentDailyReportObject.vue";
|
||||||
import DatePeriodSelector from "@/components/displays/buttons/DatePeriodSelector.vue";
|
import DatePeriodSelector from "@/components/displays/buttons/DatePeriodSelector.vue";
|
||||||
|
import { formatLocalDateOnly, parseLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
// Emits for parents that want to react to date changes (non-breaking if unused)
|
// Emits for parents that want to react to date changes (non-breaking if unused)
|
||||||
const emit = defineEmits(['date-change']);
|
const emit = defineEmits(['date-change']);
|
||||||
@@ -16,12 +17,12 @@ const selectDate = (startIso, endIso) => {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<DatePeriodSelector
|
<DatePeriodSelector
|
||||||
:on-selection-change="(startDate, endDate) => selectDate(startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0])"
|
:on-selection-change="(startDate, endDate) => selectDate(formatLocalDateOnly(startDate), formatLocalDateOnly(endDate))"
|
||||||
:selection="{ startDate: new Date(selected_date), endDate: new Date(selected_date_to) }"
|
:selection="{ startDate: parseLocalDateOnly(selected_date), endDate: parseLocalDateOnly(selected_date_to) }"
|
||||||
:visibility="{ showDailySelector: true, showWeeklySelector: true, showMultipleMonthWarning: false, showUpdateButton: false }"
|
:visibility="{ showDailySelector: true, showWeeklySelector: true, showMultipleMonthWarning: false, showUpdateButton: false }"
|
||||||
:reverse-level-order="true"
|
:reverse-level-order="true"
|
||||||
@update:selection="(newSelection) => {
|
@update:selection="(newSelection) => {
|
||||||
selectDate(newSelection.startDate.toISOString().split('T')[0], newSelection.endDate.toISOString().split('T')[0]);
|
selectDate(formatLocalDateOnly(newSelection.startDate), formatLocalDateOnly(newSelection.endDate));
|
||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
+4
-3
@@ -1,5 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import {defineComponent, ref, watch} from 'vue';
|
import {defineComponent, ref, watch} from 'vue';
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
|
|
||||||
type fetch = {
|
type fetch = {
|
||||||
@@ -11,8 +12,8 @@ type fetch = {
|
|||||||
};
|
};
|
||||||
/** Define the variables */
|
/** Define the variables */
|
||||||
export const show_this_week = ref(false);
|
export const show_this_week = ref(false);
|
||||||
export const selected_date = ref(new Date().toISOString().split('T')[0]);
|
export const selected_date = ref(todayLocalDateOnly());
|
||||||
export const selected_date_to = ref(new Date().toISOString().split('T')[0]);
|
export const selected_date_to = ref(todayLocalDateOnly());
|
||||||
export const last_fetch_id = ref(0);
|
export const last_fetch_id = ref(0);
|
||||||
export const fetches = ref<fetch[]>([]);
|
export const fetches = ref<fetch[]>([]);
|
||||||
/** Define the functions */
|
/** Define the functions */
|
||||||
@@ -53,4 +54,4 @@ watch([selected_date, selected_date_to], () => {
|
|||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'DepartmentsOverviewObject'
|
name: 'DepartmentsOverviewObject'
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,21 +1,53 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { getOrders } from "@/components/shop/Orders.vue";
|
import { ref } from "vue";
|
||||||
import { showCreateOrderForm } from "@/components/forms/superUser/createOrderForm.vue";
|
|
||||||
import SuperUserDashboardNavigation from "@/views/dashboards/superUserDashboard/SuperUserDashboardNavigation.vue";
|
import SuperUserDashboardNavigation from "@/views/dashboards/superUserDashboard/SuperUserDashboardNavigation.vue";
|
||||||
import PageTitle from "@/components/global/PageTitle.vue";
|
|
||||||
import Orders from "@/components/displays/Orders.vue";
|
|
||||||
import RestrictedPageWrapper from "@/components/page/wrappers/RestrictedPageWrapper.vue";
|
import RestrictedPageWrapper from "@/components/page/wrappers/RestrictedPageWrapper.vue";
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import VehiclesPagination from "@/components/displays/pagination/models/UserDashboard/VehiclesPagination.vue";
|
import VehiclesPagination from "@/components/displays/pagination/models/UserDashboard/VehiclesPagination.vue";
|
||||||
|
import SuperuserAddVehicleModal from "@/components/forms/superUser/SuperuserAddVehicleModal.vue";
|
||||||
|
import { loadList } from "@/components/pagination/paginatedList.vue";
|
||||||
|
|
||||||
|
const isAddVehicleModalOpen = ref(false);
|
||||||
|
|
||||||
|
const openAddVehicleModal = () => {
|
||||||
|
isAddVehicleModalOpen.value = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeAddVehicleModal = () => {
|
||||||
|
isAddVehicleModalOpen.value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleVehicleCreated = async () => {
|
||||||
|
closeAddVehicleModal();
|
||||||
|
await loadList();
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<RestrictedPageWrapper :hasPermission="SessionUser.canAccessSuperUser()">
|
<RestrictedPageWrapper :hasPermission="SessionUser.canAccessSuperUser()">
|
||||||
<SuperUserDashboardNavigation />
|
<SuperUserDashboardNavigation />
|
||||||
<VehiclesPagination />
|
<VehiclesPagination>
|
||||||
|
<template #actions>
|
||||||
|
<button
|
||||||
|
class="button is-link button-same-width superuser-vehicles__add-button"
|
||||||
|
type="button"
|
||||||
|
data-testid="superuser-vehicles-add"
|
||||||
|
@click="openAddVehicleModal"
|
||||||
|
>
|
||||||
|
{{ $t("vehicles.add") }}
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
</VehiclesPagination>
|
||||||
|
<SuperuserAddVehicleModal
|
||||||
|
v-if="isAddVehicleModalOpen"
|
||||||
|
@close="closeAddVehicleModal"
|
||||||
|
@created="handleVehicleCreated"
|
||||||
|
/>
|
||||||
</RestrictedPageWrapper>
|
</RestrictedPageWrapper>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
.superuser-vehicles__add-button {
|
||||||
</style>
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -1,286 +1,572 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
|
import { computed, onMounted, ref, watch } from "vue";
|
||||||
|
import { useI18n } from "vue-i18n";
|
||||||
|
import { useRoute } from "vue-router";
|
||||||
import PageTitle from "@/components/global/PageTitle.vue";
|
import PageTitle from "@/components/global/PageTitle.vue";
|
||||||
import RestrictedPageWrapper from "@/components/page/wrappers/RestrictedPageWrapper.vue";
|
import RestrictedPageWrapper from "@/components/page/wrappers/RestrictedPageWrapper.vue";
|
||||||
import {SessionUser} from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
import {useRouter} from 'vue-router'
|
import { ObjectsGlobal } from "@/components/session/token/SessionUser/Objects/ObjectsGlobal.vue";
|
||||||
import {ref, watch} from "vue";
|
|
||||||
import {loadList, setEndpoint, setOrder} from "@/components/pagination/paginatedList.vue";
|
|
||||||
import RolesSubPageWrapper from "@/views/dashboards/superUserDashboard/roles/RolesSubPageWrapper.vue";
|
import RolesSubPageWrapper from "@/views/dashboards/superUserDashboard/roles/RolesSubPageWrapper.vue";
|
||||||
|
import {
|
||||||
|
filterPermissionRecords,
|
||||||
|
getPermissionDelta,
|
||||||
|
groupPermissionRecords,
|
||||||
|
normalizePermissionCatalog,
|
||||||
|
pageAccessPermissionKeys,
|
||||||
|
permissionGroupDefinitions,
|
||||||
|
sanitizePermissionDomId,
|
||||||
|
} from "@/views/dashboards/superUserDashboard/roles/rolePermissionCatalog.js";
|
||||||
|
|
||||||
// Lists
|
const { t } = useI18n();
|
||||||
const permissions = ref([]);
|
const route = useRoute();
|
||||||
const permissionsList = ref([]);
|
|
||||||
const rolePermissions = ref([]);
|
const role = ref(null);
|
||||||
const departments = ref([]);
|
const departments = ref([]);
|
||||||
|
const permissionRecords = ref([]);
|
||||||
|
const selectedPermissions = ref(new Set());
|
||||||
|
const busyPermissions = ref(new Set());
|
||||||
|
const busyGroups = ref(new Set());
|
||||||
|
const isLoading = ref(true);
|
||||||
|
const loadError = ref("");
|
||||||
|
const mutationError = ref("");
|
||||||
|
const search = ref("");
|
||||||
|
const activeGroup = ref("access");
|
||||||
|
|
||||||
// Loaded state
|
const roleId = computed(() => Number.parseInt(String(route.params.roleId || ""), 10));
|
||||||
const isLoaded = ref(false);
|
const roleTitle = computed(() =>
|
||||||
// Individually loaded states
|
role.value?.name
|
||||||
const isDepartmentsLoaded = ref(false);
|
? t("roles.permissions.title_with_name", { name: role.value.name })
|
||||||
const isPermissionsLoaded = ref(false);
|
: t("roles.permissions.title", { id: Number.isFinite(roleId.value) ? roleId.value : "" })
|
||||||
const isRolePermissionsLoaded = ref(false);
|
);
|
||||||
const isPermissionsListLoaded = ref(false);
|
|
||||||
|
|
||||||
watch(() => departments.value, () => {
|
const buildPermissionOverrides = (departmentList) => {
|
||||||
console.log('Departments loaded');
|
const overrides = {};
|
||||||
isDepartmentsLoaded.value = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
watch(() => permissionsList.value, () => {
|
for (const permission of pageAccessPermissionKeys) {
|
||||||
console.log('Permissions list loaded');
|
overrides[permission] = {
|
||||||
isPermissionsListLoaded.value = true;
|
label: t(`roles.permissions.page_access.${permission}.label`),
|
||||||
});
|
description: t(`roles.permissions.page_access.${permission}.description`),
|
||||||
|
groupKey: "access",
|
||||||
|
isVirtual: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
watch(() => permissions.value, () => {
|
for (const department of departmentList) {
|
||||||
console.log('Permissions loaded');
|
const departmentId = Number.parseInt(String(department?.id ?? ""), 10);
|
||||||
isPermissionsLoaded.value = true;
|
if (!Number.isFinite(departmentId)) {
|
||||||
});
|
continue;
|
||||||
|
|
||||||
watch(() => rolePermissions.value, () => {
|
|
||||||
console.log('Role permissions loaded');
|
|
||||||
isRolePermissionsLoaded.value = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Get the department from the route
|
|
||||||
const router = useRouter()
|
|
||||||
const roleId = ref(parseInt(router.currentRoute.value.params.roleId));
|
|
||||||
|
|
||||||
// Set the endpoint
|
|
||||||
setEndpoint(SessionUser.objects.department_categories.meta.endpoint + `?id=${roleId.value}`);
|
|
||||||
// Set the order
|
|
||||||
setOrder("category_id", "asc");
|
|
||||||
// Load the list
|
|
||||||
loadList();
|
|
||||||
|
|
||||||
const loadPermissionsList = async () => {
|
|
||||||
const response = await SessionUser.objects.permissions.get.all().then((response) => {
|
|
||||||
const tmpPermissionsList = [];
|
|
||||||
const tmpPermissions = [];
|
|
||||||
for (const i in response) {
|
|
||||||
const endpoint = i;
|
|
||||||
const methods = response[i];
|
|
||||||
for (const method in methods) {
|
|
||||||
const permissions = methods[method];
|
|
||||||
for (const permission in permissions) {
|
|
||||||
tmpPermissionsList.push(permission);
|
|
||||||
tmpPermissions[endpoint] = tmpPermissions[endpoint] || {}; // Create the endpoint if it doesn't exist
|
|
||||||
tmpPermissions[endpoint][method] = tmpPermissions[endpoint][method] || {}; // Create the method if it doesn't exist
|
|
||||||
tmpPermissions[endpoint][method][permission] = permissions[permission];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
permissionsList.value = tmpPermissionsList;
|
|
||||||
permissions.value = tmpPermissions;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// Get all available permissions
|
|
||||||
loadPermissionsList();
|
|
||||||
const loadRolePermissions = async () => {
|
|
||||||
await SessionUser.objects.roles.get.single(roleId.value).then((response) => {
|
|
||||||
rolePermissions.value = response.permissions;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// Get the permissions for the role
|
|
||||||
loadRolePermissions();
|
|
||||||
|
|
||||||
const convertRouteToHumanReadable = (route) => {
|
const name = String(department?.name || departmentId);
|
||||||
let arrow = " -> ";
|
overrides[`department_access_${departmentId}`] = {
|
||||||
// Replace / with space
|
label: name,
|
||||||
let humanReadable = route.replace(/\//g, arrow);
|
description: t("roles.permissions.department_access_description", { name }),
|
||||||
// Replace _ with space
|
groupKey: "access",
|
||||||
humanReadable = humanReadable.replace(/_/g, " ");
|
isVirtual: true,
|
||||||
// Capitalize the first letter
|
departmentId,
|
||||||
humanReadable = humanReadable.charAt(0).toUpperCase() + humanReadable.slice(1);
|
};
|
||||||
// If the route ends with an arrow, remove it
|
|
||||||
if (humanReadable.endsWith(arrow)) {
|
|
||||||
humanReadable = humanReadable.slice(0, -arrow.length);
|
|
||||||
}
|
}
|
||||||
// If the route starts with an arrow, remove it
|
|
||||||
if (humanReadable.startsWith(arrow)) {
|
|
||||||
humanReadable = humanReadable.slice(arrow.length);
|
|
||||||
}
|
|
||||||
return humanReadable;
|
|
||||||
}
|
|
||||||
|
|
||||||
const endpointMethodColors = {
|
return overrides;
|
||||||
GET: "is-success",
|
};
|
||||||
POST: "is-info",
|
|
||||||
PUT: "is-warning",
|
|
||||||
PATCH: "is-warning",
|
|
||||||
DELETE: "is-danger",
|
|
||||||
OPTIONS: "is-light",
|
|
||||||
}
|
|
||||||
|
|
||||||
const hasPermission = (permission) => {
|
const replaceSetValue = (targetRef, value, shouldAdd) => {
|
||||||
return rolePermissions.value.includes(permission);
|
const next = new Set(targetRef.value);
|
||||||
}
|
if (shouldAdd) {
|
||||||
|
next.add(value);
|
||||||
const togglePermission = (permission) => {
|
|
||||||
if (hasPermission(permission)) {
|
|
||||||
SessionUser.objects.roles.functions.permissions.remove(roleId.value, permission).then((response) => {
|
|
||||||
// Remove the permission
|
|
||||||
rolePermissions.value = rolePermissions.value.filter((value) => value !== permission);
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
SessionUser.objects.roles.functions.permissions.add(roleId.value, permission).then((response) => {
|
next.delete(value);
|
||||||
// Add the permission
|
|
||||||
rolePermissions.value.push(permission);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
targetRef.value = next;
|
||||||
|
};
|
||||||
|
|
||||||
|
const setPermissionBusy = (permission, isBusy) => {
|
||||||
|
replaceSetValue(busyPermissions, permission, isBusy);
|
||||||
|
};
|
||||||
|
|
||||||
const loadDepartments = async () => {
|
const setGroupBusy = (groupKey, isBusy) => {
|
||||||
const response = await SessionUser.objects.departments.get.all().then((response) => {
|
replaceSetValue(busyGroups, groupKey, isBusy);
|
||||||
departments.value = response;
|
};
|
||||||
|
|
||||||
|
const hasPermission = (permission) => selectedPermissions.value.has(permission);
|
||||||
|
const isPermissionBusy = (permission) => busyPermissions.value.has(permission);
|
||||||
|
const isGroupBusy = (groupKey) => busyGroups.value.has(groupKey);
|
||||||
|
const permissionDomId = (permission) => `role-permission-${sanitizePermissionDomId(permission)}`;
|
||||||
|
const permissionTestId = (permission) => `role-permission-row-${sanitizePermissionDomId(permission)}`;
|
||||||
|
|
||||||
|
const allRecordsByGroup = computed(() => groupPermissionRecords(permissionRecords.value));
|
||||||
|
const filteredPermissionRecords = computed(() => filterPermissionRecords(permissionRecords.value, search.value));
|
||||||
|
const filteredRecordsByGroup = computed(() => groupPermissionRecords(filteredPermissionRecords.value));
|
||||||
|
|
||||||
|
const groupTabs = computed(() =>
|
||||||
|
permissionGroupDefinitions
|
||||||
|
.map((group) => {
|
||||||
|
const allRecords = allRecordsByGroup.value.get(group.key) || [];
|
||||||
|
const filteredRecords = filteredRecordsByGroup.value.get(group.key) || [];
|
||||||
|
|
||||||
|
return {
|
||||||
|
...group,
|
||||||
|
label: t(`roles.permissions.groups.${group.key}.label`),
|
||||||
|
description: t(`roles.permissions.groups.${group.key}.description`),
|
||||||
|
totalCount: allRecords.length,
|
||||||
|
filteredCount: filteredRecords.length,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.filter((group) => group.totalCount > 0)
|
||||||
|
);
|
||||||
|
|
||||||
|
const totalCount = computed(() => permissionRecords.value.length);
|
||||||
|
const filteredCount = computed(() => filteredPermissionRecords.value.length);
|
||||||
|
const selectedCount = computed(() => selectedPermissions.value.size);
|
||||||
|
|
||||||
|
const getAllGroupRecords = (groupKey) => allRecordsByGroup.value.get(groupKey) || [];
|
||||||
|
const getFilteredGroupRecords = (groupKey) => filteredRecordsByGroup.value.get(groupKey) || [];
|
||||||
|
|
||||||
|
const isGroupFullySelected = (groupKey) => {
|
||||||
|
const records = getAllGroupRecords(groupKey);
|
||||||
|
return records.length > 0 && records.every((record) => selectedPermissions.value.has(record.permission));
|
||||||
|
};
|
||||||
|
|
||||||
|
const isGroupFullyCleared = (groupKey) => {
|
||||||
|
const records = getAllGroupRecords(groupKey);
|
||||||
|
return records.length > 0 && records.every((record) => !selectedPermissions.value.has(record.permission));
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(
|
||||||
|
groupTabs,
|
||||||
|
(tabs) => {
|
||||||
|
if (tabs.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!tabs.some((tab) => tab.key === activeGroup.value)) {
|
||||||
|
activeGroup.value = tabs[0].key;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
const loadRolePermissions = async () => {
|
||||||
|
ObjectsGlobal.clearCache();
|
||||||
|
const selectedRole = await SessionUser.objects.roles.get.single(roleId.value);
|
||||||
|
role.value = selectedRole || null;
|
||||||
|
selectedPermissions.value = new Set(Array.isArray(selectedRole?.permissions) ? selectedRole.permissions : []);
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadPageData = async () => {
|
||||||
|
isLoading.value = true;
|
||||||
|
loadError.value = "";
|
||||||
|
mutationError.value = "";
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (!Number.isFinite(roleId.value)) {
|
||||||
|
throw new Error("Invalid role id");
|
||||||
|
}
|
||||||
|
|
||||||
|
ObjectsGlobal.clearCache();
|
||||||
|
const [permissionCatalog, selectedRole, departmentList] = await Promise.all([
|
||||||
|
SessionUser.objects.permissions.get.all(),
|
||||||
|
SessionUser.objects.roles.get.single(roleId.value),
|
||||||
|
SessionUser.objects.departments.get.all(),
|
||||||
|
]);
|
||||||
|
const safeDepartments = Array.isArray(departmentList) ? departmentList : [];
|
||||||
|
|
||||||
|
role.value = selectedRole || null;
|
||||||
|
departments.value = safeDepartments;
|
||||||
|
selectedPermissions.value = new Set(Array.isArray(selectedRole?.permissions) ? selectedRole.permissions : []);
|
||||||
|
permissionRecords.value = normalizePermissionCatalog(permissionCatalog || {}, {
|
||||||
|
departments: safeDepartments,
|
||||||
|
permissionOverrides: buildPermissionOverrides(safeDepartments),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to load role permissions page", error);
|
||||||
|
loadError.value = t("roles.permissions.errors.load");
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const mutatePermissions = async ({ add = [], remove = [], groupKey = null }) => {
|
||||||
|
const additions = add.filter((permission) => !selectedPermissions.value.has(permission) && !isPermissionBusy(permission));
|
||||||
|
const removals = remove.filter((permission) => selectedPermissions.value.has(permission) && !isPermissionBusy(permission));
|
||||||
|
const affectedPermissions = [...additions, ...removals];
|
||||||
|
|
||||||
|
if (affectedPermissions.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mutationError.value = "";
|
||||||
|
|
||||||
|
if (groupKey) {
|
||||||
|
setGroupBusy(groupKey, true);
|
||||||
|
}
|
||||||
|
for (const permission of affectedPermissions) {
|
||||||
|
setPermissionBusy(permission, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const optimisticPermissions = new Set(selectedPermissions.value);
|
||||||
|
for (const permission of additions) {
|
||||||
|
optimisticPermissions.add(permission);
|
||||||
|
}
|
||||||
|
for (const permission of removals) {
|
||||||
|
optimisticPermissions.delete(permission);
|
||||||
|
}
|
||||||
|
selectedPermissions.value = optimisticPermissions;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const operations = [
|
||||||
|
...additions.map((permission) =>
|
||||||
|
SessionUser.objects.roles.functions.permissions.add(roleId.value, permission).then(() => ({
|
||||||
|
permission,
|
||||||
|
action: "add",
|
||||||
|
}))
|
||||||
|
),
|
||||||
|
...removals.map((permission) =>
|
||||||
|
SessionUser.objects.roles.functions.permissions.remove(roleId.value, permission).then(() => ({
|
||||||
|
permission,
|
||||||
|
action: "remove",
|
||||||
|
}))
|
||||||
|
),
|
||||||
|
];
|
||||||
|
const results = await Promise.allSettled(operations);
|
||||||
|
const failedResult = results.find((result) => result.status === "rejected");
|
||||||
|
|
||||||
|
if (failedResult) {
|
||||||
|
throw failedResult.reason;
|
||||||
|
}
|
||||||
|
|
||||||
|
ObjectsGlobal.clearCache();
|
||||||
|
const nextPermissions = new Set(selectedPermissions.value);
|
||||||
|
for (const permission of additions) {
|
||||||
|
nextPermissions.add(permission);
|
||||||
|
}
|
||||||
|
for (const permission of removals) {
|
||||||
|
nextPermissions.delete(permission);
|
||||||
|
}
|
||||||
|
selectedPermissions.value = nextPermissions;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to update role permissions", error);
|
||||||
|
mutationError.value = t("roles.permissions.errors.update");
|
||||||
|
await loadRolePermissions().catch((reloadError) => {
|
||||||
|
console.error("Failed to reload role permissions after mutation error", reloadError);
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
for (const permission of affectedPermissions) {
|
||||||
|
setPermissionBusy(permission, false);
|
||||||
|
}
|
||||||
|
if (groupKey) {
|
||||||
|
setGroupBusy(groupKey, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const togglePermission = async (record) => {
|
||||||
|
if (!record?.permission || isPermissionBusy(record.permission)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const shouldAdd = !selectedPermissions.value.has(record.permission);
|
||||||
|
await mutatePermissions({
|
||||||
|
add: shouldAdd ? [record.permission] : [],
|
||||||
|
remove: shouldAdd ? [] : [record.permission],
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
loadDepartments();
|
const applyGroupSelection = async (groupKey, shouldSelect) => {
|
||||||
|
if (isGroupBusy(groupKey)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
watch(() => isDepartmentsLoaded.value && isPermissionsListLoaded.value && isPermissionsLoaded.value && isRolePermissionsLoaded.value, () => {
|
const delta = getPermissionDelta(getAllGroupRecords(groupKey), selectedPermissions.value, shouldSelect);
|
||||||
console.log('Loaded:', 'Departments:', departments.value.length, 'Permissions:', permissionsList.value.length, 'Role permissions:', rolePermissions.value.length);
|
await mutatePermissions({
|
||||||
isLoaded.value = true;
|
...delta,
|
||||||
});
|
groupKey,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(loadPageData);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<RestrictedPageWrapper :hasPermission="SessionUser.canAccessSuperUser()">
|
<RestrictedPageWrapper :hasPermission="SessionUser.canAccessSuperUser()">
|
||||||
<RolesSubPageWrapper>
|
<RolesSubPageWrapper>
|
||||||
<template #title>
|
<template #title>
|
||||||
<PageTitle :title="`Role ${roleId}`" subtitle="Role permissions">
|
<PageTitle :title="roleTitle" :subtitle="t('roles.permissions.subtitle')">
|
||||||
<template #buttons>
|
<template #buttons>
|
||||||
|
<button class="button is-dark" type="button" :disabled="isLoading" @click="loadPageData">
|
||||||
|
<span class="icon">
|
||||||
|
<i class="fas fa-sync-alt"></i>
|
||||||
|
</span>
|
||||||
|
<span>{{ t("roles.permissions.actions.reload") }}</span>
|
||||||
|
</button>
|
||||||
</template>
|
</template>
|
||||||
</PageTitle>
|
</PageTitle>
|
||||||
</template>
|
</template>
|
||||||
<!-- Department access permissions -->
|
|
||||||
<div class="box" v-if="isLoaded">
|
<section class="role-permissions-page" data-testid="role-permissions-page">
|
||||||
<p class="is-pulled-right">
|
<div v-if="loadError" class="notification is-danger is-light" data-testid="role-permissions-load-error">
|
||||||
<span class="tag is-dark is-large">
|
<p>{{ loadError }}</p>
|
||||||
Department access
|
<button class="button is-danger is-light mt-3" type="button" @click="loadPageData">
|
||||||
</span>
|
{{ t("roles.permissions.actions.retry") }}
|
||||||
</p>
|
</button>
|
||||||
<p class="mt-2"> Department dependent permissions applies to:</p>
|
|
||||||
<div class="columns is-multiline">
|
|
||||||
<div v-for="department in departments" :key="department.id" class="column is-3">
|
|
||||||
<span class="tag is-dark">
|
|
||||||
{{ department.name }}
|
|
||||||
</span>
|
|
||||||
<!-- Enable switch -->
|
|
||||||
<div class="field">
|
|
||||||
<input
|
|
||||||
:id="'enable_department_' + department.id + '_access'"
|
|
||||||
type="checkbox"
|
|
||||||
class="switch is-rounded"
|
|
||||||
@change="togglePermission('department_access_' + department.id)"
|
|
||||||
:checked="hasPermission('department_access_' + department.id)"
|
|
||||||
/>
|
|
||||||
<label :for="'enable_department_' + department.id + '_access'"></label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<!-- Page type permissions -->
|
<div v-else-if="isLoading" class="role-permissions-loading" data-testid="role-permissions-loading">
|
||||||
<div class="box">
|
<progress class="progress is-small is-dark" max="100"></progress>
|
||||||
<p class="is-pulled-right">
|
|
||||||
<span class="tag is-dark is-large">
|
|
||||||
Page type access
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<p class="mt-2"> Page type dependent permissions applies to:</p>
|
|
||||||
<div class="columns is-multiline">
|
|
||||||
<!-- User -->
|
|
||||||
<div class="column is-3">
|
|
||||||
<span class="tag is-dark">
|
|
||||||
User
|
|
||||||
</span>
|
|
||||||
<!-- Enable switch -->
|
|
||||||
<div class="field">
|
|
||||||
<input
|
|
||||||
id="enable_user"
|
|
||||||
type="checkbox"
|
|
||||||
class="switch is-rounded"
|
|
||||||
@change="togglePermission('user')"
|
|
||||||
:checked="hasPermission('user')"
|
|
||||||
/>
|
|
||||||
<label for="enable_user"></label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Admin -->
|
|
||||||
<div class="column is-3">
|
|
||||||
<span class="tag is-dark">
|
|
||||||
Admin
|
|
||||||
</span>
|
|
||||||
<!-- Enable switch -->
|
|
||||||
<div class="field">
|
|
||||||
<input
|
|
||||||
id="enable_admin"
|
|
||||||
type="checkbox"
|
|
||||||
class="switch is-rounded"
|
|
||||||
@change="togglePermission('admin')"
|
|
||||||
:checked="hasPermission('admin')"
|
|
||||||
/>
|
|
||||||
<label for="enable_admin"></label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Super user -->
|
|
||||||
<div class="column is-3">
|
|
||||||
<span class="tag is-dark">
|
|
||||||
Super user
|
|
||||||
</span>
|
|
||||||
<!-- Enable switch -->
|
|
||||||
<div class="field">
|
|
||||||
<input
|
|
||||||
id="enable_superuser"
|
|
||||||
type="checkbox"
|
|
||||||
class="switch is-rounded"
|
|
||||||
@change="togglePermission('superuser')"
|
|
||||||
:checked="hasPermission('superuser')"
|
|
||||||
/>
|
|
||||||
<label for="enable_superuser"></label>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
<template v-else>
|
||||||
<!-- Permissions -->
|
<div v-if="mutationError" class="notification is-danger is-light" data-testid="role-permission-error">
|
||||||
<div v-for="([endpoint, permission]) of Object.entries(permissions).sort((a, b) => a[0].localeCompare(b[0]))" class="box" v-if="isLoaded">
|
{{ mutationError }}
|
||||||
<p class="is-pulled-right">
|
</div>
|
||||||
<span class="tag is-dark is-large">
|
|
||||||
{{ endpoint }}
|
<div class="role-permissions-toolbar">
|
||||||
</span>
|
<div class="field role-permissions-search">
|
||||||
</p>
|
<label class="label" for="role-permissions-search">
|
||||||
<!-- Permissions -->
|
{{ t("roles.permissions.search_label") }}
|
||||||
<div class="mt-2" v-for="(permission, method) in permission" :key="method">
|
</label>
|
||||||
<span class="tag mt-3" :class="endpointMethodColors[method]">
|
<div class="control has-icons-left">
|
||||||
<strong class="has-text-black">{{ method }}</strong>
|
<input
|
||||||
</span>
|
id="role-permissions-search"
|
||||||
<strong> {{ endpoint}}</strong> {{ convertRouteToHumanReadable(endpoint) }}
|
v-model="search"
|
||||||
<!--{{ permission }} -->
|
class="input"
|
||||||
<p class="mt-1"> Permissions </p>
|
type="search"
|
||||||
<div v-for="(permission, permission_node) in permission" :key="permission_node">
|
:placeholder="t('roles.permissions.search_placeholder')"
|
||||||
<span class="tag is-dark">
|
data-testid="role-permissions-search"
|
||||||
{{ permission_node }}
|
/>
|
||||||
</span>
|
<span class="icon is-left">
|
||||||
{{ permission }}
|
<i class="fas fa-search"></i>
|
||||||
<!-- Enable switch -->
|
</span>
|
||||||
<div class="field">
|
</div>
|
||||||
<input
|
</div>
|
||||||
:id="'enable_' + permission_node"
|
|
||||||
type="checkbox"
|
<div class="role-permissions-summary" aria-live="polite">
|
||||||
class="switch is-rounded"
|
<span class="tag is-dark is-light" data-testid="role-permissions-selected-count">
|
||||||
:checked="hasPermission(permission_node)"
|
{{ t("roles.permissions.selected_summary", { selected: selectedCount, total: totalCount }) }}
|
||||||
@change="togglePermission(permission_node)"
|
</span>
|
||||||
/>
|
<span v-if="search" class="tag is-info is-light" data-testid="role-permissions-filtered-count">
|
||||||
<label :for="'enable_' + permission_node"></label>
|
{{ t("roles.permissions.filtered_summary", { count: filteredCount }) }}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<!--<pre>{{ permission }}</pre> -->
|
<b-tabs
|
||||||
</div>
|
v-if="groupTabs.length"
|
||||||
|
v-model="activeGroup"
|
||||||
|
expanded
|
||||||
|
type="is-boxed"
|
||||||
|
data-testid="role-permissions-tabs"
|
||||||
|
>
|
||||||
|
<b-tab-item
|
||||||
|
v-for="group in groupTabs"
|
||||||
|
:key="group.key"
|
||||||
|
:value="group.key"
|
||||||
|
:label="`${group.label} (${group.filteredCount})`"
|
||||||
|
:icon="group.icon"
|
||||||
|
icon-pack="fas"
|
||||||
|
>
|
||||||
|
<section class="role-permission-group" :data-testid="`role-permissions-group-${group.key}`">
|
||||||
|
<div class="role-permission-group-header">
|
||||||
|
<div>
|
||||||
|
<h2 class="title is-5">{{ group.label }}</h2>
|
||||||
|
<p class="role-permission-group-description">{{ group.description }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="buttons role-permission-group-actions">
|
||||||
|
<button
|
||||||
|
class="button is-dark is-small"
|
||||||
|
type="button"
|
||||||
|
:disabled="isGroupBusy(group.key) || isGroupFullySelected(group.key)"
|
||||||
|
:data-testid="`role-permissions-select-all-${group.key}`"
|
||||||
|
@click="applyGroupSelection(group.key, true)"
|
||||||
|
>
|
||||||
|
<span class="icon">
|
||||||
|
<i class="fas fa-check-square"></i>
|
||||||
|
</span>
|
||||||
|
<span>{{ t("roles.permissions.actions.select_all") }}</span>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="button is-light is-small"
|
||||||
|
type="button"
|
||||||
|
:disabled="isGroupBusy(group.key) || isGroupFullyCleared(group.key)"
|
||||||
|
:data-testid="`role-permissions-clear-all-${group.key}`"
|
||||||
|
@click="applyGroupSelection(group.key, false)"
|
||||||
|
>
|
||||||
|
<span class="icon">
|
||||||
|
<i class="fas fa-minus-square"></i>
|
||||||
|
</span>
|
||||||
|
<span>{{ t("roles.permissions.actions.clear_all") }}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="getFilteredGroupRecords(group.key).length === 0"
|
||||||
|
class="notification is-light"
|
||||||
|
:data-testid="`role-permissions-empty-${group.key}`"
|
||||||
|
>
|
||||||
|
{{ search ? t("roles.permissions.no_search_results") : t("roles.permissions.empty_group") }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else class="table-container">
|
||||||
|
<table class="table is-fullwidth is-hoverable role-permissions-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>{{ t("roles.permissions.columns.enabled") }}</th>
|
||||||
|
<th>{{ t("roles.permissions.columns.permission") }}</th>
|
||||||
|
<th>{{ t("roles.permissions.columns.route") }}</th>
|
||||||
|
<th>{{ t("roles.permissions.columns.status") }}</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr
|
||||||
|
v-for="record in getFilteredGroupRecords(group.key)"
|
||||||
|
:key="record.permission"
|
||||||
|
:class="{ 'role-permission-selected': hasPermission(record.permission) }"
|
||||||
|
:data-testid="permissionTestId(record.permission)"
|
||||||
|
>
|
||||||
|
<td class="role-permission-toggle-cell">
|
||||||
|
<div class="field">
|
||||||
|
<input
|
||||||
|
:id="permissionDomId(record.permission)"
|
||||||
|
class="switch is-rounded"
|
||||||
|
type="checkbox"
|
||||||
|
:checked="hasPermission(record.permission)"
|
||||||
|
:disabled="isPermissionBusy(record.permission)"
|
||||||
|
:data-testid="`role-permission-toggle-${sanitizePermissionDomId(record.permission)}`"
|
||||||
|
@change="togglePermission(record)"
|
||||||
|
/>
|
||||||
|
<label :for="permissionDomId(record.permission)"></label>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<strong>{{ record.label }}</strong>
|
||||||
|
<p class="role-permission-description">
|
||||||
|
{{ record.description || t("roles.permissions.no_description") }}
|
||||||
|
</p>
|
||||||
|
<code>{{ record.permission }}</code>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<div class="role-permission-route">
|
||||||
|
<span>{{ record.endpointLabel || t("roles.permissions.access_scope") }}</span>
|
||||||
|
<span v-if="record.method" class="tag is-small" :class="record.methodColor">
|
||||||
|
{{ record.method }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<code v-if="record.endpoint">{{ record.endpoint }}</code>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span
|
||||||
|
class="tag"
|
||||||
|
:class="hasPermission(record.permission) ? 'is-success is-light' : 'is-light'"
|
||||||
|
>
|
||||||
|
{{
|
||||||
|
hasPermission(record.permission)
|
||||||
|
? t("roles.permissions.status.enabled")
|
||||||
|
: t("roles.permissions.status.disabled")
|
||||||
|
}}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</b-tab-item>
|
||||||
|
</b-tabs>
|
||||||
|
|
||||||
|
<div v-else class="notification is-light" data-testid="role-permissions-empty">
|
||||||
|
{{ t("roles.permissions.empty") }}
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</section>
|
||||||
</RolesSubPageWrapper>
|
</RolesSubPageWrapper>
|
||||||
</RestrictedPageWrapper>
|
</RestrictedPageWrapper>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
.role-permissions-page {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
.role-permissions-loading {
|
||||||
|
padding: 1rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permissions-toolbar {
|
||||||
|
align-items: flex-end;
|
||||||
|
display: flex;
|
||||||
|
gap: 1rem;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permissions-search {
|
||||||
|
flex: 1 1 28rem;
|
||||||
|
max-width: 42rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permissions-summary {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.5rem;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding-bottom: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permission-group {
|
||||||
|
padding-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permission-group-header {
|
||||||
|
align-items: flex-start;
|
||||||
|
display: flex;
|
||||||
|
gap: 1rem;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permission-group-description,
|
||||||
|
.role-permission-description {
|
||||||
|
color: #5f6672;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permission-group-actions {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permissions-table th:first-child,
|
||||||
|
.role-permission-toggle-cell {
|
||||||
|
width: 6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permission-route {
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permission-selected {
|
||||||
|
background: #f2fbf5;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 768px) {
|
||||||
|
.role-permissions-toolbar,
|
||||||
|
.role-permission-group-header {
|
||||||
|
align-items: stretch;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permissions-search {
|
||||||
|
max-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.role-permissions-summary,
|
||||||
|
.role-permission-group-actions {
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,297 @@
|
|||||||
|
export const endpointMethodColors = {
|
||||||
|
GET: "is-success",
|
||||||
|
POST: "is-info",
|
||||||
|
PUT: "is-warning",
|
||||||
|
PATCH: "is-warning",
|
||||||
|
DELETE: "is-danger",
|
||||||
|
OPTIONS: "is-light",
|
||||||
|
};
|
||||||
|
|
||||||
|
export const pageAccessPermissionKeys = ["user", "admin", "superuser"];
|
||||||
|
|
||||||
|
export const permissionGroupDefinitions = [
|
||||||
|
{
|
||||||
|
key: "access",
|
||||||
|
icon: "unlock",
|
||||||
|
patterns: [/^(user|admin|superuser)$/u, /^department_access_\d+$/u],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "orders_pos",
|
||||||
|
icon: "cash-register",
|
||||||
|
patterns: [/order/iu, /pos/iu, /stripe/iu, /payment/iu, /xlvask/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "bookings",
|
||||||
|
icon: "calendar-alt",
|
||||||
|
patterns: [/booking/iu, /time[-_]?booking/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "customers_users",
|
||||||
|
icon: "users",
|
||||||
|
patterns: [/customer/iu, /user/iu, /subuser/iu, /employee/iu, /auth/iu, /role/iu, /permission/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "departments_operations",
|
||||||
|
icon: "building",
|
||||||
|
patterns: [/department/iu, /lane/iu, /relay/iu, /daily[-_]?report/iu, /complaint/iu, /goal/iu, /notification/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "products_pricing",
|
||||||
|
icon: "tags",
|
||||||
|
patterns: [/product/iu, /price/iu, /pricing/iu, /discount/iu, /currency/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "invoicing_economic",
|
||||||
|
icon: "file-invoice",
|
||||||
|
patterns: [/invoice/iu, /economic/iu, /billing/iu, /collection/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "selfserve_edge",
|
||||||
|
icon: "network-wired",
|
||||||
|
patterns: [/self[-_]?serve/iu, /selfserve/iu, /edge/iu, /gateway/iu, /scanner/iu, /wash/iu, /shelly/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "system_config",
|
||||||
|
icon: "cogs",
|
||||||
|
patterns: [/system/iu, /config/iu, /configuration/iu, /replication/iu, /release/iu, /coolify/iu, /module/iu, /backup/iu, /workfeed/iu, /error[-_]?report/iu],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "other",
|
||||||
|
icon: "key",
|
||||||
|
patterns: [],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const permissionGroupByKey = new Map(permissionGroupDefinitions.map((group) => [group.key, group]));
|
||||||
|
const permissionGroupMatchPriority = [
|
||||||
|
"access",
|
||||||
|
"orders_pos",
|
||||||
|
"bookings",
|
||||||
|
"departments_operations",
|
||||||
|
"products_pricing",
|
||||||
|
"invoicing_economic",
|
||||||
|
"selfserve_edge",
|
||||||
|
"system_config",
|
||||||
|
"customers_users",
|
||||||
|
];
|
||||||
|
const permissionGroupsForMatching = permissionGroupDefinitions
|
||||||
|
.filter((group) => group.key !== "other")
|
||||||
|
.sort(
|
||||||
|
(left, right) =>
|
||||||
|
permissionGroupMatchPriority.indexOf(left.key) - permissionGroupMatchPriority.indexOf(right.key)
|
||||||
|
);
|
||||||
|
|
||||||
|
const normalizeText = (value) =>
|
||||||
|
String(value ?? "")
|
||||||
|
.toLowerCase()
|
||||||
|
.normalize("NFKD")
|
||||||
|
.replace(/[\u0300-\u036f]/gu, "")
|
||||||
|
.trim();
|
||||||
|
|
||||||
|
export const sanitizePermissionDomId = (value) =>
|
||||||
|
String(value ?? "")
|
||||||
|
.replace(/[^a-zA-Z0-9_-]+/g, "-")
|
||||||
|
.replace(/^-+|-+$/g, "")
|
||||||
|
.toLowerCase() || "permission";
|
||||||
|
|
||||||
|
const splitHumanWords = (value) =>
|
||||||
|
String(value ?? "")
|
||||||
|
.replace(/([a-z0-9])([A-Z])/g, "$1 $2")
|
||||||
|
.replace(/[_./:-]+/g, " ")
|
||||||
|
.replace(/\s+/g, " ")
|
||||||
|
.trim();
|
||||||
|
|
||||||
|
export const humanizePermissionKey = (permission) => {
|
||||||
|
const words = splitHumanWords(permission);
|
||||||
|
if (!words) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
return words.charAt(0).toUpperCase() + words.slice(1);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const humanizeEndpoint = (endpoint) => {
|
||||||
|
const words = splitHumanWords(String(endpoint ?? "").replace(/^\/+|\/+$/g, ""));
|
||||||
|
if (!words) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
return words.charAt(0).toUpperCase() + words.slice(1);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getPermissionGroupKey = ({ permission = "", endpoint = "", description = "" } = {}) => {
|
||||||
|
const haystack = `${permission} ${endpoint} ${description}`;
|
||||||
|
const match = permissionGroupsForMatching.find((group) =>
|
||||||
|
group.patterns.some((pattern) => pattern.test(haystack))
|
||||||
|
);
|
||||||
|
|
||||||
|
return match?.key || "other";
|
||||||
|
};
|
||||||
|
|
||||||
|
const buildSearchText = (record) =>
|
||||||
|
normalizeText(
|
||||||
|
[
|
||||||
|
record.permission,
|
||||||
|
record.label,
|
||||||
|
record.description,
|
||||||
|
record.endpoint,
|
||||||
|
record.endpointLabel,
|
||||||
|
record.method,
|
||||||
|
record.groupKey,
|
||||||
|
].join(" ")
|
||||||
|
);
|
||||||
|
|
||||||
|
const createPermissionRecord = ({
|
||||||
|
permission,
|
||||||
|
description = "",
|
||||||
|
endpoint = "",
|
||||||
|
method = "",
|
||||||
|
permissionOverrides = {},
|
||||||
|
}) => {
|
||||||
|
const key = String(permission || "").trim();
|
||||||
|
const override = permissionOverrides[key] || {};
|
||||||
|
const record = {
|
||||||
|
id: key,
|
||||||
|
permission: key,
|
||||||
|
label: override.label || humanizePermissionKey(key),
|
||||||
|
description: override.description || String(description || ""),
|
||||||
|
endpoint: String(endpoint || ""),
|
||||||
|
endpointLabel: humanizeEndpoint(endpoint),
|
||||||
|
method: String(method || ""),
|
||||||
|
methodColor: endpointMethodColors[String(method || "").toUpperCase()] || "is-light",
|
||||||
|
groupKey: override.groupKey || getPermissionGroupKey({ permission: key, endpoint, description }),
|
||||||
|
isVirtual: Boolean(override.isVirtual),
|
||||||
|
departmentId: override.departmentId || null,
|
||||||
|
};
|
||||||
|
|
||||||
|
record.searchText = buildSearchText(record);
|
||||||
|
return record;
|
||||||
|
};
|
||||||
|
|
||||||
|
const createAccessPermissionRecords = ({ departments = [], permissionOverrides = {} }) => {
|
||||||
|
const pageRecords = pageAccessPermissionKeys.map((permission) =>
|
||||||
|
createPermissionRecord({
|
||||||
|
permission,
|
||||||
|
permissionOverrides: {
|
||||||
|
...permissionOverrides,
|
||||||
|
[permission]: {
|
||||||
|
...(permissionOverrides[permission] || {}),
|
||||||
|
groupKey: "access",
|
||||||
|
isVirtual: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
const departmentRecords = departments.map((department) => {
|
||||||
|
const departmentId = Number.parseInt(String(department?.id ?? ""), 10);
|
||||||
|
const permission = `department_access_${departmentId}`;
|
||||||
|
const override = permissionOverrides[permission] || {};
|
||||||
|
|
||||||
|
return createPermissionRecord({
|
||||||
|
permission,
|
||||||
|
permissionOverrides: {
|
||||||
|
...permissionOverrides,
|
||||||
|
[permission]: {
|
||||||
|
label: override.label || String(department?.name || permission),
|
||||||
|
description: override.description || "",
|
||||||
|
groupKey: "access",
|
||||||
|
isVirtual: true,
|
||||||
|
departmentId,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return [...pageRecords, ...departmentRecords].filter((record) => record.permission && record.permission !== "department_access_NaN");
|
||||||
|
};
|
||||||
|
|
||||||
|
export const normalizePermissionCatalog = (catalog = {}, options = {}) => {
|
||||||
|
const permissionOverrides = options.permissionOverrides || {};
|
||||||
|
const recordsByPermission = new Map();
|
||||||
|
|
||||||
|
for (const record of createAccessPermissionRecords({
|
||||||
|
departments: options.departments || [],
|
||||||
|
permissionOverrides,
|
||||||
|
})) {
|
||||||
|
recordsByPermission.set(record.permission, record);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [endpoint, methods] of Object.entries(catalog || {})) {
|
||||||
|
if (!methods || typeof methods !== "object") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [method, permissions] of Object.entries(methods)) {
|
||||||
|
if (!permissions || typeof permissions !== "object") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [permission, description] of Object.entries(permissions)) {
|
||||||
|
const key = String(permission || "").trim();
|
||||||
|
if (!key || recordsByPermission.has(key)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
recordsByPermission.set(
|
||||||
|
key,
|
||||||
|
createPermissionRecord({
|
||||||
|
permission: key,
|
||||||
|
description,
|
||||||
|
endpoint,
|
||||||
|
method,
|
||||||
|
permissionOverrides,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...recordsByPermission.values()].sort((left, right) => {
|
||||||
|
const groupCompare =
|
||||||
|
permissionGroupDefinitions.findIndex((group) => group.key === left.groupKey) -
|
||||||
|
permissionGroupDefinitions.findIndex((group) => group.key === right.groupKey);
|
||||||
|
if (groupCompare !== 0) {
|
||||||
|
return groupCompare;
|
||||||
|
}
|
||||||
|
|
||||||
|
return left.label.localeCompare(right.label, undefined, { sensitivity: "base" });
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const filterPermissionRecords = (records = [], search = "") => {
|
||||||
|
const normalizedSearch = normalizeText(search);
|
||||||
|
if (!normalizedSearch) {
|
||||||
|
return [...records];
|
||||||
|
}
|
||||||
|
|
||||||
|
return records.filter((record) => record.searchText.includes(normalizedSearch));
|
||||||
|
};
|
||||||
|
|
||||||
|
export const groupPermissionRecords = (records = []) => {
|
||||||
|
const groups = new Map(permissionGroupDefinitions.map((group) => [group.key, []]));
|
||||||
|
|
||||||
|
for (const record of records) {
|
||||||
|
const groupKey = permissionGroupByKey.has(record.groupKey) ? record.groupKey : "other";
|
||||||
|
groups.get(groupKey).push(record);
|
||||||
|
}
|
||||||
|
|
||||||
|
return groups;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getPermissionDelta = (records = [], selectedPermissions = [], shouldSelect = true) => {
|
||||||
|
const selectedSet = selectedPermissions instanceof Set ? selectedPermissions : new Set(selectedPermissions);
|
||||||
|
const uniquePermissions = [...new Set(records.map((record) => record.permission).filter(Boolean))];
|
||||||
|
|
||||||
|
if (shouldSelect) {
|
||||||
|
return {
|
||||||
|
add: uniquePermissions.filter((permission) => !selectedSet.has(permission)),
|
||||||
|
remove: [],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
add: [],
|
||||||
|
remove: uniquePermissions.filter((permission) => selectedSet.has(permission)),
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -13,6 +13,7 @@ import StatisticsDepartmentGoal
|
|||||||
from "@/views/dashboards/superUserDashboard/statistics/displays/overview/StatisticsDepartmentGoal.vue";
|
from "@/views/dashboards/superUserDashboard/statistics/displays/overview/StatisticsDepartmentGoal.vue";
|
||||||
import {departments, getDepartments} from "@/components/pagination/departmentTabs.vue";
|
import {departments, getDepartments} from "@/components/pagination/departmentTabs.vue";
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
@@ -70,7 +71,8 @@ getDepartments()
|
|||||||
// Get the statistics
|
// Get the statistics
|
||||||
const getStatistics = async () => {
|
const getStatistics = async () => {
|
||||||
// Get the statistics
|
// Get the statistics
|
||||||
const response = await authenticatedRequest('/statistics/income/departments?start_date=' + (new Date()).toISOString().split('T')[0] + '&end_date=' + (new Date()).toISOString().split('T')[0])
|
const today = todayLocalDateOnly();
|
||||||
|
const response = await authenticatedRequest('/statistics/income/departments?start_date=' + today + '&end_date=' + today)
|
||||||
// Get the sent data
|
// Get the sent data
|
||||||
statistics_department_today.value = response.data.data
|
statistics_department_today.value = response.data.data
|
||||||
// Log the data
|
// Log the data
|
||||||
@@ -131,4 +133,4 @@ getStatistics()
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {ref} from 'vue';
|
|||||||
import { Bar } from 'vue-chartjs';
|
import { Bar } from 'vue-chartjs';
|
||||||
import { Chart as ChartJS, Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale } from 'chart.js'
|
import { Chart as ChartJS, Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale } from 'chart.js'
|
||||||
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
import { SessionUser } from "@/components/session/token/SessionUser.vue";
|
||||||
|
import { todayLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
|
|
||||||
ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale)
|
ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale)
|
||||||
@@ -16,7 +17,7 @@ const chartOptions = {
|
|||||||
// Shortcut to statistics
|
// Shortcut to statistics
|
||||||
|
|
||||||
// Set the time for the statistics to today
|
// Set the time for the statistics to today
|
||||||
SessionUser.adminUser.statistics.set_time((new Date()).toISOString().split('T')[0], (new Date()).toISOString().split('T')[0])
|
SessionUser.adminUser.statistics.set_time(todayLocalDateOnly(), todayLocalDateOnly())
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -33,4 +34,4 @@ SessionUser.adminUser.statistics.set_time((new Date()).toISOString().split('T')[
|
|||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -0,0 +1,165 @@
|
|||||||
|
import { expect, Page, test } from "@playwright/test";
|
||||||
|
import { apiPathPattern, mockApi, seedAuthenticatedState } from "./support/network.js";
|
||||||
|
|
||||||
|
type NotificationSmsRow = {
|
||||||
|
id: number;
|
||||||
|
department: number;
|
||||||
|
label: string;
|
||||||
|
phone_country_code: number;
|
||||||
|
phone: number;
|
||||||
|
enabled: boolean;
|
||||||
|
created_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const json = (body: unknown, status = 200) => ({
|
||||||
|
status,
|
||||||
|
contentType: "application/json",
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
|
||||||
|
const setupNotificationSmsApi = async (page: Page) => {
|
||||||
|
let listRequestCount = 0;
|
||||||
|
const mutations: Array<{ method: string; body?: Record<string, unknown>; id?: number }> = [];
|
||||||
|
let rows: NotificationSmsRow[] = [
|
||||||
|
{
|
||||||
|
id: 501,
|
||||||
|
department: 1,
|
||||||
|
label: "Dispatch line",
|
||||||
|
phone_country_code: 45,
|
||||||
|
phone: 12345678,
|
||||||
|
enabled: true,
|
||||||
|
created_at: "2026-07-06 12:00:00",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
await page.route(apiPathPattern("/department/notification/sms"), async (route) => {
|
||||||
|
const request = route.request();
|
||||||
|
const method = request.method();
|
||||||
|
|
||||||
|
if (method === "GET") {
|
||||||
|
listRequestCount += 1;
|
||||||
|
await route.fulfill(
|
||||||
|
json({
|
||||||
|
data: rows,
|
||||||
|
meta: {
|
||||||
|
pagination: {
|
||||||
|
page: 1,
|
||||||
|
per_page: 100,
|
||||||
|
total: rows.length,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (method === "PUT") {
|
||||||
|
const body = request.postDataJSON() as Record<string, unknown>;
|
||||||
|
mutations.push({ method, body });
|
||||||
|
rows = rows.map((row) =>
|
||||||
|
Number(row.id) === Number(body.id)
|
||||||
|
? {
|
||||||
|
...row,
|
||||||
|
enabled: body.enabled === true,
|
||||||
|
}
|
||||||
|
: row
|
||||||
|
);
|
||||||
|
|
||||||
|
await route.fulfill(json({ data: { message: "Department notification SMS updated" } }));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (method === "DELETE") {
|
||||||
|
const id = Number(new URL(request.url()).searchParams.get("id") || 0);
|
||||||
|
mutations.push({ method, id });
|
||||||
|
rows = rows.filter((row) => Number(row.id) !== id);
|
||||||
|
|
||||||
|
await route.fulfill(json({ data: { message: "Department notification SMS deleted" } }));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await route.fulfill(json({ message: "Unsupported notification SMS method" }, 405));
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
mutations,
|
||||||
|
get listRequestCount() {
|
||||||
|
return listRequestCount;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
test("@smoke department notification SMS active toggle and delete refresh the table", async ({ page }) => {
|
||||||
|
const notificationErrors: Array<{ status: number; url: string }> = [];
|
||||||
|
page.on("response", (response) => {
|
||||||
|
if (response.url().includes("/department/notification/sms") && response.status() >= 400) {
|
||||||
|
notificationErrors.push({
|
||||||
|
status: response.status(),
|
||||||
|
url: response.url(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
await seedAuthenticatedState(page, "admin-department-notifications-token");
|
||||||
|
await mockApi(page, {
|
||||||
|
authenticated: true,
|
||||||
|
permissions: [
|
||||||
|
"admin",
|
||||||
|
"department_access_1",
|
||||||
|
"department_notification_sms_get",
|
||||||
|
"department_notification_sms_update",
|
||||||
|
"department_notification_sms_delete",
|
||||||
|
"department_notification_sms_add",
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const notificationSmsApi = await setupNotificationSmsApi(page);
|
||||||
|
|
||||||
|
await page.goto("/admin/1/modules/notifications", { waitUntil: "domcontentloaded" });
|
||||||
|
|
||||||
|
const row = page.locator("tr", { hasText: "Dispatch line" });
|
||||||
|
await expect(row).toBeVisible();
|
||||||
|
const enabledToggle = page.getByTestId("department-notification-sms-enabled-toggle-501");
|
||||||
|
await expect(enabledToggle).toBeChecked();
|
||||||
|
|
||||||
|
const listRequestsBeforeToggle = notificationSmsApi.listRequestCount;
|
||||||
|
const updateRequestPromise = page.waitForRequest(
|
||||||
|
(request) => request.method() === "PUT" && request.url().includes("/department/notification/sms")
|
||||||
|
);
|
||||||
|
await enabledToggle.uncheck({ force: true });
|
||||||
|
|
||||||
|
const updateRequest = await updateRequestPromise;
|
||||||
|
expect(updateRequest.postDataJSON()).toMatchObject({
|
||||||
|
id: 501,
|
||||||
|
enabled: false,
|
||||||
|
});
|
||||||
|
await expect.poll(() => notificationSmsApi.listRequestCount).toBeGreaterThan(listRequestsBeforeToggle);
|
||||||
|
await expect(enabledToggle).not.toBeChecked();
|
||||||
|
|
||||||
|
const listRequestsBeforeDelete = notificationSmsApi.listRequestCount;
|
||||||
|
await row.locator('button[aria-haspopup="true"]').click();
|
||||||
|
const deleteRequestPromise = page.waitForRequest(
|
||||||
|
(request) => request.method() === "DELETE" && request.url().includes("/department/notification/sms")
|
||||||
|
);
|
||||||
|
await page.getByTestId("department-notification-sms-delete-501").click();
|
||||||
|
await expect(page.locator(".swal2-popup")).toBeVisible();
|
||||||
|
await page.locator(".swal2-confirm").click();
|
||||||
|
|
||||||
|
const deleteRequest = await deleteRequestPromise;
|
||||||
|
expect(new URL(deleteRequest.url()).searchParams.get("id")).toBe("501");
|
||||||
|
await expect.poll(() => notificationSmsApi.listRequestCount).toBeGreaterThan(listRequestsBeforeDelete);
|
||||||
|
await expect(page.locator("tr", { hasText: "Dispatch line" })).toHaveCount(0);
|
||||||
|
expect(notificationErrors).toEqual([]);
|
||||||
|
expect(notificationSmsApi.mutations).toEqual([
|
||||||
|
{
|
||||||
|
method: "PUT",
|
||||||
|
body: {
|
||||||
|
id: 501,
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
method: "DELETE",
|
||||||
|
id: 501,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
@@ -15,16 +15,20 @@ function isApiUrl(url: string) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function mockHtml2Canvas(page) {
|
const html2CanvasModulePattern = /\/(?:node_modules\/.*)?html2canvas(?:\.[\w-]+)?\.js(?:\?.*)?$/i;
|
||||||
await page.route(/\/node_modules\/html2canvas\/dist\/html2canvas\.esm\.js(?:\?.*)?$/i, async (route) => {
|
|
||||||
|
async function mockHtml2Canvas(page, { alwaysFail = false } = {}) {
|
||||||
|
await page.unroute(html2CanvasModulePattern).catch(() => {});
|
||||||
|
await page.route(html2CanvasModulePattern, async (route) => {
|
||||||
await route.fulfill({
|
await route.fulfill({
|
||||||
contentType: "text/javascript",
|
contentType: "text/javascript",
|
||||||
body: `
|
body: `
|
||||||
|
const alwaysFail = ${alwaysFail ? "true" : "false"};
|
||||||
let html2canvasAttempts = 0;
|
let html2canvasAttempts = 0;
|
||||||
export default async function html2canvas() {
|
export default async function html2canvas() {
|
||||||
html2canvasAttempts += 1;
|
html2canvasAttempts += 1;
|
||||||
if (html2canvasAttempts === 1) {
|
if (alwaysFail || html2canvasAttempts === 1) {
|
||||||
throw new Error("Simulated first capture failure");
|
throw new Error(alwaysFail ? "Simulated permanent capture failure" : "Simulated first capture failure");
|
||||||
}
|
}
|
||||||
const canvas = document.createElement("canvas");
|
const canvas = document.createElement("canvas");
|
||||||
canvas.width = 8;
|
canvas.width = 8;
|
||||||
@@ -163,10 +167,68 @@ test.describe("Authenticated error reports", () => {
|
|||||||
expect(Array.isArray(body.vue_errors)).toBe(true);
|
expect(Array.isArray(body.vue_errors)).toBe(true);
|
||||||
expect(body.context).toMatchObject({
|
expect(body.context).toMatchObject({
|
||||||
data_collection_policy_version: "error-report-v1",
|
data_collection_policy_version: "error-report-v1",
|
||||||
|
screenshot_attachment: {
|
||||||
|
status: "stored",
|
||||||
|
attached: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
await expect(page.getByTestId("error-report-submitted")).toBeVisible();
|
await expect(page.getByTestId("error-report-submitted")).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("submits without a screenshot when capture never succeeds", async ({ page }) => {
|
||||||
|
await mockHtml2Canvas(page, { alwaysFail: true });
|
||||||
|
const submittedBodies: Array<Record<string, unknown>> = [];
|
||||||
|
|
||||||
|
await page.route(/\/error-reports(?:\?.*)?$/i, async (route) => {
|
||||||
|
if (!isApiUrl(route.request().url())) {
|
||||||
|
await route.fallback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (route.request().method().toUpperCase() !== "POST") {
|
||||||
|
await route.fallback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const body = route.request().postDataJSON() as Record<string, unknown>;
|
||||||
|
submittedBodies.push(body);
|
||||||
|
await route.fulfill(
|
||||||
|
json(
|
||||||
|
{
|
||||||
|
success: true,
|
||||||
|
data: {
|
||||||
|
id: 100,
|
||||||
|
status: "open",
|
||||||
|
screenshot: null,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
201
|
||||||
|
)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
await primeMockSession(page, { token: "error-report-user-token", bootPath: "/admin" });
|
||||||
|
await openErrorReportLauncher(page);
|
||||||
|
|
||||||
|
await page.getByLabel("What were you doing before the error occurred?").fill("Opening the orders page");
|
||||||
|
await page.getByLabel("What did you expect would happen?").fill("The orders should load");
|
||||||
|
await page.getByLabel("What actually happened?").fill("The page showed an error");
|
||||||
|
await page.getByTestId("error-report-consent").check();
|
||||||
|
await page.getByTestId("error-report-submit").click();
|
||||||
|
|
||||||
|
await expect.poll(() => submittedBodies.length).toBe(1);
|
||||||
|
const body = submittedBodies[0];
|
||||||
|
expect(body.screenshot).toBeNull();
|
||||||
|
expect(body.context).toMatchObject({
|
||||||
|
screenshot_attachment: {
|
||||||
|
status: "capture_failed",
|
||||||
|
attached: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await expect(page.getByTestId("error-report-capture-warning")).toContainText(
|
||||||
|
"The screen capture failed. The report will be sent without a screenshot."
|
||||||
|
);
|
||||||
|
await expect(page.getByTestId("error-report-submitted")).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
test("lets superusers inspect and resolve submitted reports", async ({ page }) => {
|
test("lets superusers inspect and resolve submitted reports", async ({ page }) => {
|
||||||
const report: Record<string, any> = {
|
const report: Record<string, any> = {
|
||||||
id: 12,
|
id: 12,
|
||||||
@@ -277,4 +339,90 @@ test.describe("Authenticated error reports", () => {
|
|||||||
]);
|
]);
|
||||||
await expect(page.getByTestId("error-report-detail")).toContainText("resolved");
|
await expect(page.getByTestId("error-report-detail")).toContainText("resolved");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("lets superusers inspect submitted reports without screenshots", async ({ page }) => {
|
||||||
|
const report: Record<string, any> = {
|
||||||
|
id: 13,
|
||||||
|
status: "open",
|
||||||
|
reporter: {
|
||||||
|
type: "user",
|
||||||
|
user_id: 7,
|
||||||
|
customer_number: 12345,
|
||||||
|
name: "Error Reporter",
|
||||||
|
email: "reporter@example.test",
|
||||||
|
},
|
||||||
|
route_path: "/user/orders",
|
||||||
|
page_url: "https://app.example.test/user/orders",
|
||||||
|
release_trace_id: "trace-no-screenshot",
|
||||||
|
frontend_version: "front-1",
|
||||||
|
api_version: "api-1",
|
||||||
|
screenshot: null,
|
||||||
|
answers: {
|
||||||
|
before_error: "Opening the orders page",
|
||||||
|
expected: "Orders should load",
|
||||||
|
actual: "The table stayed empty",
|
||||||
|
},
|
||||||
|
request_error_count: 0,
|
||||||
|
vue_error_count: 0,
|
||||||
|
request_errors: [],
|
||||||
|
vue_errors: [],
|
||||||
|
runtime_context: {
|
||||||
|
screenshot_attachment: {
|
||||||
|
status: "capture_failed",
|
||||||
|
attached: false,
|
||||||
|
mime_type: null,
|
||||||
|
size_bytes: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
created_at: "2026-05-19 08:00:00",
|
||||||
|
updated_at: "2026-05-19 08:00:00",
|
||||||
|
resolved_at: null,
|
||||||
|
resolved_by_user_id: null,
|
||||||
|
resolution_note: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
await page.route(/\/superuser\/error-reports(?:\?.*)?$/i, async (route) => {
|
||||||
|
if (!isApiUrl(route.request().url())) {
|
||||||
|
await route.fallback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (route.request().method().toUpperCase() !== "GET") {
|
||||||
|
await route.fallback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await route.fulfill(
|
||||||
|
json({
|
||||||
|
success: true,
|
||||||
|
data: {
|
||||||
|
items: [report],
|
||||||
|
counts: {
|
||||||
|
open: 1,
|
||||||
|
resolved: 0,
|
||||||
|
all: 1,
|
||||||
|
},
|
||||||
|
limit: 100,
|
||||||
|
offset: 0,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.route(/\/superuser\/error-reports\/13$/i, async (route) => {
|
||||||
|
if (!isApiUrl(route.request().url())) {
|
||||||
|
await route.fallback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await route.fulfill(json({ success: true, data: report }));
|
||||||
|
});
|
||||||
|
|
||||||
|
await primeMockSession(page, { token: "error-report-superuser-token", bootPath: "/superuser/error-reports" });
|
||||||
|
await expect(page.getByTestId("error-reports-page")).toBeVisible();
|
||||||
|
await expect(page.getByTestId("error-report-list")).toContainText("/user/orders");
|
||||||
|
|
||||||
|
await page.getByTestId("error-report-view").click();
|
||||||
|
const detail = page.getByTestId("error-report-detail");
|
||||||
|
await expect(detail).toContainText("Opening the orders page");
|
||||||
|
await expect(detail).toContainText("trace-no-screenshot");
|
||||||
|
await expect(detail.locator("img")).toHaveCount(0);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ function createCardOrderFixture(overrides = {}) {
|
|||||||
customer_id: CARD_CUSTOMER_ID,
|
customer_id: CARD_CUSTOMER_ID,
|
||||||
department_id: DEPARTMENT_ID,
|
department_id: DEPARTMENT_ID,
|
||||||
reference: "CARD-REF-54518",
|
reference: "CARD-REF-54518",
|
||||||
|
po: "",
|
||||||
|
safety_seal: "",
|
||||||
notes: "Paid at terminal",
|
notes: "Paid at terminal",
|
||||||
reg_1: "ZZ99999",
|
reg_1: "ZZ99999",
|
||||||
reg_2: "",
|
reg_2: "",
|
||||||
@@ -236,6 +238,61 @@ test.describe("POS desktop card payments", () => {
|
|||||||
await expect(stepThree.getByTestId("pos-stripe-create-intent")).toBeVisible({ timeout: 10_000 });
|
await expect(stepThree.getByTestId("pos-stripe-create-intent")).toBeVisible({ timeout: 10_000 });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("step 2 customer wishes stay visible after moving to card payment step 3", async ({ page }) => {
|
||||||
|
const stepTwoReference = "CARD-STEP-2-REF";
|
||||||
|
const stepTwoPo = "PO-CARD-STEP-2";
|
||||||
|
const fixture = createCardOrderFixture({
|
||||||
|
ordersById: {
|
||||||
|
[ORDER_ID]: {
|
||||||
|
...createCardOrderFixture().ordersById[ORDER_ID],
|
||||||
|
reference: "",
|
||||||
|
po: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await mockApi(page, {
|
||||||
|
authenticated: true,
|
||||||
|
permissions: DESKTOP_POS_PERMISSIONS,
|
||||||
|
edgeGateways: false,
|
||||||
|
pos: fixture,
|
||||||
|
});
|
||||||
|
await primeSession(page, `desktop-card-step2-${Date.now()}`);
|
||||||
|
await page.goto(`/admin/${DEPARTMENT_ID}/modules/pos?id=${ORDER_ID}&customer_id=${CARD_CUSTOMER_ID}&step=2`);
|
||||||
|
|
||||||
|
const stepTwo = page.getByTestId("pos-step-2");
|
||||||
|
await expect(stepTwo).toBeVisible({ timeout: 10_000 });
|
||||||
|
await expect(stepTwo.getByTestId("pos-order-metadata-grid")).toBeVisible({ timeout: 10_000 });
|
||||||
|
|
||||||
|
await stepTwo.getByTestId("pos-order-customer-wishes-reference").click();
|
||||||
|
await stepTwo.getByTestId("pos-order-customer-wishes-reference-input").fill(stepTwoReference);
|
||||||
|
await stepTwo.getByTestId("pos-order-customer-wishes-po").click();
|
||||||
|
await stepTwo.getByTestId("pos-order-customer-wishes-po-input").fill(stepTwoPo);
|
||||||
|
await stepTwo.getByTestId("pos-next-step").click();
|
||||||
|
|
||||||
|
const stepThree = page.getByTestId("pos-step-3");
|
||||||
|
await expect(stepThree).toBeVisible({ timeout: 10_000 });
|
||||||
|
await expect(stepThree.getByTestId("pos-order-customer-wishes-reference")).toContainText(stepTwoReference, {
|
||||||
|
timeout: 10_000,
|
||||||
|
});
|
||||||
|
await expect(stepThree.getByTestId("pos-order-customer-wishes-po")).toContainText(stepTwoPo, {
|
||||||
|
timeout: 10_000,
|
||||||
|
});
|
||||||
|
await expect.poll(() => fixture.ordersById[ORDER_ID].reference, { timeout: 10_000 }).toBe(stepTwoReference);
|
||||||
|
await expect.poll(() => fixture.ordersById[ORDER_ID].po, { timeout: 10_000 }).toBe(stepTwoPo);
|
||||||
|
|
||||||
|
await page.reload();
|
||||||
|
|
||||||
|
const reloadedStepThree = page.getByTestId("pos-step-3");
|
||||||
|
await expect(reloadedStepThree).toBeVisible({ timeout: 10_000 });
|
||||||
|
await expect(reloadedStepThree.getByTestId("pos-order-customer-wishes-reference")).toContainText(stepTwoReference, {
|
||||||
|
timeout: 10_000,
|
||||||
|
});
|
||||||
|
await expect(reloadedStepThree.getByTestId("pos-order-customer-wishes-po")).toContainText(stepTwoPo, {
|
||||||
|
timeout: 10_000,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
test("idle state renders grouped terminal statuses and only keeps ready terminals selectable", async ({ page }) => {
|
test("idle state renders grouped terminal statuses and only keeps ready terminals selectable", async ({ page }) => {
|
||||||
const fixture = createCardOrderFixture({
|
const fixture = createCardOrderFixture({
|
||||||
readers: [
|
readers: [
|
||||||
|
|||||||
@@ -3272,6 +3272,66 @@ test.describe("POS mobile order flow", () => {
|
|||||||
expect(createdProductIds).toEqual([53, 71, 91]);
|
expect(createdProductIds).toEqual([53, 71, 91]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("manual step 2 blocks additional items when customer restricts additional services", async ({ page }) => {
|
||||||
|
const orderId = 9414;
|
||||||
|
const fixture = createMobilePosFixture({
|
||||||
|
customerAttributesByNumber: {
|
||||||
|
[REGULAR_CUSTOMER_ID]: [
|
||||||
|
{
|
||||||
|
id: 941401,
|
||||||
|
customer_number: REGULAR_CUSTOMER_ID,
|
||||||
|
attribute: "restrictAdditionalServices",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
ordersById: {
|
||||||
|
[orderId]: buildRegularOrder(orderId, {
|
||||||
|
reference: "STEP2-RESTRICT-ADDITIONAL",
|
||||||
|
reg_1: "ZZ00000",
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
orderItemsByOrderId: {
|
||||||
|
[orderId]: [],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await setupMobilePosPage(page, fixture, {
|
||||||
|
token: "mobile-step2-restrict-additional-token",
|
||||||
|
seedState: {
|
||||||
|
customerId: REGULAR_CUSTOMER_ID,
|
||||||
|
reg: "ZZ00000",
|
||||||
|
reference: "STEP2-RESTRICT-ADDITIONAL",
|
||||||
|
includePrimaryItem: false,
|
||||||
|
vehicleType: null,
|
||||||
|
lastOrderId: null,
|
||||||
|
},
|
||||||
|
route: {
|
||||||
|
step: 2,
|
||||||
|
orderId,
|
||||||
|
customerId: REGULAR_CUSTOMER_ID,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect.poll(() => fixture.requestCounters.customerAttributesGet, { timeout: 10_000 }).toBeGreaterThan(0);
|
||||||
|
await selectPrimaryProduct(page, 53);
|
||||||
|
await expect(page.getByTestId("pos-mobile-additional-items-open")).toHaveCount(1);
|
||||||
|
|
||||||
|
await page.getByTestId("pos-mobile-additional-items-open").click();
|
||||||
|
await expect(page.getByTestId("pos-mobile-additional-items-selection")).toHaveCount(0);
|
||||||
|
|
||||||
|
await longPressAdditionalItems(page);
|
||||||
|
await expect(page.getByTestId("pos-mobile-additional-items-selection")).toHaveCount(0);
|
||||||
|
await expect
|
||||||
|
.poll(
|
||||||
|
async () => {
|
||||||
|
const snapshot = await getStoredPosSnapshot(page);
|
||||||
|
return snapshot?.transactionItems?.additionalItems || [];
|
||||||
|
},
|
||||||
|
{ timeout: 10_000 }
|
||||||
|
)
|
||||||
|
.toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
test("clear all deletes the order and returns to the scanner", async ({ page }) => {
|
test("clear all deletes the order and returns to the scanner", async ({ page }) => {
|
||||||
const orderId = 9403;
|
const orderId = 9403;
|
||||||
const fixture = createMobilePosFixture({
|
const fixture = createMobilePosFixture({
|
||||||
|
|||||||
@@ -0,0 +1,207 @@
|
|||||||
|
import { expect, test, type Page, type Route } from "@playwright/test";
|
||||||
|
|
||||||
|
import { apiPathPattern, mockApi, seedAuthenticatedState } from "./support/network.js";
|
||||||
|
|
||||||
|
// This route is sensitive to stale cached Vue modules when the PWA service worker is active in mobile runs.
|
||||||
|
test.use({ serviceWorkers: "block" });
|
||||||
|
|
||||||
|
const json = (body: unknown, status = 200) => ({
|
||||||
|
status,
|
||||||
|
contentType: "application/json",
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
|
||||||
|
const permissionCatalog = {
|
||||||
|
"/orders": {
|
||||||
|
GET: {
|
||||||
|
list_orders: "List orders",
|
||||||
|
},
|
||||||
|
POST: {
|
||||||
|
add_order: "Create orders",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/admin/bookings": {
|
||||||
|
POST: {
|
||||||
|
create_bookings: "Create bookings",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/superuser/system/replication": {
|
||||||
|
GET: {
|
||||||
|
superuser_replication_view: "View replication status",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const departments = [
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
name: "Copenhagen",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 2,
|
||||||
|
name: "Odense",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
type PermissionCall = {
|
||||||
|
action: "add" | "remove";
|
||||||
|
permission: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const openGroupTab = async (page: Page, label: RegExp) => {
|
||||||
|
await page.locator(".tabs").getByText(label).click();
|
||||||
|
};
|
||||||
|
|
||||||
|
const clickPermissionSwitch = async (page: Page, permission: string) => {
|
||||||
|
await page.locator(`label[for="role-permission-${permission}"]`).click();
|
||||||
|
};
|
||||||
|
|
||||||
|
const installRolePermissionRoutes = async (
|
||||||
|
page: Page,
|
||||||
|
options: {
|
||||||
|
failAction?: "add" | "remove";
|
||||||
|
failPermission?: string;
|
||||||
|
} = {}
|
||||||
|
) => {
|
||||||
|
let rolePermissions = ["user", "superuser", "department_access_1", "list_orders"];
|
||||||
|
const calls: PermissionCall[] = [];
|
||||||
|
|
||||||
|
const rolePayload = () => ({
|
||||||
|
id: 2,
|
||||||
|
name: "Operations manager",
|
||||||
|
description: "Can manage operations.",
|
||||||
|
created_at: "2026-07-06T08:00:00.000Z",
|
||||||
|
permissions: [...rolePermissions],
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.route(apiPathPattern("/permissions"), async (route: Route) => {
|
||||||
|
await route.fulfill(json({ data: permissionCatalog }));
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.route(apiPathPattern("/departments"), async (route: Route) => {
|
||||||
|
await route.fulfill(json({ data: departments }));
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.route(apiPathPattern("/roles"), async (route: Route) => {
|
||||||
|
await route.fulfill(json({ data: rolePayload() }));
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.route(apiPathPattern("/roles/permissions"), async (route: Route) => {
|
||||||
|
const request = route.request();
|
||||||
|
const method = request.method();
|
||||||
|
const url = new URL(request.url());
|
||||||
|
const body = method === "POST" ? request.postDataJSON() : {};
|
||||||
|
const permission =
|
||||||
|
method === "POST" ? String(body.permission_id || "") : String(url.searchParams.get("permission_id") || "");
|
||||||
|
const action = method === "POST" ? "add" : "remove";
|
||||||
|
|
||||||
|
calls.push({ action, permission });
|
||||||
|
|
||||||
|
if (options.failAction === action && options.failPermission === permission) {
|
||||||
|
await route.fulfill(json({ data: { message: "Mutation failed" } }, 500));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action === "add" && !rolePermissions.includes(permission)) {
|
||||||
|
rolePermissions = [...rolePermissions, permission];
|
||||||
|
}
|
||||||
|
if (action === "remove") {
|
||||||
|
rolePermissions = rolePermissions.filter((value) => value !== permission);
|
||||||
|
}
|
||||||
|
|
||||||
|
await route.fulfill(json({ data: rolePayload() }));
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
calls,
|
||||||
|
getRolePermissions: () => [...rolePermissions],
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const bootRolePermissionsPage = async (page: Page, routeOptions = {}) => {
|
||||||
|
await page.addInitScript(() => {
|
||||||
|
window.localStorage.setItem("locale", "en");
|
||||||
|
});
|
||||||
|
await seedAuthenticatedState(page, "superuser-role-permissions-token");
|
||||||
|
await mockApi(page, {
|
||||||
|
authenticated: true,
|
||||||
|
permissions: [
|
||||||
|
"superuser",
|
||||||
|
"user",
|
||||||
|
"permissions_list",
|
||||||
|
"list_roles",
|
||||||
|
"add_role_permission",
|
||||||
|
"delete_role_permission",
|
||||||
|
],
|
||||||
|
sessionData: {
|
||||||
|
group_id: 1,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const harness = await installRolePermissionRoutes(page, routeOptions);
|
||||||
|
|
||||||
|
await page.goto("/superuser/roles/2", { waitUntil: "domcontentloaded" });
|
||||||
|
await expect(page.getByTestId("role-permissions-page")).toBeVisible();
|
||||||
|
await expect(page.getByTestId("role-permissions-loading")).toHaveCount(0);
|
||||||
|
|
||||||
|
return harness;
|
||||||
|
};
|
||||||
|
|
||||||
|
test.describe("Superuser role permissions", () => {
|
||||||
|
test("@smoke @pr loads grouped permissions, searches, and toggles without a blank page", async ({ page }) => {
|
||||||
|
const { calls } = await bootRolePermissionsPage(page);
|
||||||
|
|
||||||
|
await expect(page.getByText("Operations manager permissions")).toBeVisible();
|
||||||
|
await expect(page.getByTestId("role-permissions-selected-count")).toContainText("4 of 9 selected");
|
||||||
|
await expect(page.getByRole("heading", { name: "Access" })).toBeVisible();
|
||||||
|
|
||||||
|
await openGroupTab(page, /Orders and POS/);
|
||||||
|
await expect(page.getByTestId("role-permission-row-list_orders")).toContainText("List orders");
|
||||||
|
await clickPermissionSwitch(page, "list_orders");
|
||||||
|
|
||||||
|
await expect.poll(() => calls).toContainEqual({ action: "remove", permission: "list_orders" });
|
||||||
|
await expect(page.getByTestId("role-permissions-page")).toBeVisible();
|
||||||
|
await expect(page.locator("body")).not.toContainText(/white screen|TypeError|Unhandled/i);
|
||||||
|
|
||||||
|
await page.getByTestId("role-permissions-search").fill("booking");
|
||||||
|
await openGroupTab(page, /Bookings/);
|
||||||
|
await expect(page.getByTestId("role-permission-row-create_bookings")).toContainText("Create bookings");
|
||||||
|
await openGroupTab(page, /Orders and POS/);
|
||||||
|
await expect(page.getByTestId("role-permissions-empty-orders_pos")).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("selects and clears all permissions in a group without no-op requests", async ({ page }) => {
|
||||||
|
const { calls, getRolePermissions } = await bootRolePermissionsPage(page);
|
||||||
|
|
||||||
|
await openGroupTab(page, /Orders and POS/);
|
||||||
|
await page.getByTestId("role-permissions-clear-all-orders_pos").click();
|
||||||
|
await expect.poll(() => calls).toEqual([{ action: "remove", permission: "list_orders" }]);
|
||||||
|
expect(getRolePermissions()).not.toContain("list_orders");
|
||||||
|
expect(getRolePermissions()).not.toContain("add_order");
|
||||||
|
|
||||||
|
await page.getByTestId("role-permissions-select-all-orders_pos").click();
|
||||||
|
await expect
|
||||||
|
.poll(() => calls)
|
||||||
|
.toEqual([
|
||||||
|
{ action: "remove", permission: "list_orders" },
|
||||||
|
{ action: "add", permission: "add_order" },
|
||||||
|
{ action: "add", permission: "list_orders" },
|
||||||
|
]);
|
||||||
|
expect(getRolePermissions()).toEqual(expect.arrayContaining(["list_orders", "add_order"]));
|
||||||
|
});
|
||||||
|
|
||||||
|
test("keeps the page rendered and reloads role permissions when a mutation fails", async ({ page }) => {
|
||||||
|
const { calls, getRolePermissions } = await bootRolePermissionsPage(page, {
|
||||||
|
failAction: "add",
|
||||||
|
failPermission: "add_order",
|
||||||
|
});
|
||||||
|
|
||||||
|
await openGroupTab(page, /Orders and POS/);
|
||||||
|
await clickPermissionSwitch(page, "add_order");
|
||||||
|
|
||||||
|
await expect.poll(() => calls).toContainEqual({ action: "add", permission: "add_order" });
|
||||||
|
await expect(page.getByTestId("role-permission-error")).toBeVisible();
|
||||||
|
await expect(page.getByTestId("role-permissions-page")).toBeVisible();
|
||||||
|
await expect(page.getByTestId("role-permission-toggle-add_order")).not.toBeChecked();
|
||||||
|
expect(getRolePermissions()).not.toContain("add_order");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -7,10 +7,13 @@ async function primeSuperuserSession(page) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
test.describe("Superuser vehicles smoke", () => {
|
test.describe("Superuser vehicles smoke", () => {
|
||||||
|
test.describe.configure({ mode: "serial" });
|
||||||
|
|
||||||
test.beforeEach(async ({ page }) => {
|
test.beforeEach(async ({ page }) => {
|
||||||
await mockApi(page, {
|
await mockApi(page, {
|
||||||
authenticated: true,
|
authenticated: true,
|
||||||
permissions: ["superuser", "user"],
|
permissions: ["superuser", "user"],
|
||||||
|
pos: true,
|
||||||
});
|
});
|
||||||
await primeSuperuserSession(page);
|
await primeSuperuserSession(page);
|
||||||
});
|
});
|
||||||
@@ -23,4 +26,51 @@ test.describe("Superuser vehicles smoke", () => {
|
|||||||
await expect(page.locator("body")).toContainText(/registrerede|registered/i);
|
await expect(page.locator("body")).toContainText(/registrerede|registered/i);
|
||||||
await expect(page.locator("body")).not.toContainText(/Order ID is required/i);
|
await expect(page.locator("body")).not.toContainText(/Order ID is required/i);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("superuser can add a vehicle after selecting a customer from searchable results", async ({ page }) => {
|
||||||
|
const createVehiclePayloads = [];
|
||||||
|
|
||||||
|
page.on("request", (request) => {
|
||||||
|
const url = new URL(request.url());
|
||||||
|
if (url.pathname.endsWith("/vehicles") && request.method() === "POST") {
|
||||||
|
createVehiclePayloads.push(request.postDataJSON());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.goto("/superuser/vehicles");
|
||||||
|
|
||||||
|
await page.getByTestId("superuser-vehicles-add").click();
|
||||||
|
await expect(page.getByTestId("superuser-add-vehicle-modal")).toBeVisible();
|
||||||
|
|
||||||
|
await page.getByTestId("superuser-add-vehicle-customer-input").fill("12345679");
|
||||||
|
await expect(page.getByTestId("superuser-add-vehicle-customer-option-0")).toBeVisible();
|
||||||
|
await page.getByTestId("superuser-add-vehicle-customer-option-0").click();
|
||||||
|
await expect(page.getByTestId("superuser-add-vehicle-customer-selected")).toContainText("#12345679");
|
||||||
|
|
||||||
|
await page.getByTestId("superuser-add-vehicle-registration").fill("ab12345");
|
||||||
|
await expect(page.getByTestId("superuser-add-vehicle-type")).toBeEnabled();
|
||||||
|
await page.getByTestId("superuser-add-vehicle-type").selectOption("53");
|
||||||
|
await page.getByTestId("superuser-add-vehicle-wash-subscription").check();
|
||||||
|
await page.getByTestId("superuser-add-vehicle-reference").fill("Fleet reference");
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
page.waitForResponse(
|
||||||
|
(response) => response.url().includes("/vehicles") && response.request().method() === "POST"
|
||||||
|
),
|
||||||
|
page.getByTestId("superuser-add-vehicle-submit").click(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(createVehiclePayloads).toEqual([
|
||||||
|
{
|
||||||
|
type: 53,
|
||||||
|
reg: "AB12345",
|
||||||
|
wash_subscription: true,
|
||||||
|
customer_id: 12345679,
|
||||||
|
reference: "Fleet reference",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(page.getByTestId("superuser-add-vehicle-modal")).toBeHidden();
|
||||||
|
await expect(page.getByTestId("user-vehicles-table")).toContainText("AB12345");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2736,6 +2736,7 @@ export function createPosFixture(overrides = {}) {
|
|||||||
last_order_id: 54518,
|
last_order_id: 54518,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
nextVehicleId: 7002,
|
||||||
unknownVehicles: [],
|
unknownVehicles: [],
|
||||||
orderBookings: [],
|
orderBookings: [],
|
||||||
bookingOrderAssignments: [],
|
bookingOrderAssignments: [],
|
||||||
@@ -3278,6 +3279,30 @@ async function handlePosRoute({ route, request, parsedUrl, pathname, method, pos
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pathname.endsWith("/vehicles") && method === "POST") {
|
||||||
|
const body = request.postDataJSON?.() || {};
|
||||||
|
const customerId = Number(body.customer_id || 0);
|
||||||
|
const customer = posFixture.customersByNumber[customerId] || null;
|
||||||
|
const vehicle = {
|
||||||
|
id: posFixture.nextVehicleId || 9001,
|
||||||
|
reg: String(body.reg || "").toUpperCase(),
|
||||||
|
customer_id: customerId,
|
||||||
|
customer_name: customer?.name || "",
|
||||||
|
type: Number(body.type || 0),
|
||||||
|
status: "verified",
|
||||||
|
barred: false,
|
||||||
|
wash_subscription: Boolean(body.wash_subscription),
|
||||||
|
addons: { enabled: 0, available: 0, list: [] },
|
||||||
|
reference: body.reference || null,
|
||||||
|
};
|
||||||
|
|
||||||
|
posFixture.nextVehicleId = vehicle.id + 1;
|
||||||
|
posFixture.vehicles = [vehicle, ...(posFixture.vehicles || [])];
|
||||||
|
|
||||||
|
await route.fulfill(json({ success: true, data: vehicle }));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if (pathname.endsWith("/department/vehicles/unknown-customer") && method === "GET") {
|
if (pathname.endsWith("/department/vehicles/unknown-customer") && method === "GET") {
|
||||||
await route.fulfill(json({ success: true, data: posFixture.unknownVehicles || [] }));
|
await route.fulfill(json({ success: true, data: posFixture.unknownVehicles || [] }));
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -0,0 +1,115 @@
|
|||||||
|
// @vitest-environment jsdom
|
||||||
|
import { nextTick } from "vue";
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { mountWithApp } from "./helpers/mountWithApp.js";
|
||||||
|
|
||||||
|
const searchMocks = vi.hoisted(() => ({
|
||||||
|
isSearchingRef: null,
|
||||||
|
resultsRef: null,
|
||||||
|
searchCustomer: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/search/economic/customerSearch.vue", async () => {
|
||||||
|
const { ref } = await vi.importActual("vue");
|
||||||
|
|
||||||
|
searchMocks.isSearchingRef = ref(false);
|
||||||
|
searchMocks.resultsRef = ref([]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
isSearching: searchMocks.isSearchingRef,
|
||||||
|
searchCustomerResults: searchMocks.resultsRef,
|
||||||
|
searchCustomer: searchMocks.searchCustomer,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
import CustomerSearchSelect from "@/components/search/economic/CustomerSearchSelect.vue";
|
||||||
|
|
||||||
|
const customers = [
|
||||||
|
{
|
||||||
|
customerNumber: 12345679,
|
||||||
|
name: "Acme Transport",
|
||||||
|
city: "Taastrup",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
customerNumber: 87654321,
|
||||||
|
name: "Nordic Wash",
|
||||||
|
city: "Copenhagen",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const messages = {
|
||||||
|
en: {
|
||||||
|
vehicles: {
|
||||||
|
add_modal: {
|
||||||
|
customer_label: "Customer",
|
||||||
|
customer_placeholder: "Search customers",
|
||||||
|
selected_customer: "Selected customer",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
common: {
|
||||||
|
clear: "Clear",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const mountComponent = (props = {}) =>
|
||||||
|
mountWithApp(CustomerSearchSelect, {
|
||||||
|
props: {
|
||||||
|
inputId: "test-customer-search",
|
||||||
|
testIdPrefix: "test-customer",
|
||||||
|
...props,
|
||||||
|
},
|
||||||
|
messages,
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("CustomerSearchSelect", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
searchMocks.isSearchingRef.value = false;
|
||||||
|
searchMocks.resultsRef.value = [];
|
||||||
|
searchMocks.searchCustomer.mockImplementation((query) => {
|
||||||
|
searchMocks.resultsRef.value = query ? customers : [];
|
||||||
|
return Promise.resolve(searchMocks.resultsRef.value);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("searches customers and emits the selected customer", async () => {
|
||||||
|
const wrapper = mountComponent();
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="test-customer-input"]').setValue("acme");
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(searchMocks.searchCustomer).toHaveBeenLastCalledWith("acme");
|
||||||
|
expect(wrapper.get('[data-testid="test-customer-option-0"]').text()).toContain("Acme Transport");
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="test-customer-option-0"]').trigger("mousedown");
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(wrapper.emitted("update:modelValue").at(-1)).toEqual([customers[0]]);
|
||||||
|
expect(wrapper.emitted("selected").at(-1)).toEqual([customers[0]]);
|
||||||
|
await wrapper.setProps({ modelValue: customers[0] });
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(wrapper.get('[data-testid="test-customer-selected"]').text()).toContain("Acme Transport");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("supports keyboard selection and clearing", async () => {
|
||||||
|
const wrapper = mountComponent();
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="test-customer-input"]').setValue("nordic");
|
||||||
|
await wrapper.get('[data-testid="test-customer-input"]').trigger("keydown", { key: "ArrowDown" });
|
||||||
|
await wrapper.get('[data-testid="test-customer-input"]').trigger("keydown", { key: "ArrowDown" });
|
||||||
|
await wrapper.get('[data-testid="test-customer-input"]').trigger("keydown", { key: "Enter" });
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(wrapper.emitted("update:modelValue").at(-1)).toEqual([customers[1]]);
|
||||||
|
await wrapper.setProps({ modelValue: customers[1] });
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="test-customer-clear"]').trigger("click");
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(wrapper.emitted("update:modelValue").at(-1)).toEqual([null]);
|
||||||
|
expect(wrapper.emitted("cleared")).toHaveLength(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { endOfLocalDate, formatLocalDateOnly, parseLocalDateOnly, startOfLocalDate } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
|
describe("date-only helpers", () => {
|
||||||
|
it("formats Date objects from their local calendar date", () => {
|
||||||
|
expect(formatLocalDateOnly(new Date(2026, 2, 31, 0, 0, 0, 0))).toBe("2026-03-31");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("parses date input values as local calendar dates", () => {
|
||||||
|
const parsed = parseLocalDateOnly("2026-03-31");
|
||||||
|
|
||||||
|
expect(parsed.getFullYear()).toBe(2026);
|
||||||
|
expect(parsed.getMonth()).toBe(2);
|
||||||
|
expect(parsed.getDate()).toBe(31);
|
||||||
|
expect(formatLocalDateOnly(parsed)).toBe("2026-03-31");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps date-only prefixes from API timestamps without timezone reinterpretation", () => {
|
||||||
|
expect(formatLocalDateOnly("2026-03-31T23:30:00.000Z")).toBe("2026-03-31");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects impossible date input values", () => {
|
||||||
|
expect(Number.isNaN(parseLocalDateOnly("2026-02-31").getTime())).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("builds local day boundaries from the selected date", () => {
|
||||||
|
expect(startOfLocalDate("2026-03-31").getHours()).toBe(0);
|
||||||
|
expect(startOfLocalDate("2026-03-31").getMinutes()).toBe(0);
|
||||||
|
expect(endOfLocalDate("2026-03-31").getHours()).toBe(23);
|
||||||
|
expect(endOfLocalDate("2026-03-31").getMinutes()).toBe(59);
|
||||||
|
expect(formatLocalDateOnly(endOfLocalDate("2026-03-31"))).toBe("2026-03-31");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -122,6 +122,32 @@ describe("DatePeriodSelector mobile layout", () => {
|
|||||||
expect(formatLocalDate(onSelectionChange.mock.calls[0][0])).toBe("2026-03-01");
|
expect(formatLocalDate(onSelectionChange.mock.calls[0][0])).toBe("2026-03-01");
|
||||||
expect(formatLocalDate(onSelectionChange.mock.calls[0][1])).toBe("2026-03-05");
|
expect(formatLocalDate(onSelectionChange.mock.calls[0][1])).toBe("2026-03-05");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("emits the exact clicked date for start and end inputs", async () => {
|
||||||
|
sharedState.width.value = 1024;
|
||||||
|
const onSelectionChange = vi.fn();
|
||||||
|
const wrapper = mount(DatePeriodSelector, {
|
||||||
|
props: {
|
||||||
|
selection: {
|
||||||
|
startDate: new Date(2026, 2, 1, 0, 0, 0, 0),
|
||||||
|
endDate: new Date(2026, 2, 3, 23, 59, 59, 999),
|
||||||
|
},
|
||||||
|
onSelectionChange,
|
||||||
|
visibility: {
|
||||||
|
showUpdateButton: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await wrapper.get("[data-testid='date-period-start']").setValue("2026-03-31");
|
||||||
|
await wrapper.get("[data-testid='date-period-end']").setValue("2026-04-02");
|
||||||
|
|
||||||
|
const emittedSelection = wrapper.emitted("update:selection")?.at(-1)?.[0];
|
||||||
|
expect(formatLocalDate(emittedSelection.startDate)).toBe("2026-03-31");
|
||||||
|
expect(formatLocalDate(emittedSelection.endDate)).toBe("2026-04-02");
|
||||||
|
expect(formatLocalDate(onSelectionChange.mock.calls.at(-1)[0])).toBe("2026-03-31");
|
||||||
|
expect(formatLocalDate(onSelectionChange.mock.calls.at(-1)[1])).toBe("2026-04-02");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("DatePeriodSelector month warning", () => {
|
describe("DatePeriodSelector month warning", () => {
|
||||||
|
|||||||
@@ -0,0 +1,178 @@
|
|||||||
|
// @vitest-environment jsdom
|
||||||
|
import { flushPromises, mount } from "@vue/test-utils";
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
const mocks = vi.hoisted(() => ({
|
||||||
|
setEnabled: vi.fn(),
|
||||||
|
showDeleteObjectForm: vi.fn(),
|
||||||
|
showEditObjectFieldForm: vi.fn(),
|
||||||
|
hasPermission: vi.fn(),
|
||||||
|
canAccessSuperUser: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("vue-i18n", () => ({
|
||||||
|
useI18n: () => ({
|
||||||
|
t: (key) =>
|
||||||
|
({
|
||||||
|
"common.yes": "Yes",
|
||||||
|
"common.no": "No",
|
||||||
|
"global.delete": "Delete",
|
||||||
|
"tables.showing": "Showing",
|
||||||
|
}[key] ?? key),
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/session/token/SessionUser.vue", () => ({
|
||||||
|
SessionUser: {
|
||||||
|
hasPermission: mocks.hasPermission,
|
||||||
|
canAccessSuperUser: mocks.canAccessSuperUser,
|
||||||
|
objects: {
|
||||||
|
global: {
|
||||||
|
icons: {
|
||||||
|
delete: "fas fa-trash",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
department_notification_sms: {
|
||||||
|
meta: {
|
||||||
|
labels: {
|
||||||
|
multiple: "notification phone numbers",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
columns: {
|
||||||
|
id: { label: "ID" },
|
||||||
|
label: { label: "Label" },
|
||||||
|
phone_country_code: { label: "Country code" },
|
||||||
|
phone: { label: "Phone" },
|
||||||
|
enabled: { label: "Enabled" },
|
||||||
|
},
|
||||||
|
set: {
|
||||||
|
enabled: mocks.setEnabled,
|
||||||
|
},
|
||||||
|
showEditObjectFieldForm: mocks.showEditObjectFieldForm,
|
||||||
|
functions: {
|
||||||
|
showDeleteObjectForm: mocks.showDeleteObjectForm,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/displays/buttons/EditableTableColumn.vue", () => ({
|
||||||
|
default: {
|
||||||
|
name: "EditableTableColumn",
|
||||||
|
props: {
|
||||||
|
object: Object,
|
||||||
|
column: String,
|
||||||
|
loadList: Function,
|
||||||
|
},
|
||||||
|
template: `<td :data-testid="\`editable-\${column}-\${object.id}\`">{{ object[column] }}</td>`,
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/displays/buttons/ActionSettingsWheelButton.vue", () => ({
|
||||||
|
default: {
|
||||||
|
name: "ActionSettingsWheelButton",
|
||||||
|
template: `<div><slot name="actions" /></div>`,
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/displays/buttons/ActionSettingsWheelItem.vue", () => ({
|
||||||
|
default: {
|
||||||
|
name: "ActionSettingsWheelItem",
|
||||||
|
props: {
|
||||||
|
testId: String,
|
||||||
|
label: String,
|
||||||
|
disabled: Boolean,
|
||||||
|
},
|
||||||
|
emits: ["click"],
|
||||||
|
template: `<button type="button" :data-testid="testId" :disabled="disabled" @click="$emit('click')">{{ label }}</button>`,
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/displays/permissionbased/RequiresPermission.vue", () => ({
|
||||||
|
default: {
|
||||||
|
name: "RequiresPermission",
|
||||||
|
props: {
|
||||||
|
permission: String,
|
||||||
|
},
|
||||||
|
template: `<slot />`,
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
import DepartmentNotificationsPhoneTable from "@/components/displays/department/notifications/departmentNotificationsPhoneTable.vue";
|
||||||
|
|
||||||
|
const mountTable = (props = {}) =>
|
||||||
|
mount(DepartmentNotificationsPhoneTable, {
|
||||||
|
props: {
|
||||||
|
objects: [
|
||||||
|
{
|
||||||
|
id: 10,
|
||||||
|
label: "Dispatch line",
|
||||||
|
phone_country_code: 45,
|
||||||
|
phone: 12345678,
|
||||||
|
enabled: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
loadList: vi.fn().mockResolvedValue({}),
|
||||||
|
...props,
|
||||||
|
},
|
||||||
|
global: {
|
||||||
|
mocks: {
|
||||||
|
$t: (key) =>
|
||||||
|
({
|
||||||
|
"tables.showing": "Showing",
|
||||||
|
}[key] ?? key),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("DepartmentNotificationsPhoneTable", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
mocks.setEnabled.mockReset();
|
||||||
|
mocks.showDeleteObjectForm.mockReset();
|
||||||
|
mocks.showEditObjectFieldForm.mockReset();
|
||||||
|
mocks.hasPermission.mockReset();
|
||||||
|
mocks.canAccessSuperUser.mockReset();
|
||||||
|
|
||||||
|
mocks.setEnabled.mockResolvedValue({});
|
||||||
|
mocks.hasPermission.mockReturnValue(true);
|
||||||
|
mocks.canAccessSuperUser.mockReturnValue(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("updates enabled state and reloads the provided paginated list", async () => {
|
||||||
|
const loadList = vi.fn().mockResolvedValue("reloaded");
|
||||||
|
const wrapper = mountTable({ loadList });
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="department-notification-sms-enabled-toggle-10"]').setValue(false);
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
expect(mocks.setEnabled).toHaveBeenCalledWith(10, false);
|
||||||
|
expect(loadList).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rolls back the switch and skips reload when the enabled update fails", async () => {
|
||||||
|
const error = new Error("Not Found");
|
||||||
|
const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
|
||||||
|
mocks.setEnabled.mockRejectedValueOnce(error);
|
||||||
|
const loadList = vi.fn().mockResolvedValue("reloaded");
|
||||||
|
const wrapper = mountTable({ loadList });
|
||||||
|
const toggle = wrapper.get('[data-testid="department-notification-sms-enabled-toggle-10"]');
|
||||||
|
|
||||||
|
await toggle.setValue(false);
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
expect(toggle.element.checked).toBe(true);
|
||||||
|
expect(loadList).not.toHaveBeenCalled();
|
||||||
|
expect(errorSpy).toHaveBeenCalledWith("Unable to update department notification SMS active state", error);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("passes the provided paginated list reload callback to delete", async () => {
|
||||||
|
const loadList = vi.fn().mockResolvedValue("reloaded");
|
||||||
|
const wrapper = mountTable({ loadList });
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="department-notification-sms-delete-10"]').trigger("click");
|
||||||
|
|
||||||
|
expect(mocks.showDeleteObjectForm).toHaveBeenCalledWith(10, loadList);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
import { defineComponent, nextTick } from "vue";
|
import { defineComponent, nextTick } from "vue";
|
||||||
import { mount } from "@vue/test-utils";
|
import { mount } from "@vue/test-utils";
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { formatLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
|
||||||
const selectDateMock = vi.hoisted(() => vi.fn());
|
const selectDateMock = vi.hoisted(() => vi.fn());
|
||||||
const sharedDateState = vi.hoisted(() => ({
|
const sharedDateState = vi.hoisted(() => ({
|
||||||
@@ -39,10 +40,10 @@ const DatePeriodSelectorStub = defineComponent({
|
|||||||
emits: ["update:selection"],
|
emits: ["update:selection"],
|
||||||
template: `
|
template: `
|
||||||
<div>
|
<div>
|
||||||
<button class="trigger-on-selection-change" @click="onSelectionChange(new Date('2026-03-24T00:00:00.000Z'), new Date('2026-03-29T00:00:00.000Z'))">
|
<button class="trigger-on-selection-change" @click="onSelectionChange(new Date(2026, 2, 24), new Date(2026, 2, 29))">
|
||||||
onSelectionChange
|
onSelectionChange
|
||||||
</button>
|
</button>
|
||||||
<button class="trigger-update-selection" @click="$emit('update:selection', { startDate: new Date('2026-04-01T00:00:00.000Z'), endDate: new Date('2026-04-30T00:00:00.000Z') })">
|
<button class="trigger-update-selection" @click="$emit('update:selection', { startDate: new Date(2026, 3, 1), endDate: new Date(2026, 3, 30) })">
|
||||||
update:selection
|
update:selection
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -105,7 +106,7 @@ describe("DepartmentDashboardOverviewNavigation", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const selector = wrapper.findComponent(DatePeriodSelectorStub);
|
const selector = wrapper.findComponent(DatePeriodSelectorStub);
|
||||||
expect(selector.props("selection").startDate.toISOString().split("T")[0]).toBe("2026-05-05");
|
expect(formatLocalDateOnly(selector.props("selection").startDate)).toBe("2026-05-05");
|
||||||
expect(selector.props("selection").endDate.toISOString().split("T")[0]).toBe("2026-05-11");
|
expect(formatLocalDateOnly(selector.props("selection").endDate)).toBe("2026-05-11");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,110 @@
|
|||||||
|
// @vitest-environment jsdom
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
import { mount } from "@vue/test-utils";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
vi.mock("vue-i18n", async (importOriginal) => {
|
||||||
|
const actual = await importOriginal();
|
||||||
|
|
||||||
|
return {
|
||||||
|
...actual,
|
||||||
|
useI18n: () => ({
|
||||||
|
t: (value) => value,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
vi.mock("@/components/session/token/SessionUser.vue", () => ({
|
||||||
|
SessionUser: {
|
||||||
|
objects: {
|
||||||
|
global: {
|
||||||
|
language: {
|
||||||
|
date_from: "From",
|
||||||
|
date_to: "To",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
import { formatLocalDateOnly } from "@/services/dateOnly.js";
|
||||||
|
import PaginationDisplayTemplateDate from "@/components/displays/pagination/templates/PaginationDisplayTemplateDate.vue";
|
||||||
|
import PaginationDisplayTemplateDates from "@/components/displays/pagination/templates/PaginationDisplayTemplateDates.vue";
|
||||||
|
import { dateFunctions } from "@/components/displays/pagination/PaginationDisplayDates.vue";
|
||||||
|
|
||||||
|
const PaginationDisplayItemColumnStub = defineComponent({
|
||||||
|
name: "PaginationDisplayItemColumn",
|
||||||
|
props: {
|
||||||
|
label: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
template: "<div><slot name='control' /></div>",
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("pagination date selection", () => {
|
||||||
|
it("renders Date model values as the same local date", () => {
|
||||||
|
const wrapper = mount(PaginationDisplayTemplateDate, {
|
||||||
|
props: {
|
||||||
|
label: "Date",
|
||||||
|
modelValue: new Date(2026, 2, 31, 0, 0, 0, 0),
|
||||||
|
},
|
||||||
|
global: {
|
||||||
|
stubs: {
|
||||||
|
PaginationDisplayItemColumn: PaginationDisplayItemColumnStub,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(wrapper.get("input[type='date']").element.value).toBe("2026-03-31");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("emits the clicked input date as the same local date", async () => {
|
||||||
|
const wrapper = mount(PaginationDisplayTemplateDate, {
|
||||||
|
props: {
|
||||||
|
label: "Date",
|
||||||
|
modelValue: new Date(2026, 2, 1, 0, 0, 0, 0),
|
||||||
|
},
|
||||||
|
global: {
|
||||||
|
stubs: {
|
||||||
|
PaginationDisplayItemColumn: PaginationDisplayItemColumnStub,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await wrapper.get("input[type='date']").setValue("2026-03-31");
|
||||||
|
|
||||||
|
const emittedDate = wrapper.emitted("update:date")?.at(-1)?.[0];
|
||||||
|
expect(formatLocalDateOnly(emittedDate)).toBe("2026-03-31");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses the real first day of the month for month presets", () => {
|
||||||
|
const firstDay = dateFunctions.datePresetFunctions.month.firstDayOfMonth(new Date(2026, 4, 15, 12, 0, 0, 0));
|
||||||
|
|
||||||
|
expect(formatLocalDateOnly(firstDay)).toBe("2026-05-01");
|
||||||
|
expect(firstDay.getHours()).toBe(0);
|
||||||
|
expect(firstDay.getMinutes()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("emits both start and end updates from the paired date selector", async () => {
|
||||||
|
const wrapper = mount(PaginationDisplayTemplateDates, {
|
||||||
|
props: {
|
||||||
|
startDate: new Date(2026, 2, 1, 0, 0, 0, 0),
|
||||||
|
endDate: new Date(2026, 2, 31, 0, 0, 0, 0),
|
||||||
|
},
|
||||||
|
global: {
|
||||||
|
stubs: {
|
||||||
|
PaginationDisplayItemColumn: PaginationDisplayItemColumnStub,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const inputs = wrapper.findAll("input[type='date']");
|
||||||
|
await inputs[0].setValue("2026-04-01");
|
||||||
|
await inputs[1].setValue("2026-04-30");
|
||||||
|
|
||||||
|
expect(formatLocalDateOnly(wrapper.emitted("update:startDate")?.at(-1)?.[0])).toBe("2026-04-01");
|
||||||
|
expect(formatLocalDateOnly(wrapper.emitted("update:endDate")?.at(-1)?.[0])).toBe("2026-04-30");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { sourceMappings } from "../../scripts/playwright-pr-mapping.mjs";
|
import { fallbackChangePatterns, sourceMappings } from "../../scripts/playwright-pr-mapping.mjs";
|
||||||
|
|
||||||
const specsFor = (file) =>
|
const specsFor = (file) =>
|
||||||
sourceMappings
|
sourceMappings
|
||||||
@@ -7,9 +7,35 @@ const specsFor = (file) =>
|
|||||||
.flatMap((mapping) => mapping.specs);
|
.flatMap((mapping) => mapping.specs);
|
||||||
|
|
||||||
describe("Playwright PR mapping", () => {
|
describe("Playwright PR mapping", () => {
|
||||||
|
const triggersFallback = (file) => fallbackChangePatterns.some((pattern) => pattern.test(file));
|
||||||
|
|
||||||
it("maps user vehicle table changes to the user vehicles E2E coverage", () => {
|
it("maps user vehicle table changes to the user vehicles E2E coverage", () => {
|
||||||
expect(specsFor("src/components/displays/user/vehicles/vehiclesTable.vue")).toContain(
|
expect(specsFor("src/components/displays/user/vehicles/vehiclesTable.vue")).toContain(
|
||||||
"tests/e2e/userVehicles.spec.ts"
|
"tests/e2e/userVehicles.spec.ts"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("maps department notification table changes to the admin notification E2E coverage", () => {
|
||||||
|
expect(
|
||||||
|
specsFor("src/components/displays/department/notifications/departmentNotificationsPhoneTable.vue")
|
||||||
|
).toContain("tests/e2e/admin-department-notifications.spec.ts");
|
||||||
|
expect(
|
||||||
|
specsFor("src/components/displays/pagination/models/DepartmentPos/NotificationsPhonePagination.vue")
|
||||||
|
).toContain("tests/e2e/admin-department-notifications.spec.ts");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("maps superuser role permission page changes to role permissions E2E coverage", () => {
|
||||||
|
expect(specsFor("src/views/dashboards/superUserDashboard/roles/SuperUserRolesPermissions.vue")).toContain(
|
||||||
|
"tests/e2e/superuser-roles-permissions.spec.ts"
|
||||||
|
);
|
||||||
|
expect(specsFor("src/views/dashboards/superUserDashboard/roles/rolePermissionCatalog.js")).toContain(
|
||||||
|
"tests/e2e/superuser-roles-permissions.spec.ts"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps full-slice ownership metadata out of broad PR smoke fallback", () => {
|
||||||
|
expect(triggersFallback("scripts/run-playwright-pr.mjs")).toBe(true);
|
||||||
|
expect(triggersFallback("scripts/run-playwright-ci-parallel.mjs")).toBe(true);
|
||||||
|
expect(triggersFallback("scripts/run-playwright-full-slice.mjs")).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -93,6 +93,8 @@ vi.mock("@/components/session/token/SessionUser.vue", () => ({
|
|||||||
reference: vi.fn(),
|
reference: vi.fn(),
|
||||||
reg_1: vi.fn(),
|
reg_1: vi.fn(),
|
||||||
reg_2: vi.fn(),
|
reg_2: vi.fn(),
|
||||||
|
reg_3: vi.fn(),
|
||||||
|
safety_seal: vi.fn(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
order_bookings: {
|
order_bookings: {
|
||||||
@@ -152,6 +154,8 @@ import {
|
|||||||
getVehiclePlateBookings,
|
getVehiclePlateBookings,
|
||||||
invoiceCollectionId,
|
invoiceCollectionId,
|
||||||
loadOrderItems,
|
loadOrderItems,
|
||||||
|
nextStep,
|
||||||
|
nextStepDelay,
|
||||||
order_id,
|
order_id,
|
||||||
order_items,
|
order_items,
|
||||||
hydrateSelectedOrderBookingForDesktop,
|
hydrateSelectedOrderBookingForDesktop,
|
||||||
@@ -163,7 +167,10 @@ import {
|
|||||||
reg_2,
|
reg_2,
|
||||||
reg_3,
|
reg_3,
|
||||||
pendingBookings,
|
pendingBookings,
|
||||||
|
previousStep,
|
||||||
|
registerPosStepSaveBarrier,
|
||||||
restoreStoredPosOrderId,
|
restoreStoredPosOrderId,
|
||||||
|
saveOrderMetadataField,
|
||||||
searchAndSelectCustomer,
|
searchAndSelectCustomer,
|
||||||
setOrderId,
|
setOrderId,
|
||||||
scan_data,
|
scan_data,
|
||||||
@@ -172,6 +179,122 @@ import {
|
|||||||
step,
|
step,
|
||||||
} from "@/components/shop/POSDepartmentProcess.vue";
|
} from "@/components/shop/POSDepartmentProcess.vue";
|
||||||
|
|
||||||
|
describe("POSDepartmentProcess order metadata persistence", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
window.history.replaceState({}, "", "/admin/12/modules/pos?step=2");
|
||||||
|
clearActivePosOrderContext({ clearStep: true });
|
||||||
|
localStorage.setItem("token", "test-token");
|
||||||
|
nextStepDelay.value = 0;
|
||||||
|
order_id.value = 54518;
|
||||||
|
customer_id.value = 999;
|
||||||
|
customer_name.value = "Card Terminal Customer";
|
||||||
|
customer_data.value = {};
|
||||||
|
department_id.value = 12;
|
||||||
|
step.value = 2;
|
||||||
|
Object.values(SessionUser.objects.orders.set).forEach((setter) => setter.mockReset?.());
|
||||||
|
});
|
||||||
|
|
||||||
|
it("applies saved metadata responses to shared POS state", async () => {
|
||||||
|
SessionUser.objects.orders.set.reference.mockResolvedValueOnce({
|
||||||
|
data: {
|
||||||
|
data: {
|
||||||
|
id: 54518,
|
||||||
|
customer_id: 999,
|
||||||
|
department_id: 12,
|
||||||
|
reference: "STEP-2-REF",
|
||||||
|
notes: "Visible note",
|
||||||
|
po: "PO-STEP-2",
|
||||||
|
safety_seal: "SEAL-1",
|
||||||
|
reg_1: "aa 12345",
|
||||||
|
reg_2: "",
|
||||||
|
reg_3: "",
|
||||||
|
invoice_collection_id: 200,
|
||||||
|
completed_at: null,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(saveOrderMetadataField("reference", "STEP-2-REF", 54518)).resolves.toBe("STEP-2-REF");
|
||||||
|
|
||||||
|
expect(SessionUser.objects.orders.set.reference).toHaveBeenCalledWith(54518, "STEP-2-REF");
|
||||||
|
expect(reference.value).toBe("STEP-2-REF");
|
||||||
|
expect(order_notes.value).toBe("Visible note");
|
||||||
|
expect(order_po.value).toBe("PO-STEP-2");
|
||||||
|
expect(order_safety_seal.value).toBe("SEAL-1");
|
||||||
|
expect(reg_1.value).toBe("AA12345");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves registration input formatting for the save request and normalizes shared state", async () => {
|
||||||
|
SessionUser.objects.orders.set.reg_1.mockResolvedValueOnce({
|
||||||
|
data: {
|
||||||
|
data: {
|
||||||
|
id: 54518,
|
||||||
|
reg_1: "CD1234",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(saveOrderMetadataField("reg_1", "cd-12 34", 54518)).resolves.toBe("CD1234");
|
||||||
|
|
||||||
|
expect(SessionUser.objects.orders.set.reg_1).toHaveBeenCalledWith(54518, "CD-12 34");
|
||||||
|
expect(reg_1.value).toBe("CD1234");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("waits for registered field saves before moving from step 2 to step 3", async () => {
|
||||||
|
let resolveBarrier;
|
||||||
|
const barrier = vi.fn(
|
||||||
|
() =>
|
||||||
|
new Promise((resolve) => {
|
||||||
|
resolveBarrier = () => {
|
||||||
|
reference.value = "BARRIER-SAVED";
|
||||||
|
resolve();
|
||||||
|
};
|
||||||
|
})
|
||||||
|
);
|
||||||
|
const unregister = registerPosStepSaveBarrier(barrier);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const moveToNextStep = nextStep({ isMobile: false, orderCreation: false });
|
||||||
|
await Promise.resolve();
|
||||||
|
|
||||||
|
expect(barrier).toHaveBeenCalledTimes(1);
|
||||||
|
expect(window.location.search).toBe("?step=2");
|
||||||
|
|
||||||
|
resolveBarrier();
|
||||||
|
await moveToNextStep;
|
||||||
|
|
||||||
|
expect(reference.value).toBe("BARRIER-SAVED");
|
||||||
|
expect(window.location.search).toContain("step=3");
|
||||||
|
expect(window.location.search).toContain("id=54518");
|
||||||
|
expect(window.location.search).toContain("customer_id=999");
|
||||||
|
} finally {
|
||||||
|
unregister();
|
||||||
|
nextStepDelay.value = 0;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("waits for registered field saves before moving backward", async () => {
|
||||||
|
step.value = 3;
|
||||||
|
window.history.replaceState({}, "", "/admin/12/modules/pos?id=54518&customer_id=999&step=3");
|
||||||
|
const barrier = vi.fn(async () => {
|
||||||
|
order_po.value = "PO-BACK-SAVED";
|
||||||
|
});
|
||||||
|
const unregister = registerPosStepSaveBarrier(barrier);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await previousStep();
|
||||||
|
|
||||||
|
expect(barrier).toHaveBeenCalledTimes(1);
|
||||||
|
expect(order_po.value).toBe("PO-BACK-SAVED");
|
||||||
|
expect(step.value).toBe(2);
|
||||||
|
expect(window.location.search).toContain("step=2");
|
||||||
|
} finally {
|
||||||
|
unregister();
|
||||||
|
nextStepDelay.value = 0;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("POSDepartmentProcess.ensureVehiclePlateBookingsLoaded", () => {
|
describe("POSDepartmentProcess.ensureVehiclePlateBookingsLoaded", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
department_id.value = 531;
|
department_id.value = 531;
|
||||||
|
|||||||
@@ -0,0 +1,160 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
import {
|
||||||
|
filterPermissionRecords,
|
||||||
|
getPermissionDelta,
|
||||||
|
groupPermissionRecords,
|
||||||
|
humanizeEndpoint,
|
||||||
|
humanizePermissionKey,
|
||||||
|
normalizePermissionCatalog,
|
||||||
|
sanitizePermissionDomId,
|
||||||
|
} from "../../src/views/dashboards/superUserDashboard/roles/rolePermissionCatalog.js";
|
||||||
|
|
||||||
|
const catalog = {
|
||||||
|
"/orders": {
|
||||||
|
GET: {
|
||||||
|
list_orders: "List orders",
|
||||||
|
},
|
||||||
|
POST: {
|
||||||
|
add_order: "Add an order",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/admin/bookings": {
|
||||||
|
POST: {
|
||||||
|
create_bookings: "Create bookings",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/superuser/system/replication": {
|
||||||
|
GET: {
|
||||||
|
superuser_replication_view: "View replication status",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const departments = [
|
||||||
|
{
|
||||||
|
id: 7,
|
||||||
|
name: "Copenhagen",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const permissionOverrides = {
|
||||||
|
user: {
|
||||||
|
label: "User",
|
||||||
|
description: "Allows access to user dashboard pages.",
|
||||||
|
groupKey: "access",
|
||||||
|
},
|
||||||
|
admin: {
|
||||||
|
label: "Admin",
|
||||||
|
description: "Allows access to admin dashboard pages.",
|
||||||
|
groupKey: "access",
|
||||||
|
},
|
||||||
|
superuser: {
|
||||||
|
label: "Superuser",
|
||||||
|
description: "Allows access to superuser dashboard pages.",
|
||||||
|
groupKey: "access",
|
||||||
|
},
|
||||||
|
department_access_7: {
|
||||||
|
label: "Copenhagen",
|
||||||
|
description: "Allows access to Copenhagen.",
|
||||||
|
groupKey: "access",
|
||||||
|
departmentId: 7,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
describe("role permission catalog helpers", () => {
|
||||||
|
it("normalizes route permissions and virtual access permissions", () => {
|
||||||
|
const records = normalizePermissionCatalog(catalog, {
|
||||||
|
departments,
|
||||||
|
permissionOverrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(records.map((record) => record.permission)).toEqual(
|
||||||
|
expect.arrayContaining([
|
||||||
|
"user",
|
||||||
|
"admin",
|
||||||
|
"superuser",
|
||||||
|
"department_access_7",
|
||||||
|
"list_orders",
|
||||||
|
"add_order",
|
||||||
|
"create_bookings",
|
||||||
|
"superuser_replication_view",
|
||||||
|
])
|
||||||
|
);
|
||||||
|
expect(records.find((record) => record.permission === "department_access_7")).toMatchObject({
|
||||||
|
groupKey: "access",
|
||||||
|
label: "Copenhagen",
|
||||||
|
description: "Allows access to Copenhagen.",
|
||||||
|
isVirtual: true,
|
||||||
|
});
|
||||||
|
expect(records.find((record) => record.permission === "list_orders")).toMatchObject({
|
||||||
|
groupKey: "orders_pos",
|
||||||
|
label: "List orders",
|
||||||
|
description: "List orders",
|
||||||
|
endpoint: "/orders",
|
||||||
|
endpointLabel: "Orders",
|
||||||
|
method: "GET",
|
||||||
|
});
|
||||||
|
expect(records.find((record) => record.permission === "create_bookings")).toMatchObject({
|
||||||
|
groupKey: "bookings",
|
||||||
|
});
|
||||||
|
expect(records.find((record) => record.permission === "superuser_replication_view")).toMatchObject({
|
||||||
|
groupKey: "system_config",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("searches labels, descriptions, keys, endpoints, and methods", () => {
|
||||||
|
const records = normalizePermissionCatalog(catalog, {
|
||||||
|
departments,
|
||||||
|
permissionOverrides,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(filterPermissionRecords(records, "copenhagen").map((record) => record.permission)).toEqual([
|
||||||
|
"department_access_7",
|
||||||
|
]);
|
||||||
|
expect(filterPermissionRecords(records, "POST").map((record) => record.permission)).toEqual(
|
||||||
|
expect.arrayContaining(["add_order", "create_bookings"])
|
||||||
|
);
|
||||||
|
expect(filterPermissionRecords(records, "replication status").map((record) => record.permission)).toEqual([
|
||||||
|
"superuser_replication_view",
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("groups records by stable group key", () => {
|
||||||
|
const grouped = groupPermissionRecords(
|
||||||
|
normalizePermissionCatalog(catalog, {
|
||||||
|
departments,
|
||||||
|
permissionOverrides,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(grouped.get("access").map((record) => record.permission)).toEqual(
|
||||||
|
expect.arrayContaining(["user", "admin", "superuser", "department_access_7"])
|
||||||
|
);
|
||||||
|
expect(grouped.get("orders_pos").map((record) => record.permission)).toEqual(
|
||||||
|
expect.arrayContaining(["list_orders", "add_order"])
|
||||||
|
);
|
||||||
|
expect(grouped.get("bookings").map((record) => record.permission)).toEqual(["create_bookings"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("calculates bulk add and remove deltas without no-op requests", () => {
|
||||||
|
const records = normalizePermissionCatalog(catalog, {
|
||||||
|
departments,
|
||||||
|
permissionOverrides,
|
||||||
|
}).filter((record) => ["list_orders", "add_order"].includes(record.permission));
|
||||||
|
|
||||||
|
expect(getPermissionDelta(records, new Set(["list_orders"]), true)).toEqual({
|
||||||
|
add: ["add_order"],
|
||||||
|
remove: [],
|
||||||
|
});
|
||||||
|
expect(getPermissionDelta(records, new Set(["list_orders"]), false)).toEqual({
|
||||||
|
add: [],
|
||||||
|
remove: ["list_orders"],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("humanizes and sanitizes permission display values", () => {
|
||||||
|
expect(humanizePermissionKey("superuser_replication_view")).toBe("Superuser replication view");
|
||||||
|
expect(humanizeEndpoint("/superuser/system/replication")).toBe("Superuser system replication");
|
||||||
|
expect(sanitizePermissionDomId("department/access 7")).toBe("department-access-7");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
// @vitest-environment jsdom
|
||||||
|
import { nextTick } from "vue";
|
||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { mountWithApp } from "./helpers/mountWithApp.js";
|
||||||
|
|
||||||
|
const sessionMocks = vi.hoisted(() => ({
|
||||||
|
addVehicle: vi.fn(),
|
||||||
|
parseErrorMessage: vi.fn(),
|
||||||
|
vehicleTypeOptions: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/session/token/SessionUser.vue", () => {
|
||||||
|
const sessionUser = {
|
||||||
|
functions: {
|
||||||
|
parseErrorMessage: sessionMocks.parseErrorMessage,
|
||||||
|
},
|
||||||
|
objects: {
|
||||||
|
vehicles: {
|
||||||
|
add: sessionMocks.addVehicle,
|
||||||
|
columns: {
|
||||||
|
type: {
|
||||||
|
options: sessionMocks.vehicleTypeOptions,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
SessionUser: sessionUser,
|
||||||
|
default: sessionUser,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
import SuperuserAddVehicleModal from "@/components/forms/superUser/SuperuserAddVehicleModal.vue";
|
||||||
|
|
||||||
|
const CustomerSearchSelectStub = {
|
||||||
|
props: ["modelValue"],
|
||||||
|
emits: ["update:modelValue"],
|
||||||
|
template: `
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
data-testid="customer-select-stub"
|
||||||
|
@click="$emit('update:modelValue', { customerNumber: 12345679, name: 'Acme Transport' })"
|
||||||
|
>
|
||||||
|
Select customer
|
||||||
|
</button>
|
||||||
|
`,
|
||||||
|
};
|
||||||
|
|
||||||
|
const messages = {
|
||||||
|
en: {
|
||||||
|
vehicles: {
|
||||||
|
add_modal: {
|
||||||
|
customer_label: "Customer",
|
||||||
|
customer_placeholder: "Search customers",
|
||||||
|
error: "Unable to add vehicle.",
|
||||||
|
reference_placeholder: "Optional reference",
|
||||||
|
registration_placeholder: "Registration number",
|
||||||
|
selected_customer: "Selected customer",
|
||||||
|
submit: "Add vehicle",
|
||||||
|
title: "Add vehicle",
|
||||||
|
type_load_error: "Unable to load vehicle types.",
|
||||||
|
type_placeholder: "Select vehicle type",
|
||||||
|
validation_error: "Select required fields.",
|
||||||
|
},
|
||||||
|
form: {
|
||||||
|
license_plate: "Registration",
|
||||||
|
type: "Type",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
objects: {
|
||||||
|
vehicles: {
|
||||||
|
columns: {
|
||||||
|
wash_subscription: "Wash subscription",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
common: {
|
||||||
|
cancel: "Cancel",
|
||||||
|
close: "Close",
|
||||||
|
reference: "Reference",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const flushAll = async () => {
|
||||||
|
await Promise.resolve();
|
||||||
|
await nextTick();
|
||||||
|
await Promise.resolve();
|
||||||
|
await nextTick();
|
||||||
|
};
|
||||||
|
|
||||||
|
const mountComponent = () =>
|
||||||
|
mountWithApp(SuperuserAddVehicleModal, {
|
||||||
|
messages,
|
||||||
|
global: {
|
||||||
|
stubs: {
|
||||||
|
CustomerSearchSelect: CustomerSearchSelectStub,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("SuperuserAddVehicleModal", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
sessionMocks.vehicleTypeOptions.mockResolvedValue([
|
||||||
|
{
|
||||||
|
id: 53,
|
||||||
|
name: "Forvogn",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
sessionMocks.addVehicle.mockResolvedValue({
|
||||||
|
data: {
|
||||||
|
data: {
|
||||||
|
id: 7002,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
sessionMocks.parseErrorMessage.mockReturnValue(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("submits the selected customer and vehicle fields through the vehicle API", async () => {
|
||||||
|
const wrapper = mountComponent();
|
||||||
|
await flushAll();
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="customer-select-stub"]').trigger("click");
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-registration"]').setValue("ab12345");
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-type"]').setValue("53");
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-wash-subscription"]').setValue(true);
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-reference"]').setValue("Fleet ref");
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-submit"]').trigger("click");
|
||||||
|
await flushAll();
|
||||||
|
|
||||||
|
expect(sessionMocks.addVehicle).toHaveBeenCalledWith(53, "AB12345", true, 12345679, "Fleet ref");
|
||||||
|
expect(wrapper.emitted("created")).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps submit disabled until required fields are present", async () => {
|
||||||
|
const wrapper = mountComponent();
|
||||||
|
await flushAll();
|
||||||
|
|
||||||
|
expect(wrapper.get('[data-testid="superuser-add-vehicle-submit"]').attributes("disabled")).toBeDefined();
|
||||||
|
|
||||||
|
await wrapper.get('[data-testid="customer-select-stub"]').trigger("click");
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-registration"]').setValue("AB12345");
|
||||||
|
await wrapper.get('[data-testid="superuser-add-vehicle-type"]').setValue("53");
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
expect(wrapper.get('[data-testid="superuser-add-vehicle-submit"]').attributes("disabled")).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -367,6 +367,8 @@ describe("Invoice orders pagination contract", () => {
|
|||||||
expect(invoiceOrdersPaginationSource).toContain(
|
expect(invoiceOrdersPaginationSource).toContain(
|
||||||
"const onDateRangeSelected = (newSelectionStartDate, newSelectionToDate) => {"
|
"const onDateRangeSelected = (newSelectionStartDate, newSelectionToDate) => {"
|
||||||
);
|
);
|
||||||
|
expect(invoiceOrdersPaginationSource).toContain("formatLocalDateOnly(newSelectionStartDate)");
|
||||||
|
expect(invoiceOrdersPaginationSource).toContain("formatLocalDateOnly(newSelectionToDate)");
|
||||||
expect(invoiceOrdersPaginationSource).toContain("date_from.value = formattedStartDate;");
|
expect(invoiceOrdersPaginationSource).toContain("date_from.value = formattedStartDate;");
|
||||||
expect(invoiceOrdersPaginationSource).toContain("date_to.value = formattedEndDate;");
|
expect(invoiceOrdersPaginationSource).toContain("date_to.value = formattedEndDate;");
|
||||||
expect(invoiceOrdersPaginationSource).toContain('setFilter("created_at-date_from", formattedStartDate, true);');
|
expect(invoiceOrdersPaginationSource).toContain('setFilter("created_at-date_from", formattedStartDate, true);');
|
||||||
|
|||||||
@@ -85,4 +85,59 @@ describe("useOrderMetadataAutosave", () => {
|
|||||||
await Promise.resolve();
|
await Promise.resolve();
|
||||||
wrapper.unmount();
|
wrapper.unmount();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("flushAndWait waits for an in-flight save and persists the queued latest draft", async () => {
|
||||||
|
let resolveFirstSave;
|
||||||
|
const saveValue = vi.fn((value) => {
|
||||||
|
if (value === "first") {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
resolveFirstSave = () => resolve(value);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return Promise.resolve(value);
|
||||||
|
});
|
||||||
|
const { autosave, wrapper } = mountAutosave({ saveValue });
|
||||||
|
|
||||||
|
autosave.draft.value = "first";
|
||||||
|
const firstFlush = autosave.flush();
|
||||||
|
|
||||||
|
autosave.draft.value = "second";
|
||||||
|
const waitForSaves = autosave.flushAndWait();
|
||||||
|
await Promise.resolve();
|
||||||
|
|
||||||
|
expect(saveValue).toHaveBeenCalledTimes(1);
|
||||||
|
expect(saveValue).toHaveBeenNthCalledWith(1, "first");
|
||||||
|
|
||||||
|
resolveFirstSave();
|
||||||
|
await expect(firstFlush).resolves.toBe(true);
|
||||||
|
await expect(waitForSaves).resolves.toBe(false);
|
||||||
|
|
||||||
|
expect(saveValue).toHaveBeenCalledTimes(2);
|
||||||
|
expect(saveValue).toHaveBeenNthCalledWith(2, "second");
|
||||||
|
expect(autosave.lastSavedValue.value).toBe("second");
|
||||||
|
expect(autosave.isDirty.value).toBe(false);
|
||||||
|
|
||||||
|
wrapper.unmount();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("flushAndWait rejects when the dirty draft cannot be saved", async () => {
|
||||||
|
const saveError = new Error("server rejected metadata");
|
||||||
|
const saveValue = vi.fn(async () => {
|
||||||
|
throw saveError;
|
||||||
|
});
|
||||||
|
const { autosave, onError, wrapper } = mountAutosave({ saveValue });
|
||||||
|
|
||||||
|
autosave.draft.value = "rejected";
|
||||||
|
|
||||||
|
await expect(autosave.flushAndWait()).rejects.toThrow("server rejected metadata");
|
||||||
|
|
||||||
|
expect(saveValue).toHaveBeenCalledTimes(1);
|
||||||
|
expect(onError).toHaveBeenCalledWith(saveError);
|
||||||
|
expect(autosave.lastError.value).toBe(saveError);
|
||||||
|
expect(autosave.isDirty.value).toBe(true);
|
||||||
|
|
||||||
|
autosave.syncFromSource("rejected");
|
||||||
|
wrapper.unmount();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user