Commit b14b3eb9 authored by Pardeep Sahu's avatar Pardeep Sahu

target report download calculation issue fixed

parent e3ec50ac
Pipeline #2587 passed with stage
in 22 seconds
......@@ -14399,7 +14399,7 @@ class AdminController extends Controller
if ($month == 'current') {
$currentDay = date('Y-m-d');
$goneMonthDays = getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'));
$goneMonthDays = (getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'))-1);
} else {
$currentDay = $start_date;
$goneMonthDays = getWorkingDaysCount($start_date, $end_day);
......
......@@ -8074,7 +8074,7 @@ class AsmController extends Controller
if ($month == 'current') {
$currentDay = date('Y-m-d');
$goneMonthDays = getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'));
$goneMonthDays = (getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'))-1);
} else {
$currentDay = $start_date;
$goneMonthDays = getWorkingDaysCount($start_date, $end_day);
......
......@@ -7065,6 +7065,7 @@ class RsmController extends Controller
public function target_report(Request $request)
{
$search = $request->all();
$user_id = Auth::id();
$result['allFirms'] = DB::table('firms')->where('status', 1)->orderBy('firm_name', 'ASC')->get();
//asm
......@@ -7093,7 +7094,7 @@ class RsmController extends Controller
$result['allDealers'] = $result['allDealers']->where("oem_id", $request->oem);
}
if (!empty($request->asm_id)) {
if (!empty($user_id)) {
$result['allDealers'] = $result['allDealers']->whereRaw("find_in_set($request->asm_id,reporting_authority)");
}
......@@ -7262,7 +7263,7 @@ class RsmController extends Controller
if ($month == 'current') {
$currentDay = date('Y-m-d');
$goneMonthDays = getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'));
$goneMonthDays = (getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'))-1);
} else {
$currentDay = $start_date;
$goneMonthDays = getWorkingDaysCount($start_date, $end_day);
......
......@@ -7536,6 +7536,7 @@ class SseController extends Controller
public function target_report(Request $request)
{
$search = $request->all();
$user_id = Auth::id();
$result['allFirms'] = DB::table('firms')->where('status', 1)->orderBy('firm_name', 'ASC')->get();
//asm
......@@ -7564,7 +7565,7 @@ class SseController extends Controller
$result['allDealers'] = $result['allDealers']->where("oem_id", $request->oem);
}
if (!empty($request->asm_id)) {
if (!empty($user_id)) {
$result['allDealers'] = $result['allDealers']->whereRaw("find_in_set($request->asm_id,reporting_authority)");
}
......@@ -7735,7 +7736,7 @@ class SseController extends Controller
if ($month == 'current') {
$currentDay = date('Y-m-d');
$goneMonthDays = getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'));
$goneMonthDays = (getWorkingDaysCount(date('Y-m-01'), date('Y-m-d'))-1);
} else {
$currentDay = $start_date;
$goneMonthDays = getWorkingDaysCount($start_date, $end_day);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment