diff --git a/config/cors.php b/config/cors.php
index cf914da3..2c8d3814 100644
--- a/config/cors.php
+++ b/config/cors.php
@@ -29,6 +29,6 @@ return [
 
     'max_age' => 0,
 
-    'supports_credentials' => false, //cief todo: 137
+    'supports_credentials' => false,
 
 ];
diff --git a/resources/assets/sass/modules/_layout.scss b/resources/assets/sass/modules/_layout.scss
index dcd16f56..a0eed8a2 100644
--- a/resources/assets/sass/modules/_layout.scss
+++ b/resources/assets/sass/modules/_layout.scss
@@ -1576,8 +1576,6 @@ padding-right: 30px;
 .navbar-center, .navbar-center > li{
      float:none;
   display:inline-block;
-  *display:inline; /* ie7 fix */
-  *zoom:1; /* hasLayout ie7 trigger */
   vertical-align: top;
 }
 
@@ -2040,7 +2038,7 @@ padding-right: 30px;
 
 .mfp-figure:after {
 	box-shadow: none !important;
-	background: none !important;	
+	background: none !important;
 }
 
 .profile-picture {
diff --git a/resources/assets/vue/components/accounts/forms/CrossPlatformLoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/CrossPlatformLoginFormComponent.vue
index 2576926c..6ba930ee 100644
--- a/resources/assets/vue/components/accounts/forms/CrossPlatformLoginFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/CrossPlatformLoginFormComponent.vue
@@ -35,7 +35,7 @@ const props = defineProps<{
     section: string;
 }>();
 
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 const { submit } = useRequest();
 
 const parameters = ref({
diff --git a/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue b/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue
index bf7088fa..9dc364e6 100644
--- a/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/EmailVerificationFormComponent.vue
@@ -48,7 +48,7 @@ import { useModalFormHandler } from '@/composables/useModalFormHandler';
 import { useAuthStore } from '@/stores/auth';
 import { useUiStore } from '@/stores/ui';
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 const authStore = useAuthStore();
 const uiStore = useUiStore();
diff --git a/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue b/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
index c598c99c..2664ad3a 100644
--- a/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/ForgetPasswordFormComponent.vue
@@ -55,7 +55,7 @@ import { required, email } from '@vuelidate/validators'
 import { useRequest } from '@/composables/useRequest'
 import { useAuthStore } from '@/stores/auth';
 import { useUiStore } from '@/stores/ui'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     section: string
diff --git a/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue b/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue
index 8341a458..76029e70 100644
--- a/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/ResetPasswordFormComponent.vue
@@ -63,7 +63,7 @@ import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useRequest } from '@/composables/useRequest'
 import { useUiStore } from '@/stores/ui'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     section: string
diff --git a/resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
index 8eff28e8..a71d4979 100644
--- a/resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
@@ -27,6 +27,7 @@
 import { useComponentHandler } from '@/composables/useComponentHandler';
 import { useModalFormHandler } from '@/composables/useModalFormHandler';
 import { useRequest } from '@/composables/useRequest';
+import route from '@/general/functions/router';
 
 const props = defineProps<{
     section: string;
diff --git a/resources/assets/vue/components/addresses/forms/WarehouseAddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/WarehouseAddressFormComponent.vue
index 8df1e5aa..51977818 100644
--- a/resources/assets/vue/components/addresses/forms/WarehouseAddressFormComponent.vue
+++ b/resources/assets/vue/components/addresses/forms/WarehouseAddressFormComponent.vue
@@ -115,7 +115,7 @@ import { ref, onMounted, computed } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required, requiredIf } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 import { useAuthStore } from '@/stores/auth'
 
 interface Props {
diff --git a/resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue b/resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue
index 9d4864f0..03d95a5b 100644
--- a/resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue
+++ b/resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue
@@ -67,7 +67,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 const props = withDefaults(defineProps<{
     section?: string;
diff --git a/resources/assets/vue/components/announcements/forms/AssignAnnouncementToSegmentFormComponent.vue b/resources/assets/vue/components/announcements/forms/AssignAnnouncementToSegmentFormComponent.vue
index d2c65c24..b4698c09 100644
--- a/resources/assets/vue/components/announcements/forms/AssignAnnouncementToSegmentFormComponent.vue
+++ b/resources/assets/vue/components/announcements/forms/AssignAnnouncementToSegmentFormComponent.vue
@@ -41,7 +41,7 @@ import { ref, computed } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 import { useUiStore } from '@/stores/ui';
 
 interface Props {
diff --git a/resources/assets/vue/components/announcements/forms/DetachAnnouncementFromSegmentFormComponent.vue b/resources/assets/vue/components/announcements/forms/DetachAnnouncementFromSegmentFormComponent.vue
index ae4aff62..01076cd7 100644
--- a/resources/assets/vue/components/announcements/forms/DetachAnnouncementFromSegmentFormComponent.vue
+++ b/resources/assets/vue/components/announcements/forms/DetachAnnouncementFromSegmentFormComponent.vue
@@ -32,7 +32,7 @@
 <script setup lang="ts">
 import { useComponentHandler } from '@/composables/useComponentHandler';
 import { useModalFormHandler } from '@/composables/useModalFormHandler';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 const props = defineProps<{
     announcement_id: number;
diff --git a/resources/assets/vue/components/containers/elements/UploadDebtorExcelComponent.vue b/resources/assets/vue/components/containers/elements/UploadDebtorExcelComponent.vue
index 49461991..7aa4a481 100644
--- a/resources/assets/vue/components/containers/elements/UploadDebtorExcelComponent.vue
+++ b/resources/assets/vue/components/containers/elements/UploadDebtorExcelComponent.vue
@@ -52,7 +52,7 @@ import { ref, computed } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 import { useUiStore } from '@/stores/ui';
 
 interface Props {
diff --git a/resources/assets/vue/components/containers/forms/ContainerArrivalFormComponent.vue b/resources/assets/vue/components/containers/forms/ContainerArrivalFormComponent.vue
index cbd17ee8..2daea29b 100644
--- a/resources/assets/vue/components/containers/forms/ContainerArrivalFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/ContainerArrivalFormComponent.vue
@@ -40,7 +40,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     data: any
diff --git a/resources/assets/vue/components/containers/forms/ContainerCommentFormComponent.vue b/resources/assets/vue/components/containers/forms/ContainerCommentFormComponent.vue
index ef9efba4..0dc95087 100644
--- a/resources/assets/vue/components/containers/forms/ContainerCommentFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/ContainerCommentFormComponent.vue
@@ -15,7 +15,7 @@ import { ref, onMounted } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     id: number
diff --git a/resources/assets/vue/components/containers/forms/ContainerDepatureFormComponent.vue b/resources/assets/vue/components/containers/forms/ContainerDepatureFormComponent.vue
index b1c43f14..8a4ecfa4 100644
--- a/resources/assets/vue/components/containers/forms/ContainerDepatureFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/ContainerDepatureFormComponent.vue
@@ -40,7 +40,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     data: any
diff --git a/resources/assets/vue/components/containers/forms/CreateWarehouseTransportFormComponent.vue b/resources/assets/vue/components/containers/forms/CreateWarehouseTransportFormComponent.vue
index 4dd62fd9..366a1180 100644
--- a/resources/assets/vue/components/containers/forms/CreateWarehouseTransportFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/CreateWarehouseTransportFormComponent.vue
@@ -40,7 +40,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     packinglistId: number
diff --git a/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue b/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue
index be2278be..635d3a2e 100644
--- a/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue
@@ -41,7 +41,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     data?: any
diff --git a/resources/assets/vue/components/containers/forms/EditContainerCommentFormComponent.vue b/resources/assets/vue/components/containers/forms/EditContainerCommentFormComponent.vue
index f6d02a00..aa187af1 100644
--- a/resources/assets/vue/components/containers/forms/EditContainerCommentFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/EditContainerCommentFormComponent.vue
@@ -33,7 +33,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 import { useAuthStore } from '@/stores/auth';
 
 const authStore = useAuthStore();
diff --git a/resources/assets/vue/components/containers/forms/RescheduleDateFormComponent.vue b/resources/assets/vue/components/containers/forms/RescheduleDateFormComponent.vue
index 24f74f72..d68be328 100644
--- a/resources/assets/vue/components/containers/forms/RescheduleDateFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/RescheduleDateFormComponent.vue
@@ -40,7 +40,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     data: any
diff --git a/resources/assets/vue/components/containers/forms/RescheduleTransportDateFormComponent.vue b/resources/assets/vue/components/containers/forms/RescheduleTransportDateFormComponent.vue
index ded2914b..93f6e97d 100644
--- a/resources/assets/vue/components/containers/forms/RescheduleTransportDateFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/RescheduleTransportDateFormComponent.vue
@@ -40,7 +40,7 @@ import { ref } from 'vue'
 import { useVuelidate } from '@vuelidate/core'
 import { required } from '@vuelidate/validators'
 import { useModalFormHandler } from '@/composables/useModalFormHandler'
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 
 interface Props {
     section?: string
diff --git a/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue b/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue
index bbc8ed6d..1344dc81 100644
--- a/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue
+++ b/resources/assets/vue/components/containers/sections/PackingListSectionComponent.vue
@@ -40,7 +40,7 @@
 import { ref, onMounted } from 'vue'
 import { useComponentHandler } from '@/composables/useComponentHandler'
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router'
+import route from '@/general/functions/router';
 import LoadingComponent from '@/components/general/elements/LoadingComponent.vue'
 import PackingListComponent from '@/components/containers/elements/PackingListComponent.vue'
 
diff --git a/resources/assets/vue/components/general/elements/ListPollingComponent.vue b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
index 5ef6061d..f2c710fd 100644
--- a/resources/assets/vue/components/general/elements/ListPollingComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
@@ -68,6 +68,8 @@ const props = withDefaults(defineProps<{
     emptyListSection: true
 });
 
+const asset = window.Vapor.asset;
+
 const queueStore = useQueueStore();
 const uiStore = useUiStore();
 const jobPollingStore = useJobPollingStore();
diff --git a/resources/assets/vue/components/orders/elements/ListOrderComponent.vue b/resources/assets/vue/components/orders/elements/ListOrderComponent.vue
index ae1c627d..b9abea0c 100644
--- a/resources/assets/vue/components/orders/elements/ListOrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ListOrderComponent.vue
@@ -54,7 +54,7 @@ import { ref, computed, watch, onMounted } from 'vue';
 import { useRequest } from '@/composables/useRequest';
 import { useQueueStore } from '@/stores/queue';
 import { useUiStore } from '@/stores/ui';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 import PaginationComponent from '@/components/general/elements/PaginationComponent.vue';
 
 const asset = window.Vapor.asset;
diff --git a/resources/assets/vue/components/orders/elements/OrderComponent.vue b/resources/assets/vue/components/orders/elements/OrderComponent.vue
index d599acde..01489542 100644
--- a/resources/assets/vue/components/orders/elements/OrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderComponent.vue
@@ -158,7 +158,7 @@ import { useComponentHandler } from '@/composables/useComponentHandler';
 import { useRequest } from '@/composables/useRequest';
 import { useAuthStore } from '@/stores/auth';
 import { useCrudStore } from '@/stores/crud';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     data: any;
diff --git a/resources/assets/vue/components/orders/elements/OrderPackageOriginWarehouseComponent.vue b/resources/assets/vue/components/orders/elements/OrderPackageOriginWarehouseComponent.vue
index 4b5a7d73..4a21db89 100644
--- a/resources/assets/vue/components/orders/elements/OrderPackageOriginWarehouseComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderPackageOriginWarehouseComponent.vue
@@ -85,6 +85,8 @@ interface Props {
 
 const props = defineProps<Props>();
 
+const asset = window.Vapor.asset;
+
 const authStore = useAuthStore();
 const { submit } = useRequest();
 
diff --git a/resources/assets/vue/components/orders/elements/OrderPackageSummaryComponent.vue b/resources/assets/vue/components/orders/elements/OrderPackageSummaryComponent.vue
index 7a12fd6e..e610e2b9 100644
--- a/resources/assets/vue/components/orders/elements/OrderPackageSummaryComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderPackageSummaryComponent.vue
@@ -66,7 +66,7 @@
 import { ref, onMounted } from 'vue';
 import { useAuthStore } from '@/stores/auth';
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     order_number: string;
diff --git a/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue b/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue
index 64459bdf..38ccf82d 100644
--- a/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue
+++ b/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue
@@ -92,7 +92,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useAuthStore } from '@/stores/auth';
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     order_number: number;
@@ -100,6 +100,8 @@ interface Props {
 
 const props = defineProps<Props>();
 
+const asset = window.Vapor.asset;
+
 const authStore = useAuthStore();
 const { submit } = useRequest();
 
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index 79d6a56d..f5710766 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -223,7 +223,7 @@
 import { ref, onMounted } from 'vue';
 import { useAuthStore } from '@/stores/auth';
 import { useComponentHandler } from '@/composables/useComponentHandler';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 const asset = window.Vapor.asset;
 
 interface Props {
diff --git a/resources/assets/vue/components/orders/elements/PackageV2Component.vue b/resources/assets/vue/components/orders/elements/PackageV2Component.vue
index 2eb25d6a..f6f1340d 100644
--- a/resources/assets/vue/components/orders/elements/PackageV2Component.vue
+++ b/resources/assets/vue/components/orders/elements/PackageV2Component.vue
@@ -66,7 +66,7 @@
 import { ref, onMounted } from 'vue';
 import { useAuthStore } from '@/stores/auth';
 import { useComponentHandler } from '@/composables/useComponentHandler';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     data: any;
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 909beadf..7d83773a 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -108,7 +108,7 @@
 import { ref } from 'vue';
 import { useAuthStore } from '@/stores/auth';
 import { useComponentHandler } from '@/composables/useComponentHandler';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     data: any;
diff --git a/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue b/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue
index 2a51cea5..505819e4 100644
--- a/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/ClaimPackinglistFormComponent.vue
@@ -34,7 +34,7 @@ import { ref } from 'vue';
 import { required } from "@vuelidate/validators";
 import useVuelidate from '@vuelidate/core';
 import { useModalFormHandler } from '@/composables/useModalFormHandler';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     data?: number;
diff --git a/resources/assets/vue/components/orders/sections/DeliveryOrdersSectionComponent.vue b/resources/assets/vue/components/orders/sections/DeliveryOrdersSectionComponent.vue
index b3e9e553..fca8b3dd 100644
--- a/resources/assets/vue/components/orders/sections/DeliveryOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/DeliveryOrdersSectionComponent.vue
@@ -314,7 +314,7 @@ import { ref, reactive, computed } from 'vue';
 import { required } from "@vuelidate/validators";
 import useVuelidate from '@vuelidate/core';
 import { useUiStore } from '@/stores/ui';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 const uiStore = useUiStore();
 const section = 'createDelvieryOrderSectionComponent';
diff --git a/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue b/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue
index 635b71d0..8fb1db93 100644
--- a/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/DeliveryOrdersTableSectionComponent.vue
@@ -145,7 +145,7 @@ import { useAuthStore } from '@/stores/auth';
 import { useUiStore } from '@/stores/ui';
 import { useQueueStore } from '@/stores/queue';
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 import PaginationComponent from '@/components/general/elements/PaginationComponent.vue';
 
 interface Props {
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
index a2f48bae..edce7e79 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
@@ -206,7 +206,7 @@ import { useAuthStore } from '@/stores/auth';
 import { useQueueStore } from '@/stores/queue';
 import { useRequest } from '@/composables/useRequest';
 import { useCrudStore } from '@/stores/crud';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 interface Props {
     order_number: number;
diff --git a/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
index 2997c61b..96075eeb 100644
--- a/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
@@ -191,9 +191,11 @@ import { useAuthStore } from '@/stores/auth';
 import { useUiStore } from '@/stores/ui';
 import { useQueueStore } from '@/stores/queue';
 import { useRequest } from '@/composables/useRequest';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 import PaginationComponent from '@/components/general/elements/PaginationComponent.vue';
 
+const asset = window.Vapor.asset;
+
 const authStore = useAuthStore();
 const uiStore = useUiStore();
 const queueStore = useQueueStore();
diff --git a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
index a9200ffa..4e66504b 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
@@ -344,6 +344,7 @@ import { ref, computed, onMounted } from 'vue';
 import { useComponentHandler } from '@/composables/useComponentHandler';
 import { useRequest } from '@/composables/useRequest';
 import { useAuthStore } from '@/stores/auth';
+import route from '@/general/functions/router';
 
 const props = withDefaults(defineProps<{
     data: any;
diff --git a/resources/assets/vue/components/paymentsBilling/elements/ShippingTransactionComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/ShippingTransactionComponent.vue
index c2855120..8a0399ff 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/ShippingTransactionComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/ShippingTransactionComponent.vue
@@ -45,6 +45,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useComponentHandler } from '@/composables/useComponentHandler';
+import route from '@/general/functions/router';
 
 const props = defineProps<{
     data?: any;
diff --git a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue
index 8890d4d9..e525714e 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue
@@ -130,6 +130,7 @@
 import { ref } from 'vue';
 import { useComponentHandler } from '@/composables/useComponentHandler';
 import { useAuthStore } from '@/stores/auth';
+import route from '@/general/functions/router';
 
 const props = withDefaults(defineProps<{
     data: any;
diff --git a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentTransactionDetailsComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentTransactionDetailsComponent.vue
index 64354011..2218963b 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentTransactionDetailsComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentTransactionDetailsComponent.vue
@@ -45,6 +45,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
 import { useComponentHandler } from '@/composables/useComponentHandler';
+import route from '@/general/functions/router';
 
 const props = defineProps<{
     data?: any;
diff --git a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
index 2975d990..c459b7cd 100644
--- a/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
@@ -64,7 +64,7 @@ import { useVuelidate } from '@vuelidate/core';
 import { required } from "@vuelidate/validators";
 import { useModalFormHandler } from '@/composables/useModalFormHandler';
 import { useUiStore } from '@/stores/ui';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 const props = defineProps<{
     closable?: boolean;
diff --git a/resources/assets/vue/components/user/form/UserFormComponent.vue b/resources/assets/vue/components/user/form/UserFormComponent.vue
index 771f4ab4..d8a0b386 100644
--- a/resources/assets/vue/components/user/form/UserFormComponent.vue
+++ b/resources/assets/vue/components/user/form/UserFormComponent.vue
@@ -66,7 +66,7 @@ import { useVuelidate } from '@vuelidate/core';
 import { required, sameAs, minLength, email } from "@vuelidate/validators";
 import { useModalFormHandler } from '@/composables/useModalFormHandler';
 import { useUiStore } from '@/stores/ui';
-import { route } from '@/general/functions/router';
+import route from '@/general/functions/router';
 
 const props = defineProps<{
     closable?: boolean;
diff --git a/resources/assets/vue/general/functions/router.js b/resources/assets/vue/general/functions/router.js
index ccaaf871..5f288bf9 100644
--- a/resources/assets/vue/general/functions/router.js
+++ b/resources/assets/vue/general/functions/router.js
@@ -16,8 +16,5 @@ function route() {
         .join('/');
 }
 
-// Named export for compatibility
-export { route };
-
 // Default export
 export default route;
\ No newline at end of file
diff --git a/resources/assets/vue/types/global.d.ts b/resources/assets/vue/types/global.d.ts
index 9fb91ee6..e696be4d 100644
--- a/resources/assets/vue/types/global.d.ts
+++ b/resources/assets/vue/types/global.d.ts
@@ -1,18 +1,15 @@
-export { };
+export {};
 
 declare global {
     interface Window {
-        route: any;
+        route: (...args: any[]) => string;
         Vapor: import('laravel-vapor').Vapor;
         pusher_key?: string;
         pusher?: any;
         LARAVEL_VAPOR_ENABLED?: boolean;
-        $: any; // jQuery
+        $: any;
     }
 
-    // Declare route as a global function
     const route: (...args: any[]) => string;
-
-    // Declare jQuery as a global
     const $: any;
 }
diff --git a/resources/assets/vue/types/vue-augmentations.d.ts b/resources/assets/vue/types/vue-augmentations.d.ts
index e106d662..13569f78 100644
--- a/resources/assets/vue/types/vue-augmentations.d.ts
+++ b/resources/assets/vue/types/vue-augmentations.d.ts
@@ -3,8 +3,8 @@ import '@vue/runtime-dom';
 
 declare module 'vue' {
   interface ComponentCustomProperties {
-    asset(path: string): string;
-    route(...args: any[]): string;
+    // asset(path: string): string;
+    // route(...args: any[]): string;
   }
 }