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

app/Http/helpers.php

@@ -616,6 +616,15 @@ function get_treatment_name($treatment_id = NULL)
 	return ucwords(@$result->treatment);
 }
 
+// get treatment customer_price
+function get_treatment_customer_price($treatment_id = NULL)
+{
+	$result = DB::table('treatments')
+		->where('id', $treatment_id)
+		->first();
+	return (@$result->customer_price);
+}
+
 // get template name
 function get_template_name($template_id = NULL)
 {
@@ -971,4 +980,25 @@ function getWorkingDaysCount($from, $to) {
 // 	$data = DB::table('treatments')->where('id',$treatment_id)->first();
 // 	// dd($data);
 // 	return sizeName(@$data->size_id);
-// }
\ No newline at end of file
+// }
+
+
+function averageTargetCount($count,$average,$percent)
+{
+	$mean = $count/$average;
+	// dd($count,$average,$percent);
+	$data = ceil(($mean*$percent)/100);
+	return $data;
+}
+
+function getTaregtAmount($target_id)
+{
+	$data = DB::table('target_treatments')->where('target_id',$target_id)->sum('total_price');
+	return $data;
+}
+
+function getTaregtNumber($target_id)
+{
+	$data = DB::table('target_treatments')->where('target_id',$target_id)->sum('target_num');
+	return $data;
+}
\ No newline at end of file

resources/views/admin/target_report.blade.php

@@ -134,11 +134,13 @@ if(isset($_GET['month']) && !empty(@$_GET['month'])){
 
               </div>
             </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;text-align:center;">
               @if (count($targetResult)>0)
+              <button onclick="addUrlParameter('excel', '1')"  id="download" class="btn btn-success">Download</button>
               <table class="table table-bordered table-striped report-table mis-table" id="targetReportTable">
                 <thead>
                   <tr>

resources/views/admin/targets.blade.php

@@ -53,13 +53,8 @@
                       <tr>
                         <th>Sr. No.</th>
                         <th>Dealer</th>
-                        <!-- <th>Template</th> -->
-                        <th>Total Target</th>
-                        <th>Achieve Target</th>
-                        <th>Pending</th>
-                        <th>Total Price</th>
-                        <th>Achieve Price</th>
-                        <th>Balance</th>
+                        <th>Total Target Amount</th>
+                        <th>Total Target Number</th>
                         <th>Month</th>
                         <th>Action</th>
                       </tr>
@@ -74,16 +69,12 @@
                             <td>{{++$s}}</td>
 
                             <td>{{get_dealer_name($value->dealer_id)}}</td>
-                            {{-- <td>{{get_template_name($value->template_id)}}</td>  --}}
-                            <td>{{$value->total_treatments}}</td>
-                            <td>{{$value->done_treatments}}</td>
-                            <td>{{$pending = $value->total_treatments - $value->done_treatments}}</td>
-                            <td>{{$value->total_treatments_price}}</td>
-                            <td>{{$value->done_treatments_price}}</td>
-                            <td>{{ $balance_target = $value->total_treatments_price - $value->done_treatments_price}}</td>
-                            <td>{{$value->month}}</td>
+                            <td>{{getTaregtAmount($value->id)}}</td>
+                            <td>{{getTaregtNumber($value->id)}}</td>
+                    
+                            <td>{{date("Y-m", strtotime($value->month))}}</td>
                             <td>
-                              <a href="{{ url('/admin/targetListing')}}/{{$value->id}}" class="btn btn-success"><span class="glyphicon glyphicon-chevron-right"></span></a>
+                              <a href="{{ url('/admin/editTarget')}}/{{$value->id}}" class="btn btn-success"><span class="glyphicon glyphicon-chevron-right"></span></a>
                             {{-- <a href="{{ url('/admin/statusTarget/delete')}}/{{$value->id}}" onclick="return confirm('Are you sure want to delete?')" class="btn btn-danger">Delete</a> --}}
                             </td> 
                           </tr>   
@@ -100,13 +91,8 @@
                       <tr>
                         <th>Sr. No.</th>
                         <th>Dealer</th>
-                        <!-- <th>Template</th> -->
-                        <th>Total Target</th>
-                        <th>Achieve Target</th>
-                        <th>Pending</th>
-                        <th>Total Price</th>
-                        <th>Achieve Price</th>
-                        <th>Balance</th>
+                        <th>Total Target Amount</th>
+                        <th>Total Target Number</th>
                         <th>Month</th>
                         <th>Action</th>
                       </tr>

resources/views/admin/treatments.blade.php

@@ -109,7 +109,7 @@
                       <td>
                         {{$value->size_name}}
                       </td>
-                      <td>@if($value->treatment_type==0) Normal @elseif($value->treatment_type==1) Heavy @endif</td>
+                      <td>@if($value->treatment_type==0) LVT @elseif($value->treatment_type==1) HVT @endif</td>
                       <td>{{$value->labour_code}}</td>
                       <td>{{round($value->customer_price)}}</td>
                       <td>{{round($value->dealer_price)}}</td>

routes/web.php

@@ -323,9 +323,11 @@ Route::group(['prefix' => 'admin', 'as' => 'admin::', 'middleware' => ['web', 'a
   // Target Module
   Route::get('targets', 'AdminController@targets');
   Route::get('addTarget', 'AdminController@addTarget');
+  Route::post('insertTempTarget', 'AdminController@insertTempTarget');
+  Route::get('editTarget/{target_id}', 'AdminController@editTarget');
+
   Route::get('addTempTarget/{dealer_id}/{temp_id}', 'AdminController@addTempTarget');
   Route::get('getDealerTemplates', 'AdminController@getDealerTemplates');
-  Route::post('insertTempTarget', 'AdminController@insertTempTarget');
   Route::get('targetListing/{target_id}', 'AdminController@targetListing');
   Route::post('getTargetid', 'AdminController@getTargetid');
   Route::get('editTempTarget/{dealer_id}/{temp_id}/{target_id}', 'AdminController@editTempTarget');