From 80471acc5b21ea439e514864d6c17c4acbaf6340 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 28 Jun 2023 01:08:31 +0800
Subject: [PATCH] update support page

---
 .../elements/UserCompanyComponent.vue         | 104 ++++++++++++++----
 resources/views/pages/support.blade.php       |   4 +-
 routes/web.php                                |  27 ++++-
 3 files changed, 105 insertions(+), 30 deletions(-)

diff --git a/resources/assets/vue/components/companies/elements/UserCompanyComponent.vue b/resources/assets/vue/components/companies/elements/UserCompanyComponent.vue
index ed8a2463..9fa640f5 100644
--- a/resources/assets/vue/components/companies/elements/UserCompanyComponent.vue
+++ b/resources/assets/vue/components/companies/elements/UserCompanyComponent.vue
@@ -1,38 +1,96 @@
 <template>
-    <div class="row m-b-15 align-items-end">
-        <div class="col-auto">
+    <div class="row m-b-20">
+        <div class="col">
             <div class="row">
-                <div class="col">
-                    <div class="font-heading fs-10 muted all-caps">Name</div>
+                <div class="col-3">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_module.name }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-2">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Reference</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.connection.invitee_reference }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <a :href="route('customer.profile', item.reference)" target="_blank">
+                        <button type="button" class="btn btn-xs btn-primary fs-11">Open in new tab</button>
+                    </a>
                 </div>
             </div>
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
+            <!-- company_module_contact -->
+            <div class="row m-b-10 m-t-5" v-if="item.company_module_contact">
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Module Phone</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_module_contact.phone }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Module Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_module_contact.email }}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="col-2 text-right">
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading fs-10 muted all-caps">Reference</div>
+            <!-- company_contact -->
+            <div class="row m-t-5" v-if="item.company_contact">
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Phone</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_contact.phone }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading fs-10 muted all-caps">Company Email</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-11">{{ item.company_contact.email }}</div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col">
-                    <div class="font-heading all-caps fs-11">{{this.item.reference}}</div>
-                </div>
-            </div>
-        </div>
-        <div class="col-auto">
-            <a :href="route('customer.profile', this.item.reference)" target="_blank">
-                <button type="button" class="btn btn-xs btn-primary fs-11">Open in new tab</button>
-            </a>
         </div>
     </div>
 </template>
 <script>
-     import componentHandler from '../../../general/mixins/componentHandler';
+    import componentHandler from '../../../general/mixins/componentHandler';
     export default {
         mixins: [componentHandler]
     }
diff --git a/resources/views/pages/support.blade.php b/resources/views/pages/support.blade.php
index 910c719d..b5954bdd 100644
--- a/resources/views/pages/support.blade.php
+++ b/resources/views/pages/support.blade.php
@@ -63,7 +63,9 @@
             @if($markingReturn && !$markingNotFound)
                 <div class="row m-t-20">
                     <div class="col m-l-30">
-                        <user-company-component class="m-l-5" :data="{{$markingReturn}}"></user-company-component>
+                        @foreach($markingReturn as $marking)
+                            <user-company-component class="m-l-5" :data="{{$marking}}"></user-company-component>
+                        @endforeach
                     </div>
                 </div>
             @endif
diff --git a/routes/web.php b/routes/web.php
index eb394bdc..a2b48b34 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -169,12 +169,27 @@ Route::post('/support', function (Request $request) {
 
     if ($marking) {
         $orderNo = null;
-        $markingReturn = CompanyConnection::where('invitee_reference', $marking)->get();
+        $markingReturn = CompanyConnection::where('invitee_reference', 'LIKE', '%'. $marking .'%')->get();
+        $dataReturn = [];
         if (count($markingReturn)) {
-            $markingReturn = $markingReturn->first();
-            $markingReturn = $markingReturn->invitee;
-            $markingReturn->reference = $marking;
-            $markingReturn = $markingReturn->toJson();
+            $markingReturn = $markingReturn;
+            foreach ($markingReturn as $connection) {
+                $company_module         = $connection->invitee;
+                $company_module_contact = $company_module->contacts()->first();
+                $company                = $company_module->company;
+                $company_contact        = $company->contacts()->first();
+ 
+                $dataReturn[] = json_encode(
+                    [
+                        'connection'            => $connection ? $connection->toArray() : null,
+                        'company_module'         => $company_module ? $company_module->toArray() : null,
+                        'company_module_contact' => $company_module_contact ? $company_module_contact->toArray() : null,
+                        'company'                => $company ? $company->toArray() : null,
+                        'company_contact'        => $company_contact ? $company_contact->toArray() : null,
+                    ]
+                );
+                
+            }
         } else {
             $markingNotFound = true;
         }
@@ -185,7 +200,7 @@ Route::post('/support', function (Request $request) {
         'orderNo'               => $orderNo,
         'orderNoNotFound'       => $orderNoNotFound,
         'marking'               => $marking,
-        'markingReturn'         => $markingReturn,
+        'markingReturn'         => $dataReturn,
         'markingNotFound'       => $markingNotFound,
     ]);
 })->name('support');