minor

public/css/flyer.css

@@ -26,10 +26,10 @@ body {
 
 .coupon-container {
   width: 8.5in;
-  height: 11in;
+  height: 10in;
   overflow: hidden;
   margin-inline:auto;
-  background-color: #ffffff;
+  background-color: #ffffff !important;
   -webkit-print-color-adjust: exact;
   display: flex;
   flex-direction: column;
@@ -92,3 +92,12 @@ body {
   width: 70px;
   object-fit: contain;
 }
+
+@media print {
+  body {
+    background-color: #ffffff;
+  }
+  .coupon-container {
+    width: auto;
+  }
+}

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

@@ -49,6 +49,37 @@
                     </table>
                 </div>
             </div>
+
+        </div>
+        <div class="col-md-6">
+            <div class="card">
+                <div class="card-header">
+                    <div class="d-flex align-items-center justify-content-between">
+                        <h5 class="mb-0 fw-bold">Tests Requested</h5>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div>
+                        <?php
+                        $tests = [];
+                        $subOrders = $order->allAssociatedOrders();
+                        foreach($subOrders as $subOrder){
+                            $tests = array_merge($tests, $subOrder->testsRequestedInHumanReadable());
+                        }
+                        ?>
+
+                    </div>
+                    <table class="table table-sm table-bordered border w-100 mb-0">
+                        <tbody>
+                            @foreach ($tests as $key=>$test)
+                                <tr>
+                                    <td class="w-50 w-lg-75 px-2">{{ $test }}</td>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            </div>
             @if($order->getPartnerEmail())
             <div class="card mt-3">
                 <div class="card-header">
@@ -105,76 +136,37 @@
                     </div>
                 </div>
                 <div class="card-body">
-                    <table class="table table-sm table-bordered dashboard-stats-table mb-0">
-                        <tbody>
-                            <tr>
-                                <th class="px-2" colspan="2">
-                                    <span class="text-secondary">Email:</span>
-                                    {{ $order->getPartnerEmail() }}
-                                </th>
-                            </tr>
-
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            @endif
-        </div>
-        <div class="col-md-6">
-            <div class="card">
-                <div class="card-header">
-                    <div class="d-flex align-items-center justify-content-between">
-                        <h5 class="mb-0 fw-bold">Tests Requested</h5>
+                    <div class="">
+                      <span class="text-secondary">Email:</span> <b>{{ $order->getPartnerEmail() }}</b>
                     </div>
-                </div>
-                <div class="card-body">
-                    <div>
-                        <?php
-                        $tests = [];
-                        $subOrders = $order->allAssociatedOrders();
+                    <?php
+                        $partnerTests = [];
                         foreach($subOrders as $subOrder){
-                            $tests = array_merge($tests, $subOrder->testsRequestedInHumanReadable());
+                            $partnerTests = array_merge($partnerTests, $subOrder->partnerTestsRequestedInHumanReadable());
                         }
-                        ?>
-
-                    </div>
-                    <table class="table table-sm table-bordered border w-100 mb-0">
-                        <tbody>
-                            @foreach ($tests as $key=>$test)
-                                <tr>
-                                    <td class="w-50 w-lg-75 px-2">{{ $test }}</td>
-                                </tr>
-                            @endforeach
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <?php
-                $partnerTests = [];
-                foreach($subOrders as $subOrder){
-                    $partnerTests = array_merge($partnerTests, $subOrder->partnerTestsRequestedInHumanReadable());
-                }
-            ?>
-            @if(count($partnerTests))
-                <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>
+                    ?>
+                    @if(count($partnerTests))
+                        <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">Tests Requested</h5>
+                                </div>
+                            </div>
+                            <div class="card-body">
+                                <table class="table table-sm table-bordered border w-100 mb-0">
+                                    <tbody>
+                                        @foreach ($partnerTests as $pKey=>$pTest)
+                                            <tr>
+                                                <td class="w-50 w-lg-75 px-2">{{ $pTest }}</td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
-                    </div>
-                    <div class="card-body">
-                        <table class="table table-sm table-bordered border w-100 mb-0">
-                            <tbody>
-                                @foreach ($partnerTests as $pKey=>$pTest)
-                                    <tr>
-                                        <td class="w-50 w-lg-75 px-2">{{ $pTest }}</td>
-                                    </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
-                    </div>
+                    @endif
                 </div>
+            </div>
             @endif
         </div>
     </div>

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

@@ -67,7 +67,7 @@
                 @include('app.my-account.admin.orders.sub.template.invoice-order-detail', ['order' => $order])
 
                 @foreach($childrenOrders as $childOrder)
-                    <?php 
+                    <?php
                         $totalAmount = $totalAmount + $childOrder->order_total;
                     ?>
                     @include('app.my-account.admin.orders.sub.template.invoice-order-detail', ['order' => $childOrder, 'isChildOrder' => true])