diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index f9e3054..c7fba34 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -846,6 +846,15 @@ class AuthController extends Controller if (!$userCreated) { return response()->json(['status' => 400, 'message' => 'Error creating user!'])->setStatusCode(400); } else { + //sending notifications + $name = $request->name; + $notify['message'] = "$name has registered to Jericho Alternatives Website and App!"; + $type = "New Users"; + $users = User::admins()->get(); + foreach ($users as $data) { + $data->notify(new UserAdmin($notify, $type)); + } + $user = User::where('email', $request->email)->first(); $userToken = $user->createToken('apiToken')->plainTextToken; return response()->json(['status' => 200, 'message' => 'User Created', 'token' => $userToken, 'data' => $user]); @@ -911,6 +920,14 @@ class AuthController extends Controller if (!$userCreated) { return response()->json(['status' => 400, 'message' => 'Error creating user!'])->setStatusCode(400); } else { + //sending notifications + $name = $request->name2; + $notify['message'] = "$name has registered to Jericho Alternatives Website and App!"; + $type = "New Users"; + $users = User::admins()->get(); + foreach ($users as $data) { + $data->notify(new UserAdmin($notify, $type)); + } $user = User::where('email', $request->email2)->first(); $userToken = $user->createToken('apiToken')->plainTextToken; return response()->json(['status' => 200, 'message' => 'User Created', 'token' => $userToken, 'data' => $user]); diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index a057bf4..8efd0c4 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -211,7 +211,7 @@ class AlternativeInvestmentFundController extends Controller ->get(); $product = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $productData = Product::with('product_images')->where('id', '=', $product->products_id)->first(); - // dd($privateEquityFund); + // dd($privateEquityFund,$productData,$product); return view('Frontend.Pages.alternative-investment-fund.private-equity-fund-product', compact('privateEquityFund', 'otherPEF', 'product', 'productData')); } @@ -269,8 +269,8 @@ class AlternativeInvestmentFundController extends Controller ->get(); $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); - // dd($productData); - // dd($productData); + + // dd($productData,$product,$hedgeFund,$otherHF); return view('Frontend.Pages.alternative-investment-fund.hedge-fund-product', compact('hedgeFund', 'otherHF', 'productData', 'product')); } diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php index c8414a5..5a6a277 100644 --- a/app/Models/MarketplaceFractionalRealEstateSeller.php +++ b/app/Models/MarketplaceFractionalRealEstateSeller.php @@ -82,17 +82,18 @@ class MarketplaceFractionalRealEstateSeller extends Model // return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy; // }); // $id = $this->id; - if(MarketplaceBuyerForm::where(['associated_id'=>$id,'table' => 'marketplace_fre_sellers'])->exists()) + if(MarketplaceBuyerForm::where(['associated_id'=>$this->id,'table' => 'marketplace_fre_sellers'])->exists()) { - $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$id)->first(); + $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$this->id)->first(); + // dd((int)$getFREData->current_market_value_of_the_property <= 0); // $aifData = (int)$getFREData->no_of_units_you_wish_to_sell; // $remainUnits = $aifData - $totalSellUnits; - if($getFREData->current_market_value_of_the_property <= 0) + if((int)$getFREData->current_market_value_of_the_property <= 0) { return 'SOLD'; } else{ - return 'OPEN'; + return 'OPEN'; } }else{ return 'OPEN'; diff --git a/app/Services/Admin/CommissionService.php b/app/Services/Admin/CommissionService.php index 0a74629..42f0d71 100644 --- a/app/Services/Admin/CommissionService.php +++ b/app/Services/Admin/CommissionService.php @@ -36,7 +36,24 @@ class CommissionService } public function commissionCalculation($product,$investmentValue){ - $grossCommissionedEarned = ($investmentValue * $product->trail_rate) / 100; + $trail_rate = 0; + if($product->return_type == 'Monthly') + { + $trail_rate += $product->trail_rate / 12 ; + } + if($product->return_type == 'Quarterly') + { + $trail_rate += $product->trail_rate / 4 ; + } + if($product->return_type == 'Half-Yearly') + { + $trail_rate += $product->trail_rate / 2 ; + } + if($product->return_type == 'Yearly') + { + $trail_rate += $product->trail_rate ; + } + $grossCommissionedEarned = ($investmentValue * $trail_rate) / 100; $gst = ($grossCommissionedEarned * $product->gst) / 100; $tds = ($grossCommissionedEarned * $product->tds) / 100; return [ diff --git a/public/assets/uploads/product_images/202406131219_3-1716966990.png b/public/assets/uploads/product_images/202406131219_3-1716966990.png new file mode 100644 index 0000000..0eee154 Binary files /dev/null and b/public/assets/uploads/product_images/202406131219_3-1716966990.png differ diff --git a/public/assets/uploads/product_images/202406131219_MQysoLB2ru.gif b/public/assets/uploads/product_images/202406131219_MQysoLB2ru.gif new file mode 100644 index 0000000..0d364a9 Binary files /dev/null and b/public/assets/uploads/product_images/202406131219_MQysoLB2ru.gif differ diff --git a/public/assets/uploads/product_images/202406131219_terms-and-conditions.png b/public/assets/uploads/product_images/202406131219_terms-and-conditions.png new file mode 100644 index 0000000..5965ac2 Binary files /dev/null and b/public/assets/uploads/product_images/202406131219_terms-and-conditions.png differ diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php index b4dca97..921132c 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php @@ -101,7 +101,7 @@

Registration Number

- {{ $privateEquityFund->registration_number ?? '-' }} + {{ $hedgeFund->registration_number ?? '-' }}

Fund category

@@ -320,6 +320,60 @@
+
+
+
+
+

ISIN Code

+ {{ $product->isin_code ?? '-' }} +
+
+

Focused Real Estate Sectors

+ {{ $product->focused_real_estate_sectors ?? '-' }} +
+
+

Rera Complied Property

+ {{ $product->rera_complied_property ?? '-' }} +
+
+
+
+
+
+
+
+

Return On Investment

+ {{ $product->return_on_investment ?? '-' }} +
+
+

Valuation Per Sector

+ {{ $product->valuation_per_sector ?? '-' }} +
+
+

Focused Funds

+ {{ $product->focused_funds ?? '-' }} +
+
+
+
+
+
+
+
+

Trading Strategy

+ {{ $product->trading_strategy ?? '-' }} +
+
+

Trading Strategy Used

+ {{ $product->trading_strategy_used ?? '-' }} +
+
+

Involved In Short Selling

+ {{ $product->involved_in_short_selling ?? '-' }} +
+
+
+