Skip to content

GitLab

P
power
Commit 4a83eb7a authored by itssonu's avatar itssonu
Browse files
Options

Merge branch 'staging' of git.02pg.com:pardeep01s/power into staging

parents fe790c76 f1667ca3
Pipeline #2213 passed with stage
    in 20 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 492 additions and 206 deletions
    app/Http/Controllers/AdminController.php
    View file @ 4a83eb7a
    This diff is collapsed.
    app/Http/Controllers/ApiController.php
    View file @ 4a83eb7a
    ......@@ -134,37 +134,6 @@ class ApiController extends Controller
    exit(json_encode($return));
    }
    //list of advisors as per dealer id
    public function getAdvisors($dealer_id)
    {
    if (@$dealer_id) {
    $result = DB::table('advisors as a')
    ->join('dealer_department as dd', 'dd.id', '=', 'a.department')
    ->select('a.id', 'a.name', 'a.department', 'dd.name as department_name')->where('a.dealer_id', $dealer_id)
    ->where('a.status', 1)
    ->get();
    $newresult = array();
    foreach ($result as $value) {
    $data['id'] = $value->id;
    $data['name'] = $value->name . "-" . $value->department_name;
    $newresult[] = $data;
    }
    if (count($result) > 0) {
    $return = array('result' => $newresult, 'status_code' => 200);
    exit(json_encode($return));
    } else {
    $result = array();
    $return = array('result' => $result, 'status_code' => 200);
    exit(json_encode($return));
    }
    } else {
    $return = array('result' => 'Something went wrong!', 'status_code' => 204);
    exit(json_encode($return));
    }
    }
    //list of models as per dealer id
    public function getModels($dealer_id)
    {
    ......@@ -351,6 +320,70 @@ class ApiController extends Controller
    return $treatment_type;
    }
    //Dealer Departments
    public function getDealerDepartments($dealer_id)
    {
    if (!empty($dealer_id)) {
    $departments = DB::table("advisors as a")
    ->join("dealer_department as d", "d.id", "=", "a.department")
    ->select("d.id", "d.name")
    ->where(["a.dealer_id" => $dealer_id])
    ->where(["a.status" => 1, "d.status" => 1])
    ->groupBy("d.id")
    ->get();
    $newresult = array();
    foreach ($departments as $value) {
    $data['id'] = $value->id;
    $data['name'] = $value->name;
    $newresult[] = $data;
    }
    if (count($newresult) > 0) {
    $return = array('result' => $newresult, 'status_code' => 200);
    } else {
    $result = array();
    $return = array('result' => $result, 'status_code' => 200);
    }
    } else {
    $return = array('result' => 'Something went wrong!', 'status_code' => 204);
    }
    exit(json_encode($return));
    }
    //list of advisors as per dealer id
    public function getAdvisors(Request $request)
    {
    if (!empty($request->dealer_id) && !empty($request->department_id)) {
    // $result = DB::table('advisors as a')
    // ->join('dealer_department as dd', 'dd.id', '=', 'a.department')
    // ->select('a.id', 'a.name', 'a.department', 'dd.name as department_name')->where('a.dealer_id', $dealer_id)
    // ->where('a.status', 1)
    // ->get();
    $advisors = DB::table("advisors as a")
    ->join("dealer_department as d", "d.id", "=", "a.department")
    ->select("a.id", "a.name")
    ->where(["a.dealer_id" => $request->dealer_id, "d.id" => $request->department_id])
    ->where("a.status", 1)
    ->get();
    $newresult = array();
    foreach ($advisors as $value) {
    $data['id'] = $value->id;
    $data['name'] = $value->name;
    $newresult[] = $data;
    }
    if (count($advisors) > 0) {
    $return = array('result' => $newresult, 'status_code' => 200);
    } else {
    $result = array();
    $return = array('result' => $result, 'status_code' => 200);
    }
    } else {
    $return = array('result' => 'Something went wrong!', 'status_code' => 204);
    }
    exit(json_encode($return));
    }
    // add new job
    public function addJob(Request $decoded)
    {
    ......@@ -415,7 +448,8 @@ class ApiController extends Controller
    $jobData['dealer_id'] = $decoded->dealer_id;
    $jobData['model_id'] = $decoded->model_id;
    $jobData['advisor_id'] = $decoded->advisor_id;
    $jobData['department_id'] = getDealerDepartment($decoded->advisor_id);
    // $jobData['department_id'] = getDealerDepartment($decoded->advisor_id);
    $jobData['department_id'] = $decoded->department_id;
    $jobData['treatments'] = json_encode($treatment_data);
    $jobData['treatment_total'] = count($treatment_id);
    $jobData['lvt_total'] = $l;
    ......@@ -516,7 +550,8 @@ class ApiController extends Controller
    $jobData['dealer_id'] = $decoded->dealer_id;
    $jobData['model_id'] = $decoded->model_id;
    $jobData['advisor_id'] = $decoded->advisor_id;
    $jobData['department_id'] = getDealerDepartment($decoded->advisor_id);
    // $jobData['department_id'] = getDealerDepartment($decoded->advisor_id);
    $jobData['department_id'] = $decoded->advisor_id;
    $jobData['treatments'] = json_encode($treatment_data);
    $jobData['treatment_total'] = count($treatment_id);
    $jobData['lvt_total'] = $l;
    ......
    app/Http/Controllers/AsmController.php
    View file @ 4a83eb7a
    ......@@ -4450,7 +4450,7 @@ class AsmController extends Controller
    $mist[$key]['service_load'] = 0;
    }
    }
    /********************************* Download MIS Report Start *******************************/
    /********************* Download MIS Report Start ************************/
    if (!empty($search['report_type'])) {
    if ($search['report_type'] == 'consolidate') { //consolidated report type
    $excelData = $consolidate_result['consolidatedMisReport'];
    ......
    app/Http/Controllers/HomeController.php
    View file @ 4a83eb7a
    ......@@ -307,28 +307,48 @@ class HomeController extends Controller
    }
    return $res;
    }
    // Get advisors through dealer id in Ajax
    public function getDealerDepartments(Request $request)
    {
    $dealer = $request->dealer;
    $departments = DB::table("advisors as a")
    ->join("dealer_department as d", "d.id", "=", "a.department")
    ->select("d.id", "d.name")
    ->where(["a.dealer_id" => $dealer])
    ->where(["a.status"=>1, "d.status"=>1])
    ->groupBy("d.id")
    ->get();
    $departments = json_decode(json_encode($departments), true);
    if (count($departments)>0) {
    $res = '<option value="">Select Department</option>';
    foreach ($departments as $department) {
    $name = ucfirst($department["name"]);
    $id = $department["id"];
    $res .= "<option value='$id'>$name</option>";
    }
    } else {
    $res = "<option value=''>No Department found</option>";
    }
    return $res;
    }
    // Get advisors through dealer id in Ajax
    public function getAdvisors(Request $request)
    {
    $post = $request->all();
    $dealer = $request->dealer;
    $department_id = $request->department_id;
    $advisors = DB::table("advisors as a")
    ->join("dealer_department as d", "d.id", "=", "a.department")
    ->select(
    "a.id",
    "a.name",
    "a.department",
    "d.name as department_name"
    )
    ->where("a.dealer_id", $dealer)
    ->select("a.id","a.name","a.department","d.name as department_name")
    ->where(["a.dealer_id"=>$dealer, "d.id"=> $department_id])
    ->where("a.status", 1)
    ->get();
    $advisors = json_decode(json_encode($advisors), true);
    if (@$advisors) {
    $res = '<option value="">Select Advisor</option>';
    foreach ($advisors as $advisor) {
    $name = $advisor["name"] . "-" . $advisor["department_name"];
    $name = $advisor["name"];
    $id = $advisor["id"];
    $res .= "<option value='$id'>$name</option>";
    }
    ......
    app/Http/helpers.php
    View file @ 4a83eb7a
    ......@@ -1004,6 +1004,9 @@ function getWorkingDaysCount($from, $to) {
    if (in_array($period->format('*-m-d'), $holidayDays)) continue;
    $days++;
    }
    if($days == 0){
    return 1;
    }
    return $days;
    }
    ......
    resources/views/admin/addJob.blade.php
    View file @ 4a83eb7a
    ......@@ -158,20 +158,41 @@ if (@$advisor_id) {
    </div>
    </div>
    </div>
    <div class="form-group{{ $errors->has('advisor_id') ? ' has-error' : '' }}">
    <label for="advisor_id">Advisor<span class="required-title">*</span></label>
    <select class="form-control required" id="advisor_id" name="advisor_id">
    <option value="">Select Advisor</option>
    @foreach($advisors as $advisor)
    <option @if(old('advisor_id')==$advisor->id) {{ 'selected' }} @endif value="{{ $advisor->id }}">{{ $advisor->name }}</option>
    @endforeach
    </select>
    @if ($errors->has('advisor_id'))
    <span class="help-block">
    <strong>{{ $errors->first('advisor_id') }}</strong>
    </span>
    @endif
    <div class="row">
    <div class="col-sm-6">
    <div class="form-group{{ $errors->has('department_id') ? ' has-error' : '' }}">
    <label for="department_id">Advisor<span class="required-title">*</span></label>
    <select class="form-control required" id="department_id" name="department_id">
    <option value="">Select Department</option>
    {{-- @foreach($dealer_departments as $department)
    <option @if(old('department_id')==$department->id) {{ 'selected' }} @endif value="{{ $department->id }}">{{ ucfirst($department->name) }}</option>
    @endforeach --}}
    </select>
    @if ($errors->has('department_id'))
    <span class="help-block">
    <strong>{{ $errors->first('department_id') }}</strong>
    </span>
    @endif
    </div>
    </div>
    <div class="col-sm-6">
    <div class="form-group{{ $errors->has('advisor_id') ? ' has-error' : '' }}">
    <label for="advisor_id">Advisor<span class="required-title">*</span></label>
    <select class="form-control required" id="advisor_id" name="advisor_id">
    <option value="">Select Advisor</option>
    @foreach($advisors as $advisor)
    <option @if(old('advisor_id')==$advisor->id) {{ 'selected' }} @endif value="{{ $advisor->id }}">{{ $advisor->name }}</option>
    @endforeach
    </select>
    @if ($errors->has('advisor_id'))
    <span class="help-block">
    <strong>{{ $errors->first('advisor_id') }}</strong>
    </span>
    @endif
    </div>
    </div>
    </div>
    {{-- <div class="form-group{{ $errors->has('treatment_id') ? ' has-error' : '' }}">
    <label for="treatment_id">Treatment<span class="required-title">*</span></label>
    <select class="form-control required select2" id="treatment_id" name="treatment_id[]" multiple="">
    ......@@ -447,7 +468,7 @@ if (@$advisor_id) {
    var dealer = $("#dealer_id").val();
    token = $('input[name=_token]').val();
    url1 = '<?php echo url("/"); ?>/getModels';
    url2 = '<?php echo url("/"); ?>/getAdvisors';
    url2 = '<?php echo url("/"); ?>/getDealerDepartments';
    url3 = '{{ url("admin/getdealerUsers") }}';
    url4 = '<?php echo url("/"); ?>/getTreatments';
    data = {
    ......@@ -467,7 +488,7 @@ if (@$advisor_id) {
    }
    });
    $.ajax({
    url: url3,
    url: url2,
    headers: {
    'X-CSRF-TOKEN': token
    },
    ......@@ -475,12 +496,12 @@ if (@$advisor_id) {
    type: 'POST',
    datatype: 'JSON',
    success: function(resp) {
    $("#user_id").html(resp);
    $("#department_id").html(resp);
    return false;
    }
    });
    $.ajax({
    url: url2,
    url: url3,
    headers: {
    'X-CSRF-TOKEN': token
    },
    ......@@ -488,7 +509,7 @@ if (@$advisor_id) {
    type: 'POST',
    datatype: 'JSON',
    success: function(resp) {
    $("#advisor_id").html(resp);
    $("#user_id").html(resp);
    return false;
    }
    });
    ......@@ -512,6 +533,29 @@ if (@$advisor_id) {
    });
    return false;
    });
    $('#department_id').on("change", function(e) {
    var department_id = $(this).val();
    var dealer = $("#dealer_id").val();
    url = '<?php echo url("/"); ?>/getAdvisors';
    data = {
    dealer: dealer,
    department_id: department_id
    };
    $.ajax({
    url: url,
    headers: {
    'X-CSRF-TOKEN': token
    },
    data: data,
    type: 'POST',
    datatype: 'JSON',
    success: function(resp) {
    $("#advisor_id").html(resp);
    return false;
    }
    });
    });
    $('#model_id').on("change", function(e) {
    var dealer = $("#dealer_id").val();
    ......
    resources/views/admin/advisor_percentage_share_report.blade.php
    View file @ 4a83eb7a
    ......@@ -205,7 +205,7 @@
    @else
    <tr>
    <td colspan="8">
    <td colspan="9">
    No Record
    </td>
    ......
    resources/views/admin/editJob.blade.php
    View file @ 4a83eb7a
    ......@@ -159,20 +159,41 @@ if (@$advisor_id) {
    </div>
    </div>
    </div>
    <div class="form-group{{ $errors->has('advisor_id') ? ' has-error' : '' }}">
    <label for="advisor_id">Advisor<span class="required-title">*</span></label>
    <select class="form-control required" id="advisor_id" name="advisor_id">
    <option value="">Select Advisor</option>
    @foreach($advisors as $advisor)
    <option @if($result->advisor_id == $advisor->id) {{ 'selected' }} @endif value="{{ $advisor->id }}">{{ $advisor->name }}</option>
    @endforeach
    </select>
    @if ($errors->has('advisor_id'))
    <span class="help-block">
    <strong>{{ $errors->first('advisor_id') }}</strong>
    </span>
    @endif
    <div class="row">
    <div class="col-sm-6">
    <div class="form-group{{ $errors->has('department_id') ? ' has-error' : '' }}">
    <label for="department_id">Departments<span class="required-title">*</span></label>
    <select class="form-control required" id="department_id" name="department_id">
    <option value="">Select Department</option>
    @foreach($departments as $department)
    <option @if($result->department_id==$department->id) {{ 'selected' }} @endif value="{{ $department->id }}">{{ ucfirst($department->name) }}</option>
    @endforeach
    </select>
    @if ($errors->has('department_id'))
    <span class="help-block">
    <strong>{{ $errors->first('department_id') }}</strong>
    </span>
    @endif
    </div>
    </div>
    <div class="col-sm-6">
    <div class="form-group{{ $errors->has('advisor_id') ? ' has-error' : '' }}">
    <label for="advisor_id">Advisor<span class="required-title">*</span></label>
    <select class="form-control required" id="advisor_id" name="advisor_id">
    <option value="">Select Advisor</option>
    @foreach($advisors as $advisor)
    <option @if($result->advisor_id == $advisor->id) {{ 'selected' }} @endif value="{{ $advisor->id }}">{{ $advisor->name }}</option>
    @endforeach
    </select>
    @if ($errors->has('advisor_id'))
    <span class="help-block">
    <strong>{{ $errors->first('advisor_id') }}</strong>
    </span>
    @endif
    </div>
    </div>
    </div>
    <table id="myTable" class=" table order-list table-responsive">
    <thead>
    <tr>
    ......@@ -391,7 +412,7 @@ if (@$advisor_id) {
    });
    $("table.order-list").on("click", ".ibtnDel", function(event) {
    // $(this).closest("tr").remove();
    if ($(this).closest('tr').siblings().length > 2) {
    if ($(this).closest('tr').siblings().length > 1) {
    $(this).closest('tr').remove();
    counter -= 1
    }
    ......@@ -508,15 +529,18 @@ if (@$advisor_id) {
    $("#grandtotal").text(grandTotal.toFixed(2));
    }
    // $('#dealer_id').on("change", function(e) {
    // var dealer = $("#dealer_id").val();
    // token = $('input[name=_token]').val();
    $('#dealer_id').on("change", function(e) {
    var dealer = $("#dealer_id").val();
    if(dealer == ''){
    $("#advisor_id").val('');
    }
    token = $('input[name=_token]').val();
    // url1 = '<?php echo url("/"); ?>/getModels';
    // url2 = '<?php echo url("/"); ?>/getAdvisors';
    url2 = '<?php echo url("/"); ?>/getDealerDepartments';
    // url3 = '{{ url("admin/getdealerUsers") }}';
    // data = {
    // dealer: dealer,
    // };
    data = {
    dealer: dealer,
    };
    // $.ajax({
    // url: url1,
    // headers: {
    ......@@ -543,21 +567,48 @@ if (@$advisor_id) {
    // return false;
    // }
    // });
    // $.ajax({
    // url: url2,
    // headers: {
    // 'X-CSRF-TOKEN': token
    // },
    // data: data,
    // type: 'POST',
    // datatype: 'JSON',
    // success: function(resp) {
    // $("#advisor_id").html(resp);
    // return false;
    // }
    // });
    // return false;
    // });
    $.ajax({
    url: url2,
    headers: {
    'X-CSRF-TOKEN': token
    },
    data: data,
    type: 'POST',
    datatype: 'JSON',
    success: function(resp) {
    $("#department_id").html(resp);
    return false;
    }
    });
    return false;
    });
    if($("#department_id").val() == ''){
    $("#advisor_id").val('');
    }
    $('#department_id').on("change", function(e) {
    var department_id = $(this).val();
    var dealer = $("#dealer_id").val();
    token = $('input[name=_token]').val();
    url = '<?php echo url("/"); ?>/getAdvisors';
    data = {
    dealer: dealer,
    department_id: department_id
    };
    $.ajax({
    url: url,
    headers: {
    'X-CSRF-TOKEN': token
    },
    data: data,
    type: 'POST',
    datatype: 'JSON',
    success: function(resp) {
    $("#advisor_id").html(resp);
    return false;
    }
    });
    });
    $('#model_id').on("change", function(e) {
    var dealer = $("#dealer_id").val();
    ......
    resources/views/admin/mom_report.blade.php
    View file @ 4a83eb7a
    ......@@ -153,8 +153,7 @@
    <input type="text" id="to" name="to" placeholder="To" value="{{!empty(request()->to)?request()->to:""}}" class="datePickerMonth form-control" autocomplete="off" />
    </div>
    <!-- <div class="form-group report-field col-md-12 col-sm-12 col-xs-12">
    <!-- <div class="form-group report-field col-md-12 col-sm-12 col-xs-12">
    <label>Report Type</label>
    {{-- {{dd(request()->type == 2)}} --}}
    <div class="form-control required">
    ......@@ -163,9 +162,7 @@
    </div>
    </div> -->
    {{-- <input type="hidden" name="type" value="1"> --}}
    <div class="input-group form-group report-field col-md-12 col-sm-12 col-xs-12" style="text-align: center;">
    <input class="btn btn-primary" type="submit" value="Submit">
    </div>
    ......@@ -176,7 +173,6 @@
    </form>
    <!-- <button class="btn btn-success" id="all_dealers" style="margin-left: 48px;">Download Whole Report</button> -->
    {{-- table --}}
    <div class="box-body table-responsive" style="overflow: auto;">
    @if (count($result['consolidatedMomReport'])>0)
    ......
    resources/views/admin/target_report.blade.php
    View file @ 4a83eb7a
    ......@@ -186,13 +186,13 @@ if(isset($_GET['month']) && !empty(@$_GET['month'])){
    <td>{{ $value->target_qty - $value->achieved_qty }}</td>
    <td>{{ number_format($value->target_amount - $value->achieved_amount, '2', '.', '') }}</td>
    <td>
    {{ round(($value->target_qty/getWorkingDaysCount($month_start_date,$month_end_day))) }}
    {{ round((($value->target_qty - $value->achieved_qty)/getWorkingDaysCount(date('Y-m-d'),$month_end_day))) }}
    </td>
    <td>
    {{ number_format(($value->target_amount/getWorkingDaysCount($month_start_date,$month_end_day)),2) }}
    </td>
    <td>
    <a href="{{ url('admin/view_target_report/'.$value->dealer_id) }}">View</a>
    <a href="{{ url('admin/view_target_report/'.$value->dealer_id)}}" id="view_report">View</a>
    </td>
    </tr>
    @endforeach
    ......@@ -214,6 +214,10 @@ if(isset($_GET['month']) && !empty(@$_GET['month'])){
    <script type="text/javascript">
    var month = $('#month').val();
    var view_report = $('#view_report').attr('href');
    $('#view_report').attr('href',view_report+'?month='+month);
    // $("#filterForm").change(function() {
    // // alert("Dfc");
    // $(this).form.submit();
    ......
    resources/views/admin/target_report_view.blade.php
    View file @ 4a83eb7a
    ......@@ -75,14 +75,15 @@
    {{-- table --}}
    <div class="box-body table-responsive" style="overflow: auto;text-align:center;">
    <button onclick="addUrlParameter('excel', '1')" id="download" class="btn btn-success " style="margin-bottom: 10px">Download</button>
    @if (count($targetResult)>0)
    <button onclick="addUrlParameter('excel', '1')" id="download" class="btn btn-success " style="margin-bottom: 10px">Download</button>
    <table class="table table-bordered table-striped report-table mis-table" id="targetReportTable">
    <thead>
    <tr>
    <th rowspan="2">S. No.</th>
    <th rowspan="2">Treatment</th>
    <th rowspan="3">S. No.</th>
    <th rowspan="3">Treatment</th>
    <th colspan="3">Total Target</th>
    <th colspan="3">Achieved Target</th>
    {{-- <th colspan="2">Projected Business</th>
    ......@@ -103,6 +104,14 @@
    <th>Qty</th>
    <th>Amount</th> --}}
    </tr>
    <tr>
    <th>{{ $total_target_qty }}</th>
    <th>{{ $total_target_amount }}</th>
    <th>{{ $total_total_target_amount }}</th>
    <th>{{ $total_achieved_qty }}</th>
    <th>{{ $total_achieved_amount }}</th>
    <th>{{ $total_total_achieved_amount }}</th>
    </tr>
    </thead>
    <tbody>
    ......@@ -110,9 +119,12 @@
    <tr>
    <td>{{ $key+1 }}</td>
    <td>{{ get_treatment_name($value->target_treatment_id) }}</td>
    <td>{{ $value->target_qty }}</td>
    <td>
    {{ $value->target_qty }}
    </td>
    <td>{{ $value->target_amount }}</td>
    <td>{{ $value->target_qty * $value->target_amount }}</td>
    <td>{{ $value->target_qty * $value->target_amount }}
    </td>
    <td>{{ $value->achieved_qty }}</td>
    <td>{{ $value->achieved_amount }}</td>
    <td>{{ $value->achieved_qty*$value->achieved_amount }}</td>
    ......
    routes/api.php
    View file @ 4a83eb7a
    ......@@ -21,7 +21,8 @@ Route::post('/login', 'ApiController@login'); // Login
    Route::post('/match_otp', 'ApiController@matchOTP'); // Match OTP
    Route::get('/check_user/{user_id}/{device_id}', 'ApiController@checkUser'); // Check User
    Route::get('/departments', 'ApiController@departments'); // Departments list
    Route::get('/get_advisors/{dealer_id}', 'ApiController@getAdvisors'); // Advisor list
    Route::get('/get_dealer_departments/{dealer_id}', 'ApiController@getDealerDepartments'); // department list
    Route::post('/get_advisors', 'ApiController@getAdvisors'); // Advisor list
    Route::get('/get_models/{dealer_id}', 'ApiController@getModels'); // Model list
    Route::get('/get_treatments/{dealer_id}/{model_id}', 'ApiController@getTreatments'); // Treatment list
    Route::post('/add_job', 'ApiController@addJob'); // Add job
    ......
    routes/web.php
    View file @ 4a83eb7a
    ......@@ -29,6 +29,7 @@ Route::post('/getDistrict', 'HomeController@getDistrict'); //get districts throu
    Route::post('/getModels', 'HomeController@getModels'); //get models through ajax
    Route::post('/getOEMtemplates', 'HomeController@getOEMtemplates'); //get models through ajax
    Route::post('/getOemModels', 'HomeController@getOemModels'); //get OEM models through ajax
    Route::post('/getDealerDepartments', 'HomeController@getDealerDepartments'); //get departments through ajax
    Route::post('/getAdvisors', 'HomeController@getAdvisors'); //get advisors through ajax
    Route::post('/getTreatments', 'HomeController@getTreatments'); //get treatments through ajax
    Route::post('/getTreatmentPrice', 'HomeController@getTreatmentPrice'); //get treatment price through ajax
    ......
    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

    For any issues contact harsimran@01s.in Powered By 01Synergy