modified output report

@@ -57,10 +57,11 @@ class OutputReportController extends Controller
 
 
                 $outputReport = OutputReport::firstOrCreate(
                 $outputReport = OutputReport::firstOrCreate(
                     array(
                     array(
-                        'product_id' =>  $value['productId']
+                        'product_id' =>  $value['productId'],
+                        'user_id' => Auth::user()->id
                     )
                     )
                 );
                 );
-                $outputReport->user_id = Auth::user()->id;
+                //$outputReport->user_id = Auth::user()->id;
 		$outputReport->user_name = Auth::user()->username;
 		$outputReport->user_name = Auth::user()->username;
                 $outputReport->date = date("Y-m-d");
                 $outputReport->date = date("Y-m-d");
                 $outputReport->call_attempts = $request->input('noOfAttempts');
                 $outputReport->call_attempts = $request->input('noOfAttempts');
@@ -113,6 +114,26 @@ class OutputReportController extends Controller
 	    $report = DB::table('output_report')
 	    $report = DB::table('output_report')
 		->where('user_id',Auth::user()->id)
 		->where('user_id',Auth::user()->id)
 		->get();
 		->get();
+       
+
+            $outputReport = array();
+            foreach ($products as $pkey => $pvalue) {
+                
+                $outputReport[$pvalue->productId] = array('name' => $pvalue->name, 'productId' => $pvalue->productId);
+
+                foreach ($report as $key => $value) {
+
+                    if($value->product_id == $pvalue->productId){
+                    $outputReport[$value->product_id]['lead_generated'] = $value->lead_generated;
+                     $outputReport[$value->product_id]['lead_generated_amount'] = $value->lead_generated_amount;
+                      $outputReport[$value->product_id]['lead_closed'] = $value->lead_closed;
+                       $outputReport[$value->product_id]['lead_closed_amount'] = $value->lead_closed_amount;
+
+                   }
+                }
+
+            }
+
             // total income
             // total income
             $totalIncome = DB::select("select sum(income) as income from output_report where user_id=".Auth::user()->id);
             $totalIncome = DB::select("select sum(income) as income from output_report where user_id=".Auth::user()->id);
 	
 	
@@ -144,7 +165,7 @@ class OutputReportController extends Controller
         $output = DB::table('output_report')->whereIn('user_id',$usersarray)->where('date','=',date("Y-m-d"))->orderBy('user_id')->get();	
         $output = DB::table('output_report')->whereIn('user_id',$usersarray)->where('date','=',date("Y-m-d"))->orderBy('user_id')->get();	
 
 
             $data['disabled']       = $disabled;
             $data['disabled']       = $disabled;
-            $data['products']       = $products;
+            $data['products']       = $outputReport;
             $data['totalIncome']    = $totalIncome[0]->income;
             $data['totalIncome']    = $totalIncome[0]->income;
             $data['noOfAttempts']   = $noOfAttempts;
             $data['noOfAttempts']   = $noOfAttempts;
             $data['noOfContacts']   = $noOfContacts;
             $data['noOfContacts']   = $noOfContacts;

@@ -48,32 +48,20 @@ if(Auth::user()->id=="1" || Auth::user()->id == "199"){ ?>
 						</thead>
 						</thead>
 						<tbody>
 						<tbody>
 							<?php				
 							<?php				
-	//include(resource_path().'/views/layout/module/virtualchannel/VirtualFieldsArray.php'); 
-							foreach ($report as $key1 => $value1) {
-							//print_r($key1);
 							$i=1;	
 							$i=1;	
 							foreach ($products as $key => $value) {
 							foreach ($products as $key => $value) {
-		//print_r($value);
-		//print_r($ProductType);
-	//foreach ($report as $key1 => $value1) {
-		//print_r($value1);
-	//if($value1->product_name != $value->name)continue;
 								?>
 								?>
 								<tr>
 								<tr>
-									<td> <input type="hidden" name="products[<?= $i ?>][productId]" value="{{$value->productId}}">
-										<input type="hidden" name="products[<?= $i ?>][product]" value="{{ $value->name }} " >{{ $value->name }}</td>
-		<?php //foreach ($report as $key1 => $value1) {
-	//print_r($value1);
-?>
-										<td><input type="number" name="products[<?= $i ?>][lg]" value="{{isset($value1->lead_generated)?$value1->lead_generated:'0'}}" $disabled></td>
-										<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lgAmt]"  value="{{isset($value1->lead_generated_amount)?$value1->lead_generated_amount:'0'}}" $disabled></td>
-										<td><input type="number" name="products[<?= $i ?>][lc]" value="{{isset($value1->lead_closed)?$value1->lead_closed:'0'}}" $disabled></td>
-										<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lcAmt]" value="{{isset($value1->lead_closed_amount)?$value1->lead_closed_amount:'0'}}" $disabled></td>
+									<td> <input type="hidden" name="products[<?= $i ?>][productId]" value="{{$value['productId']}}">
+										<input type="hidden" name="products[<?= $i ?>][product]" value="{{ $value['name'] }} " >{{ $value['name'] }}</td>
+										<td><input type="number" name="products[<?= $i ?>][lg]" value="{{isset($value['lead_generated'])?$value['lead_generated']:'0'}}" $disabled></td>
+										<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lgAmt]"  value="{{isset($value['lead_generated_amount'])?$value['lead_generated_amount']:'0'}}" $disabled></td>
+										<td><input type="number" name="products[<?= $i ?>][lc]" value="{{isset($value['lead_closed'])?$value['lead_closed']:'0'}}" $disabled></td>
+										<td><input type="number" min="0" step="0.01" name="products[<?= $i ?>][lcAmt]" value="{{isset($value['lead_closed_amount'])?$value['lead_closed_amount']:'0'}}" $disabled></td>
 									</tr>
 									</tr>
 									<?php
 									<?php
-								//	}
 									$i++;
 									$i++;
-								}} ?>
+								} ?>
 
 
 								@if($disabled == "")
 								@if($disabled == "")
 								<tr>
 								<tr>