diff --git a/app/Http/Controllers/Admin/ManageFaqController.php b/app/Http/Controllers/Admin/ManageFaqController.php index eaed5c8..c3d5327 100644 --- a/app/Http/Controllers/Admin/ManageFaqController.php +++ b/app/Http/Controllers/Admin/ManageFaqController.php @@ -198,6 +198,7 @@ class ManageFaqController extends Controller $tags = $this->tagWithFaqs()->getData(); // $tagName = Tag::has('faq')->orderBy('tag_name','ASC')->get(['id', 'tag_name']); $tagName = Tag::has('faq')->orderBy(\DB::raw('(id = 49) DESC, tag_name, id'))->get(['id', 'tag_name']); + // dd($tags,$tagName); return view('Frontend.Pages.resources.faqs', ['tags' => $tags->data, 'tagName' => $tagName]); } @@ -218,12 +219,13 @@ class ManageFaqController extends Controller public function getAllTagsRelatedToFaq() { - $tags = Tag::query() - ->join('faq', 'tags.id', 'faq.tag_id') - ->where('is_active', true) - ->select('tags.id', 'tag_name') - ->distinct('id', 'tag_name') - ->get(); + // $tags = Tag::query() + // ->join('faq', 'tags.id', 'faq.tag_id') + // ->where('is_active', true) + // ->select('tags.id', 'tag_name') + // ->distinct('id', 'tag_name') + // ->get(); + $tags = Tag::has('faq')->orderBy(\DB::raw('(id = 49) DESC, tag_name, id'))->get(['id', 'tag_name']); if ($tags) { return response()->json([ "status" => "success", diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php index 4204b7f..d9e263a 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php @@ -323,7 +323,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png", ]); @@ -466,7 +466,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); @@ -646,7 +646,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); @@ -802,7 +802,7 @@ class ManageFreeUInvestmentController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php index 274598f..b63cdc7 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php @@ -99,10 +99,10 @@ class CleanAndGreenAssetsController extends Controller $validate = Validator::make($request->all(),[ 'project_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php index d9dd180..0487186 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php @@ -108,7 +108,7 @@ class FractionalRealEstateController extends Controller 'geographic_focus' => 'required', ], [ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php index 7b774b9..350c51f 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php @@ -98,10 +98,10 @@ class HighYieldFinanceController extends Controller $validate = Validator::make($request->all(),[ 'security_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php index ed5a259..4bef7bf 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php @@ -97,10 +97,10 @@ class InvoiceDiscountingController extends Controller $validate = Validator::make($request->all(),[ 'company_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php index f53ded3..f18b57e 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php @@ -96,10 +96,10 @@ class LeaseBasedFinancingController extends Controller $validate = Validator::make($request->all(),[ 'company' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php index fd96a99..f9fbb88 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php @@ -102,10 +102,10 @@ class PeerToPeerLendingController extends Controller $validate = Validator::make($request->all(),[ 'scheme' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php index a3e5e4c..570e3a7 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php @@ -96,10 +96,10 @@ class SecuritizedDebtInstrumentController extends Controller $validate = Validator::make($request->all(),[ 'product_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php index 4c764fd..6f45b33 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php @@ -110,7 +110,7 @@ class VentureCapitalFundController extends Controller 'geographic_focus' => 'required', ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png", ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php index 4c34346..de17c68 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php @@ -97,10 +97,10 @@ class VentureDebtController extends Controller $validate = Validator::make($request->all(),[ 'company_name' => 'required', 'presentation'=>"required|mimes:pdf,zip", - 'fact_sheet'=>"required|mimes:pdf,zip", + 'fact_sheet'=>"required|mimes:pdf,zip,jpeg,jpg,png", ],[ 'required' => "This :attribute field is required", - 'mimes' => "This :attribute field extension must be pdf or zip", + 'mimes' => "This :attribute field extension must be pdf,zip,jpeg,jpg,png" ]); $validationMessage = validationErrorMessage($validate); if ($validationMessage) { diff --git a/routes/api.php b/routes/api.php index 0e23c3b..c9bb923 100644 --- a/routes/api.php +++ b/routes/api.php @@ -331,6 +331,7 @@ Route::get('privacy-policy-data', [PrivacypolicyController::class, 'privacyPolic Route::get('terms-condition-data', [PrivacypolicyController::class, 'termsConditionApi']); //API + Route::get("global-private-credit-fund/question-answer", [FractionalRealEstateFontendController::class, 'globalPrivateCreditFundQuestionAndAnswer']); Route::get("private-credit-fund/question-answer", [FractionalRealEstateFontendController::class, 'privateCreditFundQuestionAndAnswer']); Route::get("long-only-equity-fund/question-answer", [FractionalRealEstateFontendController::class, 'longOnlyEquityFundQuestionAndAnswer']);