update

app/Models/StoreOrder.php

@@ -31,7 +31,7 @@ class StoreOrder extends BaseModel
         return $orders;
     }
 
-    
+
     public function paymentMethod(){
         return $this->hasOne(PaymentMethod::class, 'id', 'payment_method_id');
     }
@@ -81,7 +81,7 @@ class StoreOrder extends BaseModel
         }
         return $data;
     }
-    
+
 
     public function testsRequestedInHumanReadable(){
         $data = [];
@@ -113,16 +113,16 @@ class StoreOrder extends BaseModel
         $detail = json_decode($this->detail_json);
         $selectedOptions = json_decode(@$detail->selected_options);
         if(!$selectedOptions) return 0;
-        if(!$selectedOptions->partner_test_discount_amount) return 0;
-        return floatval($selectedOptions->partner_test_discount_amount);
+        if(!@$selectedOptions->partner_test_discount_amount) return 0;
+        return floatval(@$selectedOptions->partner_test_discount_amount);
     }
 
     public function getPartnerEmail(){
         $detail = json_decode($this->detail_json);
         $selectedOptions = json_decode(@$detail->selected_options);
         if(!$selectedOptions) return null;
-        if(!$selectedOptions->partner_email) return null;
-        return $selectedOptions->partner_email;
+        if(!@$selectedOptions->partner_email) return null;
+        return @$selectedOptions->partner_email;
     }
 
 
@@ -163,5 +163,5 @@ class StoreOrder extends BaseModel
         }
         return null;
     }
-    
+
 }

resources/views/app/my-account/admin/orders/partials/table.blade.php

@@ -22,8 +22,10 @@
         <thead>
             <tr>
                 <th>#</th>
-                <th>Created At</th>
-                <th>Total Amount</th>
+                <th>Invoice</th>
+                <th>Name</th>
+                <th class="text-nowrap">Created At</th>
+                <th class="text-nowrap">Total Amount</th>
                 <th>Orders</th>
                 <th>Lab</th>
                 <th>Trx</th>
@@ -37,14 +39,15 @@
                     $selectedLab = @$storeOrderSelectedOptions->lab;
                 ?>
                 <tr @if ($order->is_cancelled) class="cancelled-order" @endif>
-                    <td class="text-nowrap">
-                        <a href="{{ route('admin.orders.view.dashboard', $order) }}"
-                            class="me-2">{{ $order->orderNumber() }}</a>
-                            <a href="{{ route('admin.orders.view.preview-invoice', $order) }}"
-                            class="me-2">Invoice</a>
+                    <td class="text-nowrap" style="width:1px">
+                        <a href="{{ route('admin.orders.view.dashboard', $order) }}">{{ $order->orderNumber() }}</a>
+                    </td>
+                    <td style="width:4px;" class="text-center">
+                      <a href="{{ route('admin.orders.view.preview-invoice', $order) }}"><i class="fas fa-file-invoice"></i></a>
                     </td>
-                    <td class="text-nowrap">{{ friendly_date_time($order->created_at) }}</td>
-                    <td>{{ displayAmount('$', $order->total()) }}</td>
+                    <td class="text-nowrap" style="width:1px">{{ $order->user->full_name }}</td>
+                    <td class="text-nowrap" style="width:1px">{{ friendly_date_time($order->created_at) }}</td>
+                    <td style="width:1px">{{ displayAmount('$', $order->total()) }}</td>
                     <td>
                         @include('app.my-account.admin.orders.partials.order-tests-summary')
                     </td>

resources/views/app/my-account/admin/orders/sub/dashboard.blade.php

@@ -8,7 +8,7 @@
     ?>
     <div class="row">
         <div class="col-md-6">
-            <div class="card mb-1">
+            <div class="card">
                 <div class="card-header">
                     <h5 class="mb-0 fw-bold">Order Details </h5>
                 </div>
@@ -50,12 +50,12 @@
                 </div>
             </div>
             @if($order->getPartnerEmail())
-            <div class="card">
+            <div class="card mt-3">
                 <div class="card-header">
                     <div class="d-flex align-items-center justify-content-between">
                         <h5 class="mb-0 fw-bold">Partner</h5>
                         <div>
-                            
+
                         </div>
                     </div>
                 </div>
@@ -68,7 +68,7 @@
                                     {{ $order->getPartnerEmail() }}
                                 </th>
                             </tr>
-                            
+
                         </tbody>
                     </table>
                 </div>
@@ -112,7 +112,7 @@
                 }
             ?>
             @if(count($partnerTests))
-                <div class="card mt-1">
+                <div class="card mt-3">
                     <div class="card-header">
                         <div class="d-flex align-items-center justify-content-between">
                             <h5 class="mb-0 fw-bold">Partner Tests Requested</h5>
@@ -130,8 +130,8 @@
                         </table>
                     </div>
                 </div>
-            @endif            
-        </div>        
+            @endif
+        </div>
     </div>
     <div class="row mt-4">
         <div class="col-md-6">

resources/views/app/my-account/entity-single-layout.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app-no-footer')
+@extends('layouts.app')
 @section('content')
     <div class="mcp-theme-1 h-content main-row h-100 d-flex align-items-stretch">
         @yield('page-sidebar')
@@ -7,13 +7,6 @@
                 <div>
                     @yield('page-content')
                 </div>
-                <div>
-                    <footer class="text-white text-center py-2 mcp-theme-1 text-white bg-dark-primary">
-                        <div class="opacity-60 font-size-11">
-                            Copyright {{date('Y')}} Basic Nutrition, Inc. All rights reserved. Prevalip &reg; is a registered trademark of Basic Nutrition, Inc.
-                        </div>
-                    </footer>
-                </div>
             </div>
         </div>
     </div>

resources/views/layouts/app.blade.php

@@ -68,7 +68,7 @@
     </div>
     <footer class="text-white text-center py-2 mcp-theme-1 text-white bg-dark-primary">
         <div class="opacity-60 font-size-11">
-        Copyright {{date('Y')}} Basic Nutrition, Inc. All rights reserved. {{$appConfig['name']}}<sup>&reg;</sup> is a registered trademark of Basic Nutrition, Inc.
+        Copyright {{date('Y')}} LetsBeSafe. All rights reserved.
         </div>
     </footer>
     <script src="{{ asset('/js/lime.js') }}"></script>