diff --git a/app/Http/Controllers/Admin/ManageCommissionController.php b/app/Http/Controllers/Admin/ManageCommissionController.php index 7d8a2e1..8e26b3f 100644 --- a/app/Http/Controllers/Admin/ManageCommissionController.php +++ b/app/Http/Controllers/Admin/ManageCommissionController.php @@ -21,6 +21,7 @@ use Yajra\DataTables\Contracts\DataTable; use Yajra\DataTables\Facades\DataTables; use Illuminate\Support\Carbon; use Carbon\CarbonPeriod; +use File; class ManageCommissionController extends Controller { @@ -97,6 +98,7 @@ class ManageCommissionController extends Controller public function viewProduct($id, $product = 'product') { + // dd($id,$product); return view('Admin.Pages.manage_commission.view_commission', [ 'product' => Product::with('category')->find($id), 'product_name' => $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/real-estate_images/202406121711_IMG-20240427-WA0004.jpg b/public/assets/uploads/real-estate_images/202406121711_IMG-20240427-WA0004.jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/assets/uploads/real-estate_images/202406121711_IMG-20240427-WA0004.jpg differ diff --git a/public/assets/uploads/real-estate_images/202406121734_IMG-20240427-WA0004.jpg b/public/assets/uploads/real-estate_images/202406121734_IMG-20240427-WA0004.jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/assets/uploads/real-estate_images/202406121734_IMG-20240427-WA0004.jpg differ diff --git a/public/assets/uploads/real-estate_images/202406121748_IMG-20240427-WA0004.jpg b/public/assets/uploads/real-estate_images/202406121748_IMG-20240427-WA0004.jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/assets/uploads/real-estate_images/202406121748_IMG-20240427-WA0004.jpg differ diff --git a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php index 1700cbd..e80f195 100644 --- a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php @@ -95,8 +95,9 @@
- {{-- @dd($product) --}} + {{-- @dd($products->toArray()) --}} @foreach ($products as $product) +