diff --git a/app/Http/Controllers/Admin/ManageCommissionController.php b/app/Http/Controllers/Admin/ManageCommissionController.php
index 69983bd..5702db4 100644
--- a/app/Http/Controllers/Admin/ManageCommissionController.php
+++ b/app/Http/Controllers/Admin/ManageCommissionController.php
@@ -58,30 +58,24 @@ class ManageCommissionController extends Controller
// ->orderBy('products.created_at')
->latest('products.created_at')
->get();
- // dd($products);
- $products->each(function($value){
- $monthlyData = MonthlyUpdateMaster::where('products_id',$value->id)->get();
+ // dd($products);
+ $products->each(function ($value) {
+ $monthlyData = MonthlyUpdateMaster::where('products_id', $value->id)->get();
$totalCommission = 0;
$totalInvestment = 0;
- if($monthlyData->isNotEmpty())
- {
- foreach($monthlyData as $monthlyDataRow)
- {
- if(MonthlyUpdateFractionalRealEstate::where('custom_id',$monthlyDataRow->custom_id)->exists())
- {
- $freData = MonthlyUpdateFractionalRealEstate::where('custom_id',$monthlyDataRow->custom_id)->first();
+ if ($monthlyData->isNotEmpty()) {
+ foreach ($monthlyData as $monthlyDataRow) {
+ if (MonthlyUpdateFractionalRealEstate::where('custom_id', $monthlyDataRow->custom_id)->exists()) {
+ $freData = MonthlyUpdateFractionalRealEstate::where('custom_id', $monthlyDataRow->custom_id)->first();
$totalInvestment += floatval($freData->getRawOriginal()['investment_value']);
}
- if(MonthlyUpdateAlternativeInvestmentFund::where('custom_id',$monthlyDataRow->custom_id)->exists())
- {
- $aifData = MonthlyUpdateAlternativeInvestmentFund::where('custom_id',$monthlyDataRow->custom_id)->first();
+ if (MonthlyUpdateAlternativeInvestmentFund::where('custom_id', $monthlyDataRow->custom_id)->exists()) {
+ $aifData = MonthlyUpdateAlternativeInvestmentFund::where('custom_id', $monthlyDataRow->custom_id)->first();
$totalInvestment += floatval($aifData->getRawOriginal()['commitment_amount']);
}
- $data = MonthlyUpdateMasterCommission::where('monthly_id',$monthlyDataRow->id)->get();
- if($data->isNotEmpty())
- {
- foreach($data as $dataRow)
- {
+ $data = MonthlyUpdateMasterCommission::where('monthly_id', $monthlyDataRow->id)->get();
+ if ($data->isNotEmpty()) {
+ foreach ($data as $dataRow) {
$totalCommission += floatval($dataRow->getRawOriginal()['gross_commissioned_earned_inr']);
}
}
@@ -193,6 +187,12 @@ class ManageCommissionController extends Controller
if (!$check) {
abort(404);
}
+ // $data = MonthlyUpdateMasterCommission::query()
+ // ->with('monthlyUpdate.products.fractional_real_estate')
+ // ->latest()
+ // ->get();
+ // // ->select('*');
+ // dd($data->toArray());
return view('Admin.Pages.manage_commission.user_commission');
}
@@ -262,7 +262,7 @@ class ManageCommissionController extends Controller
return '' . $row->monthlyUpdate->investor_name . '
';
})
->editColumn('product_sold', function ($row) {
- return '' . 'ABC' . '
';
+ return '' . $row->monthlyUpdate->product_name . '
';
})
->editColumn('month', function ($row) {
return '' . $row->created_at->format('M') . '
';
@@ -283,11 +283,11 @@ class ManageCommissionController extends Controller
-
-
-
";
+ //
+ //
+ //
return $btn;
})
->rawColumns(['investor_name', 'product_sold', 'month', 'total_investment', 'applicable_rate', 'commission_type', 'created_at', 'action'])
@@ -298,8 +298,7 @@ class ManageCommissionController extends Controller
public function trailCommission()
{
$check = checkSidebarAccess('trail-commission');
- if(!$check)
- {
+ if (!$check) {
abort(404);
}
return view('Admin.Pages.manage_commission.trail_commission', [
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index 9d44456..21b0d5f 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -1306,7 +1306,7 @@ table th,
table td,
.align-top {
vertical-align: middle !important;
- width: auto !important;
+ /* width: auto !important; */
}
.card-body.py-4 {
@@ -1352,20 +1352,29 @@ button.btn.btn-light-primary.me-3 {
justify-content: flex-start !important;
margin: 0 auto 0 0;
}
-.table.gy-5 td, .table.gy-5 th {
+.table.gy-5 td,
+.table.gy-5 th {
padding: 1.25rem !important;
}
-.tabdiv input, .tabdiv select {
+.tabdiv input,
+.tabdiv select {
border: 1px solid #e0dddd;
padding: 10px !important;
height: 40px;
border-radius: 5px;
width: 50%;
}
-.tabdiv input[type="checkbox"] {border: 1px solid #e0dddd !important;display: flex;width: 20px;height: 20px;justify-content: flex-start !important;margin: 0 auto 0 0;}
+.tabdiv input[type="checkbox"] {
+ border: 1px solid #e0dddd !important;
+ display: flex;
+ width: 20px;
+ height: 20px;
+ justify-content: flex-start !important;
+ margin: 0 auto 0 0;
+}
.card {
padding: 20px;
}
.index-box .card {
min-height: 230px !important;
-}
\ No newline at end of file
+}
diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
index 6645d7f..a5a4ed9 100644
--- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
@@ -3,7 +3,7 @@
@section('style')
-
+