diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index fbb4dc7..0f029fd 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -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), diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php index 5106056..d71b524 100644 --- a/app/Http/Controllers/Admin/ManageUserProductController.php +++ b/app/Http/Controllers/Admin/ManageUserProductController.php @@ -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', diff --git a/resources/views/Admin/general-dashboard.blade.php b/resources/views/Admin/general-dashboard.blade.php index 2e57898..cceac1a 100644 --- a/resources/views/Admin/general-dashboard.blade.php +++ b/resources/views/Admin/general-dashboard.blade.php @@ -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);