Samson Mutunga 7 maanden geleden
bovenliggende
commit
fa2702d2c7

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

@@ -59,82 +59,22 @@
       </div>
         <table border="0" cellspacing="0" cellpadding="0" style="background:#fff; border-collapse:collapse;border-spacing:0;margin-bottom:30px;margin-top:10px;margin-inline:auto;">
             <tbody>
-                <tr>
-                    <td>
-                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0;width:100%;color:rgb(51,51,51);font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
-                            <tbody>
-                                <tr height="24" style="background-color:rgb(250,250,250)">
-                                    <td colspan="5" valign="top" style="text-align:center;text-transform:uppercase;padding:10px;border-top-left-radius:3px;border-bottom-left-radius:3px">
-                                        <span style="font-size:15px;font-weight:600;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">Order Information</span>
-                                    </td>
-                                </tr>
-                                <tr height="15">
-                                    <td colspan="5"></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="3" style="width:200px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">Date:
-                                        <?= date('F d, Y', strtotime($order->created_at)) ?>
-                                    </td>
-                                    <td colspan="2" align="right" valign="top" style="width:430px;padding:0 6px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">Order: #{{$order->orderNumber()}}</td>
-                                </tr>
-                                <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">Tests Ordered</span></td>
-                                </tr>
-                                <tr height="15">
-                                    <td colspan="5"></td>
-                                </tr>
-                                <?php 
-                                    $ordersTests = $order->testsRequested();
-                                    $subOrders = $order->associatedOrders($order->id);
-                                    foreach($subOrders as $subOrder){
-                                        $ordersTests = array_merge($ordersTests, $subOrder->testsRequested());
-                                    }
-                                ?>
-                                @foreach($ordersTests as  $tkey => $test)
-                                <tr>
-                                  <td colspan="3" style="padding:0 0 0 15px;vertical-align:top;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
-                                    <span style="font-weight:600;">{{ str_replace('Check ', '', toHumanReadable($test)) }}</span>
-                                  </td>
-                                  <td align="right" valign="top" style="padding:0 5px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
-                                    <span style="font-weight:600;white-space:nowrap;display:block;">${{number_format(config('app.'.$test), 2)}}</span>
-                                  </td>
-                                </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0;width:100%;color:rgb(51,51,51);font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
-                            <tbody>
-                                <tr height="10">
-                                    <td colspan="3"></td>
-                                </tr>
-                                <tr height="10">
-                                    <td height="1" colspan="3">
-                                        <div style="line-height:1px;height:1px;background-color:rgb(238,238,238)"></div>
-                                    </td>
-                                </tr>
-                                <tr height="28">
-                                    <td align="right" style="color:#000;font-size:14px;font-weight:600;padding:0 30px 0 0;border:none;border-width:1px;border-color:rgb(238,238,238)">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:600;white-space:nowrap">
-                                        ${{number_format($order->total(), 2)}}
-                                    </td>
-                                </tr>
-                                <tr height="10">
-                                    <td height="1" colspan="3">
-                                        <div style="line-height:1px;height:1px;background-color:rgb(238,238,238)"></div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </td>
-                </tr>
+                <?php
+                    $totalAmount = $order->order_total;
+                    $childrenOrders = $order->associatedOrders($order->id);
+                ?>
+
+                @include('app.my-account.admin.orders.sub.template.invoice-order-detail', ['order' => $order])
+
+                @foreach($childrenOrders as $childOrder)
+                    <?php 
+                        $totalAmount = $totalAmount + $childOrder->order_total;
+                    ?>
+                    @include('app.my-account.admin.orders.sub.template.invoice-order-detail', ['order' => $childOrder, 'isChildOrder' => true])
+                @endforeach
+
+                @include('app.my-account.admin.orders.sub.template..display-invoice-total-amount', ['totalAmount' => $totalAmount])
+
                 <tr height="15">
                     <td colspan="3"></td>
                 </tr>

+ 17 - 0
resources/views/app/my-account/admin/orders/sub/template/display-invoice-total-amount.blade.php

@@ -0,0 +1,17 @@
+<tr>
+    <td style="background-color: #efefef; padding: 10px;">
+        <table border="0" cellpadding="0" cellspacing="0"
+            style="border-collapse:collapse;border-spacing:0;width:100%;color:rgb(51,51,51);font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
+            <tbody>
+                <tr>
+                    <td colspan="3" style="padding:0 0 0 0;vertical-align:top;">
+                        <span style="font-weight:bold;">TOTAL</span>
+                    </td>
+                    <td align="right" valign="top" style="padding:0 0px;">
+                        <span style="font-weight:bold;white-space:nowrap;display:block;">${{ number_format(@$totalAmount, 2) }}</span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </td>
+</tr>

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

@@ -0,0 +1,122 @@
+<?php
+    $orderDetailJson = $order->detailJson();
+    $orderSelectedOptions = json_decode(@$orderDetailJson->selected_options ?? '{}');
+?>
+
+<tr>
+    <td>
+        <table border="0" cellpadding="0" cellspacing="0"
+            style="border-collapse:collapse;border-spacing:0;width:100%;color:rgb(51,51,51);font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
+            <tbody>
+                @if(!@$isChildOrder)
+                <tr height="24" style="background-color:rgb(250,250,250)">
+                    <td colspan="5" valign="top"
+                        style="text-align:center;text-transform:uppercase;padding:10px;border-top-left-radius:3px;border-bottom-left-radius:3px">
+                        <span
+                            style="font-size:15px;font-weight:600;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">Order
+                            Information</span>
+                    </td>
+                </tr>
+                <tr height="15">
+                    <td colspan="5"></td>
+                </tr>
+                <tr>
+                    <td colspan="3" style="width:200px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">Date:
+                        <?= date('F d, Y', strtotime($order->created_at)) ?>
+                    </td>
+                    <td colspan="2" align="right" valign="top"
+                        style="width:430px;padding:0 6px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">Order:
+                        #{{ $order->orderNumber() }}</td>
+                </tr>
+                <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">Tests Ordered</span></td>
+                </tr>
+                <tr height="15">
+                    <td colspan="5"></td>
+                </tr>
+                @endif
+                @foreach ($order->testsRequested() 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>
+                        </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>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td>
+        <table border="0" cellpadding="0" cellspacing="0"
+            style="border-collapse:collapse;border-spacing:0;width:100%;color:rgb(51,51,51);font-family:'Helvetica Neue',Helvetica,Arial,sans-serif">
+            <tbody>
+                <tr height="10">
+                    <td colspan="3"></td>
+                </tr>
+                <tr height="10">
+                    <td height="1" colspan="3">
+                        <div style="line-height:1px;height:1px;background-color:rgb(238,238,238)"></div>
+                    </td>
+                </tr>
+                @if (@$orderSelectedOptions->partner == 1)
+                    {{-- <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>
+                        <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) }}
+                        </td>
+                    </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)">
+                            Partner</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->partner_test_total, 2) }}
+                        </td>
+                    </tr>
+                    <tr height="28">
+                        <td align="right"
+                            style="color:#048a16;font-size:14px;font-weight:400;padding:0 30px 0 0;border:none;border-width:1px;border-color:rgb(238,238,238)">
+                            Discount</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; color:#048a16;white-space:nowrap">
+                            -${{ number_format(@$orderSelectedOptions->partner_test_discount_amount, 2) }}
+                        </td>
+                    </tr>
+                @endif
+                <tr height="28">
+                    <td align="right"
+                        style="color:#000;font-size:14px;font-weight:600;padding:0 30px 0 0;border:none;border-width:1px;border-color:rgb(238,238,238)">
+                        SUB-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:600;white-space:nowrap">
+                        ${{ number_format($order->order_total, 2) }}
+                    </td>
+                </tr>
+                <tr height="10">
+                    <td height="1" colspan="3">
+                        <div style="line-height:1px;height:1px;background-color:rgb(238,238,238)"></div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </td>
+</tr>

+ 2 - 2
resources/views/app/my-account/admin/users/sub/info/templates/parent-store-order.blade.php

@@ -8,8 +8,8 @@
             <div>
                 <b>{{ $parentOrder->iid }}</b>
             </div>
-            <div>
-                fdgdf
+            <div class="d-flex align-items-center">
+                <a href="{{ route('admin.orders.view.preview-invoice', $order) }}" target="_blank">Invoice</a>
             </div>
         </div>
     </div>