浏览代码

Updated admin shopper

Samson Mutunga 1 年之前
父节点
当前提交
1ca8d0e174

+ 4 - 1
app/Models/StoreOrder.php

@@ -58,7 +58,10 @@ class StoreOrder extends BaseModel
         $data = [];
         $data = [];
         $tests = $this->testsRequested();
         $tests = $this->testsRequested();
         foreach($tests as $test){
         foreach($tests as $test){
-            array_push($data, config('constants.tests.'.$test));
+            $testName = config('constants.tests.'.$test);
+            $testPrice = displayAmount('$', config('app.'.$test));
+            $string = $testName . ' - '.$testPrice;
+            array_push($data, $string);
         }
         }
         return $data;
         return $data;
     }
     }

+ 1 - 1
resources/views/app/my-account/admin/dashboard.blade.php

@@ -43,7 +43,7 @@
                             {{ $c }}
                             {{ $c }}
                         </th>
                         </th>
                         <th class="pl-2 w-100">
                         <th class="pl-2 w-100">
-                            <a href="{{route('admin.report', 'new-orders-pending-processing')}}">New order{{$c === 1 ? '' : 's'}} pending processing</a>
+                            <a href="{{route('admin.report', 'new-orders-pending-processing')}}">Users With New order{{$c === 1 ? '' : 's'}} pending processing</a>
                         </th>
                         </th>
                     </tr>
                     </tr>
                     </tbody>
                     </tbody>

+ 3 - 0
resources/views/app/my-account/admin/users/single.blade.php

@@ -5,6 +5,9 @@
 @endsection
 @endsection
 
 
 @section('page-content')
 @section('page-content')
+<?php
+    $userDetailJson = $user->detailJson();
+?>
 <div>
 <div>
     <div class="single-info-section">
     <div class="single-info-section">
         <div class="px-3 py-2">
         <div class="px-3 py-2">

+ 2 - 2
resources/views/app/my-account/admin/users/sub/info/name.blade.php

@@ -21,8 +21,8 @@
             @if($user->is_agreed_as_rep || $user->is_agreed_as_manager)
             @if($user->is_agreed_as_rep || $user->is_agreed_as_manager)
                 <span class="me-2">PayPal Email: <b>{{ $user->paypal_email_address ?? '--' }}</b></span>
                 <span class="me-2">PayPal Email: <b>{{ $user->paypal_email_address ?? '--' }}</b></span>
             @endif
             @endif
-            <span class="me-2">Phone Number: <b>{{ $user->phone_number ?? $user->getDetailJsonValue('phone_number') }}</b></span>
-            <span class="me-2">Notification Option: <b>{{ $user->phone_number ?? $user->getDetailJsonValue('notification_option') }}</b></span>
+            <span class="me-2">Phone Number: <b>{{ $user->phone_number ?? @$userDetailJson->phone_number ?? '--' }}</b></span>
+            <span class="me-2">Notification Option: <b>{{ @$userDetailJson->notification_option ?? '--' }}</b></span>
         </div>
         </div>
     </div>
     </div>
     <div>
     <div>

+ 1 - 1
resources/views/app/my-account/reports/new-orders-pending-processing.blade.php

@@ -1,7 +1,7 @@
 @extends('app.my-account.layout-lite')
 @extends('app.my-account.layout-lite')
 @section('page')
 @section('page')
     <div class="px-3">
     <div class="px-3">
-        <h2 class="font-size-16 text-secondary fw-bold border-bottom px-3 py-2 mb-2 m-neg-3 bg-light">New Orders Pending Processing</h2>
+        <h2 class="font-size-16 text-secondary fw-bold border-bottom px-3 py-2 mb-2 m-neg-3 bg-light">Users With New Orders Pending Processing</h2>
         @include('app.my-account.admin.users.partials.table', ['rows' => $rows])
         @include('app.my-account.admin.users.partials.table', ['rows' => $rows])
         <div class="mt-3">
         <div class="mt-3">
             {{ $rows->appends(request()->input())->links() }}
             {{ $rows->appends(request()->input())->links() }}