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

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/forms/email-attachment.blade.php

@@ -1,5 +1,5 @@
 <div moe wide>
-    <a start show href="#">{{ $title }}</a>
+    <a start show href="#" class="text-primary">{{ $title }}</a>
     <form url="{{ route('admin.email-attachment') }}">
         @csrf
         <input type="hidden" name="attachmentPath" value="{{ $attachmentPath }}" />
@@ -21,10 +21,10 @@
         </div>
         <div class="mb-2">
             <span class="me-1">Attachment: <i class="fas fa-paperclip fa-fw"></i> <a href="{{ $attachmentUrl }}" target="_blank">{{ $attachmentName }}</a></span>
-        </div>    
+        </div>
         <div>
             <button submit class="btn btn-sm btn-primary me-2">Email</button>
             <button cancel class="btn btn-sm btn-default border">Cancel</button>
         </div>
     </form>
-</div>
+</div>

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

@@ -1,5 +1,5 @@
 <div moe wide>
-    <a start show href="#">Email Results</a>
+    <a start show href="#" class="text-primary">Email Results</a>
     <form url="{{ route('admin.orders.view.email-report', $order) }}">
         <div class="mb-2">
             <label class="fw-bold mb-1">Message</label>
@@ -7,10 +7,10 @@
         </div>
         <div class="mb-2">
             <span class="me-1">Report: <i class="fas fa-paperclip fa-fw"></i> <a href="{{ $results_attachment['attachmentAccessTokenUrl'] }}" target="_blank">{{ $results_attachment['orginalFileName'] }}</a></span>
-        </div>    
+        </div>
         <div>
             <button submit class="btn btn-sm btn-primary me-2">Email</button>
             <button cancel class="btn btn-sm btn-default border">Cancel</button>
         </div>
     </form>
-</div>
+</div>

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

@@ -5,19 +5,19 @@
 </style>
 <div moe wide>
     @if(@$edit)
-    <a start show href="#"><i class="fas fa-pencil-alt"></i></a>
+    <a start show href="#" class="text-primary"><i class="fas fa-pencil-alt"></i></a>
     @else
-    <a start show href="#">{{ $title }}</a>
+    <a start show href="#" class="text-primary">{{ $title }}</a>
     @endif
     <form url="{{ route('admin.orders.view.upload-file', $order) }}" class="uploadAttachmentFileFile">
         <input type="hidden" name="file_name" value="{{ $fileName }}" />
         <div class="mb-2">
             <label class="fw-bold mb-1">Attachment</label>
             <input type="file" name="{{ $fileName }}" class="form-control form-control-sm" accept="application/pdf" />
-        </div>   
+        </div>
         <div>
             <button submit class="btn btn-sm btn-primary me-2">Upload</button>
             <button cancel class="btn btn-sm btn-default border">Cancel</button>
         </div>
     </form>
-</div>
+</div>

resources/views/app/my-account/admin/orders/forms/upload-lab-tests-request-attachment.blade.php

@@ -5,19 +5,19 @@
 </style>
 <div moe wide>
     @if(@$edit)
-    <a start show href="#"><i class="fas fa-pencil-alt"></i></a>
+    <a start show href="#" class="text-primary"><i class="fas fa-pencil-alt"></i></a>
     @else
-    <a start show href="#">Upload Lab Tests Request PDF</a>
+    <a start show href="#" class="text-primary">Upload Lab Tests Request PDF</a>
     @endif
     <form url="{{ route('admin.orders.view.upload-file', $order) }}" id="uploadLabTestRequestFile">
         <input type="hidden" name="file_name" value="lab_tests_request_attachment" />
         <div class="mb-2">
             <label class="fw-bold mb-1">Lab Tests Request Attachment</label>
             <input type="file" name="lab_tests_request_attachment" class="form-control form-control-sm" accept="application/pdf" />
-        </div>   
+        </div>
         <div>
             <button submit class="btn btn-sm btn-primary me-2">Upload</button>
             <button cancel class="btn btn-sm btn-default border">Cancel</button>
         </div>
     </form>
-</div>
+</div>

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

@@ -5,19 +5,19 @@
 </style>
 <div moe wide>
     @if(@$edit)
-    <a start show href="#"><i class="fas fa-pencil-alt"></i></a>
+    <a start show href="#" class="text-primary"><i class="fas fa-pencil-alt"></i></a>
     @else
-    <a start show href="#">Upload Results PDF</a>
+    <a start show href="#" class="text-primary">Upload Results PDF</a>
     @endif
     <form url="{{ route('admin.orders.view.upload-file', $order) }}" id="uploadFile">
         <input type="hidden" name="file_name" value="results_attachment" />
         <div class="mb-2">
             <label class="fw-bold mb-1">Results Attachment</label>
             <input type="file" name="results_attachment" class="form-control form-control-sm" accept="application/pdf" />
-        </div>   
+        </div>
         <div>
             <button submit class="btn btn-sm btn-primary me-2">Upload</button>
             <button cancel class="btn btn-sm btn-default border">Cancel</button>
         </div>
     </form>
-</div>
+</div>

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

@@ -28,6 +28,7 @@
                 <th class="text-nowrap">Total Amount</th>
                 <th>Orders</th>
                 <th>Lab</th>
+                <th>Lab Request</th>
                 <th>Trx</th>
             </tr>
         </thead>
@@ -37,6 +38,10 @@
                     $storeOrderDetailJson = $order->detailJson();
                     $storeOrderSelectedOptions = json_decode(@$storeOrderDetailJson->selected_options ?? "{}");
                     $selectedLab = @$storeOrderSelectedOptions->lab;
+
+                    $lab_tests_request_attachment = @$order->getDetailJsonValue('lab_tests_request_attachment');
+                    $results_attachment = @$order->getDetailJsonValue('results_attachment');
+                    $orderTotal = $order->order_total;
                 ?>
                 <tr @if ($order->is_cancelled) class="cancelled-order" @endif>
                     <td class="text-nowrap" style="width:1px">
@@ -48,8 +53,23 @@
                     <td class="text-nowrap" style="width:1px">{{ $order->user->full_name }}</td>
                     <td class="text-nowrap" style="width:1px">{{ friendly_date_time($order->created_at) }}</td>
                     <td style="width:1px">{{ displayAmount('$', $order->total()) }}</td>
-                    <td>
-                        @include('app.my-account.admin.orders.partials.order-tests-summary')
+                    <td style="width:550px">
+                      @foreach($order->testsRequested() as  $tkey => $test)
+                       <small>{{ config('constants.tests.'.$test) }}</small>@if(count($order->associatedOrders($order->id)) || count($order->testsRequested()) -1 !== $tkey),@endif
+                       @endforeach
+                       {{-- Associated Orders --}}
+                       @foreach($order->associatedOrders($order->id) as $tOrder => $assocOrder)
+                         <?php $orderTotal = $orderTotal + $assocOrder->order_total; ?>
+                         @foreach($assocOrder->testsRequested() as  $tkey => $test)
+                         <small>{{ config('constants.tests.'.$test) }}<small>@if(count($order->associatedOrders($order->id)) -1 !== $tOrder),@endif
+                         @endforeach
+                       @endforeach
+                       @if(@$storeOrderSelectedOptions->partner == 1)
+                       <p class="mt-2 mb-0"><b style="font-family:sans-serif">Partner: {{@$storeOrderSelectedOptions->partner_email}}</b></p>
+                       @endif
+                        @if(@$results_attachment)
+                        <p class="mt-2 p-1 bg-light border text-sm"><b>Lab Report: <a class="ms-2 text-success" href="{{ $results_attachment['attachmentAccessTokenUrl'] }}" target="_blank"><i class="fal fa-file-pdf"></i> Download PDF</a></b></p>
+                        @endif
                     </td>
                     <td>
                         @if($selectedLab)
@@ -58,6 +78,16 @@
                         ---
                         @endif
                     </td>
+                    <td style="width:1px">
+                      <div class="d-flex">
+                        <span class="me-2">@include("app.my-account.admin.orders.forms.upload-lab-tests-request-attachment", ['edit' => true])</span>
+                        @if(@$lab_tests_request_attachment)
+                          <a class="text-nowrap text-primary" href="{{ $lab_tests_request_attachment['attachmentAccessTokenUrl'] .'?fileType=lab_tests_request_attachment' }}" target="_blank"><i class="fal fa-file-pdf"></i> {{ $lab_tests_request_attachment['orginalFileName'] }}</a>
+                        @else
+                        <small class="text-muted">not uploaded</small>
+                        @endif
+                      </div>
+                    </td>
                     <td class="text-nowrap">
                         <?php $finalTrx = $order->finalFinancialTransaction(); ?>
                         @if (@$finalTrx)

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">
@@ -66,7 +97,7 @@
                                     </span>
                                 @endif
                                 @include('app.my-account.admin.orders.forms.upload-attachment', [
-                                    'title' => 'Upload Partner Results',
+                                    'title' => 'Upload Partner Results PDF',
                                     'fileName' => 'partner_results_attachment',
                                     'edit' => $partner_results_attachment ? true:false
                                 ])
@@ -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])

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

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