Merge branch 'dillon/137-project-upgrade-update-1A' into vapor/production

2026-08-19 04:24:12 +00:00 · 2026-07-07 01:28:03 +08:00
parent c70d6244f2 2625d58da2
commit adfa6e2626
44 changed files with 52 additions and 47 deletions
@@ -29,6 +29,6 @@ return [

    'max_age' => 0,

-    'supports_credentials' => false, //cief todo: 137
+    'supports_credentials' => false,

 ];
@@ -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 {
@@ -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({
@@ -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();
@@ -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
@@ -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
@@ -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;
@@ -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 {
@@ -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;
@@ -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 {
@@ -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;
@@ -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 {
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();
@@ -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
@@ -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
@@ -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'

@@ -68,6 +68,8 @@ const props = withDefaults(defineProps<{
    emptyListSection: true
 });

+const asset = window.Vapor.asset;
+
 const queueStore = useQueueStore();
 const uiStore = useUiStore();
 const jobPollingStore = useJobPollingStore();
@@ -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;
@@ -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;
@@ -85,6 +85,8 @@ interface Props {

 const props = defineProps<Props>();

+const asset = window.Vapor.asset;
+
 const authStore = useAuthStore();
 const { submit } = useRequest();

@@ -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;
@@ -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();

@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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';
@@ -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 {
@@ -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;
@@ -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();
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -16,8 +16,5 @@ function route() {
        .join('/');
 }

-// Named export for compatibility
-export { route };
-
 // Default export
 export default route;
@@ -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;
 }
@@ -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;
  }
 }