Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from Ritikeshyadav/HritikFreeu

Browse Source 
Hritik freeu
This commit is contained in:
Hritikkk9
2024-04-17 16:52:18 +05:30
committed by GitHub
parent 9625d59455 1e2a107409
commit f37dc9d25c
12 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Admin/ManageFaqController.php
View File

@@ -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",

8
app/Http/Controllers/Admin/ManageFreeUInvestmentController.php
View File

@@ -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"
]);

4
app/Http/Controllers/Admin/ManageFreeUInvestments/CleanAndGreenAssetsController.php
View File

@@ -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) {

2
app/Http/Controllers/Admin/ManageFreeUInvestments/FractionalRealEstateController.php
View File

@@ -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"
]);

4
app/Http/Controllers/Admin/ManageFreeUInvestments/HighYieldFinanceController.php
View File

@@ -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) {

4
app/Http/Controllers/Admin/ManageFreeUInvestments/InvoiceDiscountingController.php
View File

@@ -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) {

4
app/Http/Controllers/Admin/ManageFreeUInvestments/LeaseBasedFinancingController.php
View File

@@ -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) {

4
app/Http/Controllers/Admin/ManageFreeUInvestments/PeerToPeerLendingController.php
View File

@@ -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) {

4
app/Http/Controllers/Admin/ManageFreeUInvestments/SecuritizedDebtInstrumentController.php
View File

@@ -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) {

2
app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php
View File

@@ -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) {

4
app/Http/Controllers/Admin/ManageFreeUInvestments/VentureDebtController.php
View File

@@ -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) {

1
routes/api.php
View File

@@ -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']);