Samson Mutunga 7 月之前
父节点
当前提交
ef3bec8f85

+ 11 - 3
app/Models/StoreOrder.php

@@ -50,15 +50,15 @@ class StoreOrder extends BaseModel
     public function tests(){
     public function tests(){
         $detail = json_decode($this->detail_json);
         $detail = json_decode($this->detail_json);
         $selectedOptions = json_decode(@$detail->selected_options);
         $selectedOptions = json_decode(@$detail->selected_options);
-        if(!$selectedOptions) return null;
-        if($selectedOptions->partner != 1) return null;
+        if(!$selectedOptions) return [];
+        if($selectedOptions->partner != 1) return [];
         return (array) @$selectedOptions->tests;
         return (array) @$selectedOptions->tests;
     }
     }
 
 
     public function partnerTests(){
     public function partnerTests(){
         $detail = json_decode($this->detail_json);
         $detail = json_decode($this->detail_json);
         $selectedOptions = json_decode(@$detail->selected_options);
         $selectedOptions = json_decode(@$detail->selected_options);
-        if(!$selectedOptions) return null;
+        if(!$selectedOptions) return [];
         return (array) @$selectedOptions->tests;
         return (array) @$selectedOptions->tests;
     }
     }
 
 
@@ -118,6 +118,14 @@ class StoreOrder extends BaseModel
         return floatval($selectedOptions->partner_test_discount_amount);
         return floatval($selectedOptions->partner_test_discount_amount);
     }
     }
 
 
+    public function getPartnerEmail(){
+        $detail = json_decode($this->detail_json);
+        $selectedOptions = json_decode(@$detail->selected_options);
+        if(!$selectedOptions) return null;
+        if(!$selectedOptions->partner_email) return null;
+        return $selectedOptions->partner_email;
+    }
+
 
 
     public function total(){
     public function total(){
         $total = $this->order_total;
         $total = $this->order_total;

+ 16 - 0
resources/views/app/my-account/admin/orders/forms/email-attachment.blade.php

@@ -0,0 +1,16 @@
+<div moe wide>
+    <a start show href="#">{{ $title }}</a>
+    <form url="{{ route('admin.orders.view.email-report', $order) }}">
+        <div class="mb-2">
+            <label class="fw-bold mb-1">Message</label>
+            <textarea name="message" class="form-control form-control-sm" accept="application/pdf" style="min-height:100px;"></textarea>
+        </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>
+            <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>

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

@@ -8,7 +8,7 @@
     ?>
     ?>
     <div class="row">
     <div class="row">
         <div class="col-md-6">
         <div class="col-md-6">
-            <div class="card">
+            <div class="card mb-1">
                 <div class="card-header">
                 <div class="card-header">
                     <h5 class="mb-0 fw-bold">Order Details </h5>
                     <h5 class="mb-0 fw-bold">Order Details </h5>
                 </div>
                 </div>
@@ -49,6 +49,31 @@
                     </table>
                     </table>
                 </div>
                 </div>
             </div>
             </div>
+            @if($order->getPartnerEmail())
+            <div class="card">
+                <div class="card-header">
+                    <div class="d-flex align-items-center justify-content-between">
+                        <h5 class="mb-0 fw-bold">Partner</h5>
+                        <div>
+                            
+                        </div>
+                    </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>
         <div class="col-md-6">
         <div class="col-md-6">
             <div class="card">
             <div class="card">
@@ -114,7 +139,7 @@
                 $orders = [];
                 $orders = [];
                 array_push($orders, $order);
                 array_push($orders, $order);
             ?>
             ?>
-            @include('app.my-account.admin.users.sub.info.customer-information-orders', ['orders' => $orders, 'title' => 'Order Actions'])
+            @include('app.my-account.admin.users.sub.info.customer-information-orders', ['parentOrders' => $orders, 'title' => 'Order Actions'])
         </div>
         </div>
         <div class="col-md-6">
         <div class="col-md-6">
              @include('app.my-account.admin.users.sub.info.customer-information', ['user' => $order->user])
              @include('app.my-account.admin.users.sub.info.customer-information', ['user' => $order->user])

+ 1 - 1
resources/views/app/my-account/admin/users/sub/info/customer-information-orders.blade.php

@@ -1,5 +1,5 @@
 <?php
 <?php
-    $parentStoreOrdersAsClient = $user->parentStoreOrdersAsClient;
+    $parentStoreOrdersAsClient = @$parentOrders ?? $user->parentStoreOrdersAsClient;
 ?>
 ?>
 <div class="">
 <div class="">
     <div class="d-flex align-items-center">
     <div class="d-flex align-items-center">