Merge remote-tracking branch 'origin/master' into Development

resources/js/Pages/Client/Contracts.vue

@@ -62,13 +62,14 @@ const filterPopoverOpen = ref(false);
 
 const exportDialogOpen = ref(false);
 const exportScope = ref("current");
-const exportColumns = ref(["reference", "customer", "start", "segment", "balance"]);
+const exportColumns = ref(["reference", "customer", "address", "start", "segment", "balance"]);
 const exportError = ref("");
 const isExporting = ref(false);
 
 const exportableColumns = [
   { key: "reference", label: "Referenca" },
   { key: "customer", label: "Stranka" },
+  { key: "address", label: "Naslov" },
   { key: "start", label: "Začetek" },
   { key: "segment", label: "Segment" },
   { key: "balance", label: "Stanje" },
@@ -359,6 +360,7 @@ function extractFilenameFromHeaders(headers) {
               :columns="[
                 { key: 'reference', label: 'Referenca', sortable: false },
                 { key: 'customer', label: 'Stranka', sortable: false },
+                { key: 'address', label: 'Naslov', sortable: false },
                 { key: 'start', label: 'Začetek', sortable: false },
                 { key: 'segment', label: 'Segment', sortable: false },
                 { key: 'balance', label: 'Stanje', sortable: false, align: 'right' },
@@ -492,6 +494,9 @@ function extractFilenameFromHeaders(headers) {
               <template #cell-customer="{ row }">
                 {{ row.client_case?.person?.full_name || "-" }}
               </template>
+              <template #cell-address="{ row }">
+                {{ row.client_case?.person?.address?.address || "-" }}
+              </template>
               <template #cell-start="{ row }">
                 {{ formatDate(row.start_date) }}
               </template>