customer notified mail when admin change the status enhancement done

bagisto · Feb 19, 2021 · ab0f8ce · ab0f8ce
1 parent 900fd81
commit ab0f8ce
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/src/Http/Controllers/Admin/AdminController.php b/src/Http/Controllers/Admin/AdminController.php
@@ -120,13 +120,18 @@ public function edit($id)
     public function update()
     {
        $data = request()->except('_token');
-       $customer = auth()->guard('customer')->user();
+
+       $request = $this->gdprDataRequestRepository->where('id',$data['id'])->get();
 
+       foreach($request as $value) {
+           $requestData = $value;
+       }
+
        $result = $this->gdprDataRequestRepository->find($data['id'])->update($data);
 
        $params = $data + [
-                'customer_id'=>$customer->id,
-                'email'=>$customer->email,
+                'customer_id'=>$requestData->customer_id,
+                'email'=>$requestData->email,
             ];
 
          if($result)

diff --git a/src/Mail/AdminUpdateDataRequestMail.php b/src/Mail/AdminUpdateDataRequestMail.php
@@ -11,10 +11,11 @@ class AdminUpdateDataRequestMail extends Mailable
 {
     use Queueable, SerializesModels;
 
-    public $dataUpdateRequest;
+    public $adminUpdateRequest;
+
+    public function __construct($adminUpdateRequest) {
+        $this->adminUpdateRequest = $adminUpdateRequest;
 
-    public function __construct($dataUpdateRequest) {
-        $this->dataUpdateRequest = $dataUpdateRequest;
     }
 
     /**
@@ -24,8 +25,8 @@ public function __construct($dataUpdateRequest) {
      */
     public function build()
     {
-        return $this->to($this->dataUpdateRequest['email'])
-            ->subject('New Update of Data Request')
-            ->view('gdpr::emails.customers.new-data-update-request')->with($this->dataUpdateRequest);
+        return $this->to($this->adminUpdateRequest['email'])
+            ->subject('Request Status')
+            ->view('gdpr::emails.customers.admin-update-data-request')->with($this->adminUpdateRequest);
     }
 }
diff --git a/src/Resources/lang/en/app.php b/src/Resources/lang/en/app.php
@@ -75,6 +75,7 @@
             'request-status' => 'Request Status :',
             'message' => 'Message',
             'thank-you' => 'Thank you',
+            'status-of-request' => 'Status Of Request',
         ],
         'customer-data-table-heading' => [
             'product-name' => 'Product Name',

diff --git a/...s/customers/admin-update-data-request.php → ...omers/admin-update-data-request.blade.php b/...s/customers/admin-update-data-request.php → ...omers/admin-update-data-request.blade.php
@@ -6,45 +6,34 @@
     </a>
 </div>
 
-
 <div style="padding: 30px;">
     <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
         <span style="font-weight: bold;">
             {{ __('gdpr::app.mail.new-data-request.heading') }} !
         </span> <br>
-
-        <div style="font-weight: bold;font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 20px !important;">
-            {{ __('gdpr::app.mail.new-data-request.summary') }}
-        </div>
     </div>
 
 
     <div style="flex-direction: row;margin-top: 20px;justify-content: space-between;margin-bottom: 20px;">
-        <div style="line-height: 25px;">
-           
+        <div>
+
             <div style="font-weight: bold;font-size: 16px;color: #242424">
                 {{ __('gdpr::app.mail.new-data-request.request-status') }}
             </div>
 
             <div>
-                {{ $adminUpdateDataRequest['request_status'] }}
+                {{ $adminUpdateRequest['request_status'] }}
             </div>
         </div>
 
-        <div style="line-height: 25px;">
-            <div style="font-weight: bold;font-size: 16px;color: #242424;">
-                {{ __('gdpr::app.mail.new-data-request.request-type') }}
-            </div>
-            <div>
-                {{ $adminUpdateDataRequest['request_type'] }}
-            </div>
-
+        <div>
+
             <div style="font-weight: bold;font-size: 16px;color: #242424;">
                 {{ __('gdpr::app.mail.new-data-request.message') }}
             </div>
 
             <div style="font-size: 16px; color: #242424;">
-                {{ $adminUpdateDataRequest['message'] }}
+                {{ $adminUpdateRequest['message'] }}
             </div>
 
         </div>