Samson Mutunga 7 месяцев назад
Родитель
Сommit
522a2fd2a7

+ 6 - 0
app/Models/StoreOrder.php

@@ -164,4 +164,10 @@ class StoreOrder extends BaseModel
         return null;
     }
 
+    public function getOrderTestsSummary(){
+        $orderDetailJson = $this->detailJson();
+        $orderSelectedOptions = json_decode(@$orderDetailJson->selected_options ?? '{}', true);
+        return @$orderSelectedOptions['selectedOptionsSummary'] ?? [];
+    }
+
 }

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

@@ -64,7 +64,7 @@
                         $tests = [];
                         $subOrders = $order->allAssociatedOrders();
                         foreach($subOrders as $subOrder){
-                            $tests = array_merge($tests, $subOrder->testsRequestedInHumanReadable());
+                            $tests = array_merge($tests, (array) $subOrder->getOrderTestsSummary());
                         }
                         ?>
 
@@ -73,7 +73,7 @@
                         <tbody>
                             @foreach ($tests as $key=>$test)
                                 <tr>
-                                    <td class="w-50 w-lg-75 px-2">{{ $test }}</td>
+                                    <td class="w-50 w-lg-75 px-2">{{ $test['name'] }}</td>
                                 </tr>
                             @endforeach
                         </tbody>
@@ -142,7 +142,7 @@
                     <?php
                         $partnerTests = [];
                         foreach($subOrders as $subOrder){
-                            $partnerTests = array_merge($partnerTests, $subOrder->partnerTestsRequestedInHumanReadable());
+                            $partnerTests = array_merge($partnerTests, (array) $subOrder->getOrderTestsSummary());
                         }
                     ?>
                     @if(count($partnerTests))
@@ -157,7 +157,7 @@
                                     <tbody>
                                         @foreach ($partnerTests as $pKey=>$pTest)
                                             <tr>
-                                                <td class="w-50 w-lg-75 px-2">{{ $pTest }}</td>
+                                                <td class="w-50 w-lg-75 px-2">{{ $pTest['name'] }}</td>
                                             </tr>
                                         @endforeach
                                     </tbody>

+ 4 - 3
resources/views/app/my-account/admin/orders/sub/template/invoice-order-detail.blade.php

@@ -1,6 +1,7 @@
 <?php
     $orderDetailJson = $order->detailJson();
     $orderSelectedOptions = json_decode(@$orderDetailJson->selected_options ?? '{}');
+    $selectedOptionsSummary = @$orderSelectedOptions->selectedOptionsSummary ?? (object) [];
 ?>
 
 <tr>
@@ -40,15 +41,15 @@
                     <td colspan="5"></td>
                 </tr>
                 @endif
-                @foreach ($order->testsRequested() as $tkey => $test)
+                @foreach ($selectedOptionsSummary as $tkey => $test)
                     <tr>
                         <td colspan="3" style="padding:0 0 0 0;vertical-align:top;">
                             <span
-                                style="font-weight:400;">{{ str_replace('Check ', '', toHumanReadable($test)) }}</span>
+                                style="font-weight:400;">{{ $test->name }}</span>
                         </td>
                         <td align="right" valign="top" style="padding:0 0px;">
                             <span
-                                style="font-weight:400;white-space:nowrap;display:block;">${{ number_format(config('app.' . $test), 2) }}</span>
+                                style="font-weight:400;white-space:nowrap;display:block;">${{ number_format($test->price, 2) }}</span>
                         </td>
                     </tr>
                 @endforeach