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

app/Models/StoreOrder.php

@@ -180,18 +180,22 @@ class StoreOrder extends BaseModel
         $hasPartner = false;
         $partnerDiscount = 0;
         $orderTotal = 0;
+        $partnerTotal = 0;
         $orders = $this->allAssociatedOrders();
         foreach($orders as $order){
             $orderSelectedOptions = $this->selectedOptions();
             $hasPartner = @$orderSelectedOptions['partner'] ? true:false;
             $partnerDiscount = floatval(@$orderSelectedOptions['partner_test_discount_amount']);            
             $allTests = array_merge($allTests, (array) $order->getOrderTestsSummary());
+            $partnerTotal = $partnerTotal + floatval($orderSelectedOptions['partner_test_total']);
             $orderTotal = $orderTotal + floatval($order->order_total);
         }
         $summary['all_tests'] = $allTests;
+        $summary['client_total'] = $orderTotal - $partnerTotal;
+        $summary['partner_total'] = $partnerTotal;
         $summary['final_total'] = $orderTotal;
         $summary['has_partner'] = $hasPartner;
-        $summary['partner_discount_per_test'] = $partnerDiscount;
+        $summary['partner_total_discount'] = $partnerDiscount;
 
         return $summary;
     }

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

@@ -1,7 +1,7 @@
 <?php
-    $orderDetailJson = $order->detailJson();
-    $orderSelectedOptions = json_decode(@$orderDetailJson->selected_options ?? '{}');
-    $orderSummary = $order->getOrderAllTestsRequested();
+$orderDetailJson = $order->detailJson();
+$orderSelectedOptions = json_decode(@$orderDetailJson->selected_options ?? '{}');
+$orderSummary = $order->getOrderAllTestsRequested();
 ?>
 
 <tr>
@@ -34,7 +34,8 @@
                 <tr height="24" style="background-color:rgb(250,250,250)">
                     <td colspan="5" valign="top"
                         style="text-align:center;text-transform:uppercase;padding:6px;border-top-left-radius:3px;border-bottom-left-radius:3px">
-                        <span style="font-size:15px;font-weight:600">Tests Ordered</span></td>
+                        <span style="font-size:15px;font-weight:600">Tests Ordered</span>
+                    </td>
                 </tr>
                 <tr height="15">
                     <td colspan="5"></td>
@@ -42,8 +43,7 @@
                 @foreach ($orderSummary['all_tests'] as $tkey => $test)
                     <tr>
                         <td colspan="3" style="padding:0 0 0 0;vertical-align:top;">
-                            <span
-                                style="font-weight:400;">{{ $test['name'] }}</span>
+                            <span style="font-weight:400;">{{ $test['name'] }}</span>
                         </td>
                         <td align="right" valign="top" style="padding:0 0px;">
                             <span
@@ -53,39 +53,18 @@
                 @endforeach
 
                 @if (@$orderSelectedOptions->partner == 1)
-                <tr height="15">
-                    <td colspan="5"></td>
-                </tr>
-                <tr height="24" style="background-color:rgb(250,250,250)">
-                    <td colspan="5" valign="top"
-                        style="text-align:center;text-transform:uppercase;padding:6px;border-top-left-radius:3px;border-bottom-left-radius:3px">
-                        <span style="font-size:15px;font-weight:600">Partner Tests</span></td>
-                </tr>
-                <tr height="15">
-                    <td colspan="5"></td>
-                </tr>
-                <?php 
-                    $discountedAmountPerOrder = floatval($orderSummary['partner_discount_per_test']);
-                    $partnerDiscount = 0;
-                    $partnerTotalCost = 0;
-                ?>
-                @foreach ($orderSummary['all_tests'] as $pTestKey => $pTest)
-                    <?php 
-                        $partnerDiscount = $partnerDiscount + $discountedAmountPerOrder;
-                        $pTestAmount = floatval($pTest['price']) - $discountedAmountPerOrder;
-                        $partnerTotalCost = $partnerTotalCost + floatval($pTestAmount);
-                    ?>
-                    <tr>
-                        <td colspan="3" style="padding:0 0 0 0;vertical-align:top;">
-                            <span
-                                style="font-weight:400;">{{ $pTest['name'] }}</span>
-                        </td>
-                        <td align="right" valign="top" style="padding:0 0px;">
-                            <span
-                                style="font-weight:400;white-space:nowrap;display:block;">${{ number_format($pTestAmount, 2) }}</span>
-                        </td>
-                    </tr>
-                @endforeach
+
+                    @foreach ($orderSummary['all_tests'] as $pTestKey => $pTest)
+                        <tr>
+                            <td colspan="3" style="padding:0 0 0 0;vertical-align:top;">
+                                <span style="font-weight:400;">{{ $pTest['name'] }} (Partner Test)</span>
+                            </td>
+                            <td align="right" valign="top" style="padding:0 0px;">
+                                <span
+                                    style="font-weight:400;white-space:nowrap;display:block;">${{ number_format($pTest['price'], 2) }}</span>
+                            </td>
+                        </tr>
+                    @endforeach
                 @endif
             </tbody>
         </table>
@@ -105,16 +84,16 @@
                     </td>
                 </tr>
                 @if (@$orderSelectedOptions->partner == 1)
-                    {{-- <tr height="28">
+                    <tr height="28">
                         <td align="right"
                             style="color:#000;font-size:14px;font-weight:400;padding:0 30px 0 0;border:none;border-width:1px;border-color:rgb(238,238,238)">
-                            Tests</td>
+                            User Tests Total</td>
                         <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
                         <td width="90" align="right"
                             style="width:120px;font-size:16px;font-weight:400;white-space:nowrap">
-                            ${{ number_format(@$orderSelectedOptions->initial_tests_total, 2) }}
+                            ${{ number_format(@$orderSummary['client_total'], 2) }}
                         </td>
-                    </tr> --}}
+                    </tr>
                     <tr height="28">
                         <td align="right"
                             style="color:#000;font-size:14px;font-weight:400;padding:0 30px 0 0;border:none;border-width:1px;border-color:rgb(238,238,238)">
@@ -122,7 +101,7 @@
                         <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
                         <td width="90" align="right"
                             style="width:120px;font-size:16px;font-weight:400;white-space:nowrap">
-                            ${{ number_format(@$partnerTotalCost, 2) }}
+                            ${{ number_format(@$orderSummary['partner_total'], 2) }}
                         </td>
                     </tr>
                     <tr height="28">
@@ -132,7 +111,7 @@
                         <td width="1" style="background-color:rgb(238,238,238);width:1px"></td>
                         <td width="90" align="right"
                             style="width:120px;font-size:16px;font-weight:400; color:#048a16;white-space:nowrap">
-                            -${{ number_format(@$partnerDiscount, 2) }}
+                            -${{ number_format(@$orderSummary['partner_total_discount'], 2) }}
                         </td>
                     </tr>
                 @endif