Merge branch 'master' of https://rav.triplestart.com/tigerphp/lemon-admin

resources/views/app/my-account/admin/orders/forms/sms-results-attachment.blade.php

@@ -1,6 +1,5 @@
 <?php
-    $userDetailJson = $user->detailJson();
-    $phoneNumber = $user->phone_number ?? @$userDetailJson->phone_number;
+    $phoneNumber = @$orderUserSnapshot->phoneNumber;
 ?>
 <div moe wide>
     <a start show href="#">SMS Results</a>

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

@@ -3,6 +3,9 @@
         $results_attachment = $order->getDetailJsonValue('results_attachment');
         $user = $order->user;
         $userDetailJson = $user->detailJson();
+        $orderDetailJson = $order->detailJson();
+        $orderDetailJson->selected_options = json_decode($orderDetailJson->selected_options ?? '{}');
+        $orderUserSnapshot = @$orderDetailJson->selected_options->user_snapshot ?? (object) [];
     ?>
     @if(!$results_attachment)
         @include("app.my-account.admin.orders.forms.upload-results-attachment")
@@ -13,14 +16,13 @@
             @include("app.my-account.admin.orders.forms.upload-results-attachment", ['edit' => true])
         </div>
         <span class="text-muted mx-1">|</span>
-        @if(@$userDetailJson->notification_option === 'email')
+        @if(@$orderUserSnapshot->notification_option === 'phone')
             <div>
-                @include('app.my-account.admin.orders.forms.email-results-attachment')
+                @include('app.my-account.admin.orders.forms.sms-results-attachment')
             </div>
-        @endif
-        @if(@$userDetailJson->notification_option === 'phone')
+        @else
             <div>
-                @include('app.my-account.admin.orders.forms.sms-results-attachment')
+                @include('app.my-account.admin.orders.forms.email-results-attachment')
             </div>
         @endif
     </div>