From f23768397ee9ccbe8970076d43c43b2630dc3f91 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Tue, 18 Jun 2024 19:28:36 +0530 Subject: [PATCH] added kyc reject mail template and fixed api --- .../Admin/ContactFormLeadsController.php | 2 +- .../Admin/ManageInvestorController.php | 3 +- .../Requests/StoreContactUsReplyRequest.php | 1 + .../FundForDistressedAssetResource.php | 3 + app/Services/Admin/ContactUsService.php | 3 +- .../manage_investor_kyc.blade.php | 6 +- .../Admin/email/new-mail-template.blade.php | 131 +++++++++++ .../email/reply-mail-contactus.blade.php | 212 ++++++++++-------- .../Admin/email/reply-mail-investor.blade.php | 212 ++++++++++-------- routes/web.php | 4 + 10 files changed, 384 insertions(+), 193 deletions(-) create mode 100644 resources/views/Admin/email/new-mail-template.blade.php diff --git a/app/Http/Controllers/Admin/ContactFormLeadsController.php b/app/Http/Controllers/Admin/ContactFormLeadsController.php index b18896e..d02e3f3 100644 --- a/app/Http/Controllers/Admin/ContactFormLeadsController.php +++ b/app/Http/Controllers/Admin/ContactFormLeadsController.php @@ -34,7 +34,7 @@ class ContactFormLeadsController extends Controller // dd($request->all()); $updateStatus = ContactUs::where('id', $request->contact_us_id)->update(['status' => 'Ongoing']); $replySent = $this->contact->store($request); - $this->contact->sendMail($request->email_send, $request->subject, $request->reply); + $this->contact->sendMail($request->email_send, $request->subject, $request->reply, $request->username); return $replySent ? $this->response('Mail send successfully', 200) : $this->response('Mail Not send, Error!', 400); diff --git a/app/Http/Controllers/Admin/ManageInvestorController.php b/app/Http/Controllers/Admin/ManageInvestorController.php index 23ff9ff..5f694f0 100644 --- a/app/Http/Controllers/Admin/ManageInvestorController.php +++ b/app/Http/Controllers/Admin/ManageInvestorController.php @@ -41,6 +41,7 @@ class ManageInvestorController extends Controller // dd($request->all()); $email = $request->email_send; // $email = "ritikesh.yadav@wdimails.com"; + $email = $request->username; $subject = $request->subject; $reply = $request->reply; $investorMail = True; @@ -330,7 +331,7 @@ class ManageInvestorController extends Controller - + '; diff --git a/app/Http/Requests/StoreContactUsReplyRequest.php b/app/Http/Requests/StoreContactUsReplyRequest.php index eae60ae..067755d 100644 --- a/app/Http/Requests/StoreContactUsReplyRequest.php +++ b/app/Http/Requests/StoreContactUsReplyRequest.php @@ -26,6 +26,7 @@ class StoreContactUsReplyRequest extends FormRequest return [ 'subject' => 'required', 'reply' => 'required', + 'username' => 'required', 'contact_us_id' => 'required', ]; } diff --git a/app/Http/Resources/FundForDistressedAssetResource.php b/app/Http/Resources/FundForDistressedAssetResource.php index a396d78..e9a4ba2 100644 --- a/app/Http/Resources/FundForDistressedAssetResource.php +++ b/app/Http/Resources/FundForDistressedAssetResource.php @@ -15,6 +15,7 @@ class FundForDistressedAssetResource extends JsonResource */ public function toArray($request) { + // dd($this); $images = ProductImage::where('product_xid', $this->products_id)->get(); $imagePaths = []; if (!empty($images)) { @@ -72,5 +73,7 @@ class FundForDistressedAssetResource extends JsonResource 'valuation_per_security_nav' => $this->valuation_per_security_nav, 'trading_strategy_used' => $this->trading_strategy_used, 'involved_in_short_selling' => $this->involved_in_short_selling, + 'rera_complied_property' => $this->rera_complied_property, + 'regions_covered' => $this->regions_covered, ]; } } diff --git a/app/Services/Admin/ContactUsService.php b/app/Services/Admin/ContactUsService.php index 441867d..706ab3a 100644 --- a/app/Services/Admin/ContactUsService.php +++ b/app/Services/Admin/ContactUsService.php @@ -16,10 +16,11 @@ class ContactUsService return ContactUs::latest()->get(); } - public function sendMail($email, $subject, $reply, $investorMail = null) + public function sendMail($email, $subject, $reply, $username, $investorMail = null) { $data['subject'] = $subject; $data['message'] = $reply; + $data['username'] = $username; if($investorMail) { return Mail::to($email)->send(new ReplyInvestorMail($data)); diff --git a/resources/views/Admin/Pages/manage_investors/manage_investor_kyc.blade.php b/resources/views/Admin/Pages/manage_investors/manage_investor_kyc.blade.php index 9510a51..8b42084 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_investor_kyc.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_investor_kyc.blade.php @@ -266,6 +266,7 @@ +
@@ -313,12 +314,13 @@ @endsection @section('scripts') + + + + \ No newline at end of file diff --git a/resources/views/Admin/email/reply-mail-contactus.blade.php b/resources/views/Admin/email/reply-mail-contactus.blade.php index 23a4f77..a6e1b13 100644 --- a/resources/views/Admin/email/reply-mail-contactus.blade.php +++ b/resources/views/Admin/email/reply-mail-contactus.blade.php @@ -1,107 +1,131 @@ - - - - - + + - - - - - - - - - - - - Jerichoalternatives Reply - - - + + + + + Mail + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+
+   +
+ logo +
+
+ + + + + + +
+ + + + + + + + + +
+ KYC Verification Failed: Action + Required
+
+

Dear {{$data['username']}},

+

We regret to inform you that your recent + KYC (Know Your Customer) submission has + been rejected. Please find the details + below:

+

{{$data['message']}}

+

If you have any questions or need further + assistance, please do not hesitate to + contact our support team.

+

Best regards,
Jericho Alternatives

+
+
+

© 2024 Jericho Alternatives. All + rights reserved.

+

This is an automated message, please do + not reply.

+ Contact + us +
+
+
+
+
- - -
- - - -
- - - - - - - -

- - {{$data['subject']}} - - - -

- - - -

- - {{$data['message']}} - - - -

- - - - - -
- - - -

- - © Copyright {{date('Y')}} - - - - Jerichoalternatives, All Rights Reserved. - -

- - - -
- - - -
- - + - - \ No newline at end of file diff --git a/resources/views/Admin/email/reply-mail-investor.blade.php b/resources/views/Admin/email/reply-mail-investor.blade.php index b26b186..a6e1b13 100644 --- a/resources/views/Admin/email/reply-mail-investor.blade.php +++ b/resources/views/Admin/email/reply-mail-investor.blade.php @@ -1,107 +1,131 @@ - - - - - + + - - - - - - - - - - - - Jerichoalternatives Reply - - - + + + + + Mail + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+
+   +
+ logo +
+
+ + + + + + +
+ + + + + + + + + +
+ KYC Verification Failed: Action + Required
+
+

Dear {{$data['username']}},

+

We regret to inform you that your recent + KYC (Know Your Customer) submission has + been rejected. Please find the details + below:

+

{{$data['message']}}

+

If you have any questions or need further + assistance, please do not hesitate to + contact our support team.

+

Best regards,
Jericho Alternatives

+
+
+

© 2024 Jericho Alternatives. All + rights reserved.

+

This is an automated message, please do + not reply.

+ Contact + us +
+
+
+
+
- - -
- - - -
- - - - - - - -

- - {{$data['subject']}} - - - -

- - - -

- - {{$data['message']}} - - - -

- - - - - -
- - - -

- - © Copyright {{date('Y')}} - - - - Jerichoalternatives, All Rights Reserved. - -

- - - -
- - - -
- - + - - \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 6590f51..856e6b6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -458,6 +458,10 @@ Route::get('revenue', function () { return view('Frontend.Pages.Invest_assets.revenue'); })->name('revenue'); +Route::get('new-mail-template',function(){ + return view('Admin.email.new-mail-template'); +}); + //User Routes Route::middleware([FrontendAccess::class])->group(function () { Route::get("market-list/{custom_id?}", [FrontendDashboardController::class, 'viewDetailMarketPlace'])->name('market-list');