From 8669199b1aa23812596c476a9eb8620a09938a43 Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Wed, 15 Mar 2023 00:08:20 +0100
Subject: [PATCH] Add button to export members

---
 app/Member/Actions/ExportAction.php          | 8 ++++----
 resources/js/mixins/indexHelpers.js          | 8 ++++++--
 resources/js/views/member/VIndex.vue         | 9 ++++++++-
 tests/Feature/Member/ExportCsvActionTest.php | 3 ++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/Member/Actions/ExportAction.php b/app/Member/Actions/ExportAction.php
index 69b7b691..89ba0e62 100644
--- a/app/Member/Actions/ExportAction.php
+++ b/app/Member/Actions/ExportAction.php
@@ -16,7 +16,7 @@ class ExportAction
     use AsAction;
 
     /**
-     * @param Collection<int, Member>
+     * @param Collection<int, Member> $members
      */
     public function handle(Collection $members): string
     {
@@ -31,9 +31,9 @@ class ExportAction
                 $member->address,
                 $member->zip,
                 $member->location,
-                $member->mainPhone,
-                $member->mobilePhone,
-                $member->workPhone,
+                $member->main_phone,
+                $member->mobile_phone,
+                $member->work_phone,
             ]);
         }
 
diff --git a/resources/js/mixins/indexHelpers.js b/resources/js/mixins/indexHelpers.js
index 95d88e36..8da5f9b4 100644
--- a/resources/js/mixins/indexHelpers.js
+++ b/resources/js/mixins/indexHelpers.js
@@ -7,11 +7,16 @@ export default {
     props: {
         data: {},
     },
+    computed: {
+        filterString() {
+            return btoa(JSON.stringify(this.inner.meta.filter));
+        },
+    },
     methods: {
         reload(resetPage = true) {
             var _self = this;
             var data = {
-                filter: btoa(JSON.stringify(this.inner.meta.filter)),
+                filter: this.filterString,
                 page: 1,
             };
 
@@ -50,4 +55,3 @@ export default {
         },
     },
 };
-
diff --git a/resources/js/views/member/VIndex.vue b/resources/js/views/member/VIndex.vue
index 19309fa2..ed08a434 100644
--- a/resources/js/views/member/VIndex.vue
+++ b/resources/js/views/member/VIndex.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="pb-6">
-        <div class="px-6 py-2 flex border-b border-gray-600 space-x-3">
+        <div class="px-6 py-2 flex border-b border-gray-600 items-center space-x-3">
             <f-switch v-show="hasModule('bill')" id="ausstand" @input="setFilter('ausstand', $event)" :items="getFilter('ausstand')" label="Nur Ausstände" size="sm"></f-switch>
             <f-select
                 v-show="hasModule('bill')"
@@ -30,6 +30,10 @@
                 size="sm"
                 name="subactivity_id"
             ></f-select>
+            <button class="btn btn-primary label mr-2" @click.prevent="exportMembers">
+                <svg-sprite class="w-3 h-3 xl:mr-2" src="save"></svg-sprite>
+                <span class="hidden xl:inline">Exportieren</span>
+            </button>
         </div>
 
         <table cellspacing="0" cellpadding="0" border="0" class="custom-table custom-table-sm hidden md:table">
@@ -132,6 +136,9 @@ export default {
     },
 
     methods: {
+        exportMembers() {
+            window.open(`/member-export?filter=${this.filterString}`);
+        },
         remove(member) {
             if (window.confirm('Mitglied löschen?')) {
                 this.$inertia.delete(`/member/${member.id}`);
diff --git a/tests/Feature/Member/ExportCsvActionTest.php b/tests/Feature/Member/ExportCsvActionTest.php
index a33bf2ca..6a7cf024 100644
--- a/tests/Feature/Member/ExportCsvActionTest.php
+++ b/tests/Feature/Member/ExportCsvActionTest.php
@@ -19,7 +19,7 @@ class ExportCsvActionTest extends TestCase
         Storage::fake('temp');
 
         $this->withoutExceptionHandling()->login()->loginNami();
-        Member::factory()->defaults()->postBillKind()->create(['firstname' => 'Jane']);
+        Member::factory()->defaults()->postBillKind()->create(['firstname' => 'Jane', 'main_phone' => '+49 176 70343221']);
         Member::factory()->defaults()->emailBillKind()->create(['firstname' => 'Max']);
 
         $response = $this->callFilter('member-export', ['bill_kind' => 'Post']);
@@ -27,6 +27,7 @@ class ExportCsvActionTest extends TestCase
         $response->assertDownload('mitglieder.csv');
         $contents = Storage::disk('temp')->get('mitglieder.csv');
         $this->assertTrue(str_contains($contents, 'Jane'));
+        $this->assertTrue(str_contains($contents, '+49 176 70343221'));
         $this->assertFalse(str_contains($contents, 'Max'));
     }
 }