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

bugs fixing

Browse Source
This commit is contained in:
meghamalore
2024-07-02 10:48:37 +05:30
parent 9ba3a476a5
commit 227a2694fb
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -125,6 +125,12 @@ class DashboardController extends Controller
}
$getTotal = $getTotal->selectRaw(\DB::raw('SUM(total_investment_or_commitment_amount) as total_commission, SUM(gross_commissioned_earned_inr) as total_gross, SUM(net_commission_received) as total_net'))
->first();
// $getTotal = MonthlyUpdateMasterCommission::select(
// \DB::raw('SUM(total_investment_or_commitment_amount) as total_commission'),
// \DB::raw('SUM(gross_commissioned_earned_inr) as total_gross'),
// \DB::raw('SUM(net_commission_received) as total_net')
// )->first();
// dd($getTotal);
return response()->json([
'total_investment' => $this->IND_money_format($totalInvestment),
'gross_commission' => $this->IND_money_format($getTotal->total_gross),

16
app/Http/Controllers/Admin/ManageUserProductController.php
View File

@@ -406,14 +406,14 @@ class ManageUserProductController extends Controller
// dd($request->all());
// return $request->update_id;
$update_data = MonthlyUpdateMaster::where('id', $request->eid)->update([
"users_id" => $request->euserid,
"categories" => $request->categories,
// "users_id" => $request->euserid,
// "categories" => $request->categories,
// "custom_id"=>$request->interest_paidout,
"investor_name" => $request->investor_name,
"pan" => $request->pan,
"product_category" => $request->product_category,
"investment_platform" => $request->investment_platform,
"product_name" => $request->product_name,
// "investor_name" => $request->investor_name,
// "pan" => $request->pan,
// "product_category" => $request->product_category,
// "investment_platform" => $request->investment_platform,
// "product_name" => $request->product_name,
"counter_party" => $request->counter_party,
"account_number" => $request->account_number,
"spv_details" => $request->spv_details,
@@ -1293,7 +1293,7 @@ class ManageUserProductController extends Controller
$validator = Validator::make($request->post(), [
'id' => 'required',
'total_value_of_the_property' => 'required',
'investment_value' => 'required',
' ' => 'required',
'investment_date' => 'required',
'total_gross_interest' => 'required',
'tds' => 'required',

1
resources/views/Admin/general-dashboard.blade.php
View File

@@ -292,6 +292,7 @@
to: $('#to-date').val()
},
success: function(result) {
console.log(result);
$('#total-investment-sum').html(result.total_investment);
$('#total-gross-commission-sum').html(result.gross_commission);
$('#total-net-commission-sum').html(result.net_commission);