diff --git a/app/Http/Controllers/Admin/ManageCommissionController.php b/app/Http/Controllers/Admin/ManageCommissionController.php index cedc06f..a67ffd4 100644 --- a/app/Http/Controllers/Admin/ManageCommissionController.php +++ b/app/Http/Controllers/Admin/ManageCommissionController.php @@ -58,6 +58,51 @@ 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)->pluck('id'); + // $totalCommissionEarnedTillNow = 0; + // if($monthlyData->toArray() != null) + // { + // $monthlyData->each(function($monthlyID) use($totalCommissionEarnedTillNow){ + // $data = MonthlyUpdateMasterCommission::where('id',$monthlyID)->get(); + // if($data->toArray() != null) + // { + // $totalCommissionEarnedTillNow2 = 0; + // $data->each(function($dataValue) use ($totalCommissionEarnedTillNow2){ + // $totalCommissionEarnedTillNow2 += floatval($dataValue->getRawOriginal()['gross_commissioned_earned_inr']); + // }); + // $dataValue->commissionEarned = $totalCommissionEarnedTillNow2; + // // $totalCommissionEarnedTillNow = $totalCommissionEarned; + // } + // }); + // } + // $value->totalCommissionEarnedTillNow = $totalCommissionEarnedTillNow; + // }); + + $products->each(function($value){ + $monthlyData = MonthlyUpdateMaster::where('products_id',$value->id)->get(); + $totalCommission = 0; + if($monthlyData->isNotEmpty()) + { + foreach($monthlyData as $monthlyDataRow) + { + $data = MonthlyUpdateMasterCommission::where('monthly_id',$monthlyDataRow->id)->get(); + if($data->isNotEmpty()) + { + // dd($data); + foreach($data as $dataRow) + { + $totalCommission += floatval($dataRow->getRawOriginal()['gross_commissioned_earned_inr']); + } + } + } + } + // dd($totalCommission); + $value->totalCommission = $totalCommission; + // dd($value); + }); + // dd($products); return view('Admin.Pages.manage_commission.manage_commission', compact('products')); } diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php index c5b2515..47fe51f 100644 --- a/app/Http/Controllers/Admin/ManageUserProductController.php +++ b/app/Http/Controllers/Admin/ManageUserProductController.php @@ -25,6 +25,7 @@ use App\Models\MonthlyUpdatePeerToPeerLending; use App\Models\Product; use App\Notifications\UserAdmin; use App\Exports\UserProduct; +use Carbon\Carbon; class ManageUserProductController extends Controller { @@ -820,6 +821,8 @@ class ManageUserProductController extends Controller 'product_name' => $request->product_name, 'account_number' => $request->account_number, 'spv_details' => $request->spv_details, + 'created_at' => Carbon::now(), + 'updated_at' => Carbon::now(), ]); $statementReportsArray = array(); diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index c89c06b..e4ef3ff 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -834,8 +834,20 @@ class DashboardController extends Controller ->join('marketplace_aif_sellers', 'marketplace_buyer_forms.associated_id', 'marketplace_aif_sellers.id') ->alernativeInvestmentFund() ->where('listing_status', '!=', 'Hide') - ->select('name_of_the_aif_fund', 'fund_category', 'fund_strategy', 'type_of_fund', 'total_capital_commitment', 'uncalled_capital_commitment') + ->notSold() + // ->select('name_of_the_aif_fund', 'fund_category', 'fund_strategy', 'type_of_fund', 'total_capital_commitment', 'uncalled_capital_commitment') + ->select( + 'marketplace_buyer_forms.*', // Select all columns from marketplace_aif_sellers + 'marketplace_aif_sellers.name_of_the_aif_fund', + 'marketplace_aif_sellers.fund_category', + 'marketplace_aif_sellers.fund_strategy', + 'marketplace_aif_sellers.type_of_fund', + 'marketplace_aif_sellers.total_capital_commitment', + 'marketplace_aif_sellers.uncalled_capital_commitment' + ) ->get(); + // $data['data'] = MarketplaceBuyerForm::has('aifSellerData')->with('aifSellerData')->alernativeInvestmentFund()->notSold()->get(); + // dd($data['data']->toArray()); return $data; } @@ -847,7 +859,17 @@ class DashboardController extends Controller // ->with('compaines') ->fractionalRealEstate() ->where('listing_status', '!=', 'Hide') - ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') + ->notSold() + // ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') + ->select( + 'marketplace_buyer_forms.*', // Select all columns from marketplace_aif_sellers + 'marketplace_fre_sellers.property_name', + 'marketplace_fre_sellers.property_address', + 'marketplace_fre_sellers.property_grade', + 'marketplace_fre_sellers.asset_type', + 'marketplace_fre_sellers.fractional_real_estate_platform', + 'marketplace_fre_sellers.expected_selling_price' + ) ->get(); $data['data']->each(function($value){ if($value->fractional_real_estate_platform != null) diff --git a/app/Models/MarketplaceBuyerForm.php b/app/Models/MarketplaceBuyerForm.php index 8408c06..05fca48 100644 --- a/app/Models/MarketplaceBuyerForm.php +++ b/app/Models/MarketplaceBuyerForm.php @@ -14,6 +14,11 @@ class MarketplaceBuyerForm extends Model protected $appends = ['fund_category']; + public function scopeNotSold($query) + { + return $query->where('marketplace_buyer_forms.status','!=','Sold'); + } + public function scopeAlernativeInvestmentFund($query) { return $query->where([ diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css index 23497f8..aa7e1bf 100644 --- a/public/assets/css/style.bundle.css +++ b/public/assets/css/style.bundle.css @@ -57874,3 +57874,17 @@ html:not([data-theme="dark"]) { justify-content: flex-start !important; margin: 0 auto 0 0; } +.table.gy-5 td, .table.gy-5 th { + padding: 1.25rem !important; +} +.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;} +.card { + padding: 20px; +} \ No newline at end of file diff --git a/public/assets/css/style.css b/public/assets/css/style.css index ce0fbb3..11d79f7 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -1352,3 +1352,17 @@ 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 { + padding: 1.25rem !important; +} +.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;} +.card { + padding: 20px; +} \ No newline at end of file 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 34f7f0f..490f06a 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,8 @@ + {{-- @dd($product) --}} @foreach ($products as $product) - {{-- @dd($product); --}}
{{ $product->commission_type }} {{ $product->category_name }} {{ number_format($product->rate ?? $product->upfront_rate ?? $product->trail_rate,2) }} % - {{ $product->commission }} + {{ $product->totalCommission }} {{--
-
- -
- -
- -
- -
- @csrf - -
- Logo -
- - -
- -

Mail Verification

- - -
Please enter the OTP sent to registered - Mail ID
- -
- - -
- -
Type your 4 digit security - code.
- - -
- - - - +
+
+ +
+ +
+ +
+ + + @csrf + +
+ Logo
- -
-
OTP has been sent to your Mail ID. OTP valid - for 02:00 Sec
- - -
- {{-- + + +
+ +

Mail Verification

+ + +
Please enter the OTP sent to + registered + Mail ID
+ +
+ + +
+ +
Type your 4 digit security + code.
+ + +
+ + + + +
+ +
+
OTP has been sent to your Mail ID. OTP + valid + for 02:00 Sec
+ + +
+ {{-- Submit --}} - + +
+ + + + + +
+ Didn’t get the code ? + Resend OTP
- - - - - -
- Didn’t get the code ? - Resend OTP +
- + +
+ +
+ + +
+ +
- +
- - -
- - - -
-
@@ -200,7 +204,7 @@ // window.location.href='/dashboard'; setTimeout(() => { // location.reload(); - // window.location.href = "{{route('welcome-to-dashboard')}}"; + // window.location.href = "{{ route('welcome-to-dashboard') }}"; window.location.href = result.return_to_page; }, 1000); } @@ -217,7 +221,7 @@ setTimeout(function() { $('#message').html(''); $('#result').addClass('d-none').removeclass( - 'alert-warning'); + 'alert-warning'); }, 3000); // toastr.warning(result.message); }