add column category in wo list

app/Http/Controllers/CustomerService/WorkOrderController.php

@@ -298,6 +298,13 @@ class WorkOrderController extends Controller
 				}else if($form->type_application == 'B'){
 					$name = $form->Subscriber->company_name;
 				}
+				
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
 
 				if(empty($product)){
 					$product = 'R Mbps';
@@ -323,6 +330,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,
@@ -407,6 +415,13 @@ class WorkOrderController extends Controller
 					$name = $form->Subscriber->company_name;
 				}
 
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
+
 				if(empty($product)){
 					$product = 'R Mbps';
 				}else {
@@ -431,6 +446,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,
@@ -515,6 +531,13 @@ class WorkOrderController extends Controller
 					$name = $form->Subscriber->company_name;
 				}
 
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
+
 				if(empty($product)){
 					$product = 'R Mbps';
 				}else {
@@ -539,6 +562,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,
@@ -626,6 +650,13 @@ class WorkOrderController extends Controller
 					$name = $form->Subscriber->company_name;
 				}
 
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
+
 				if(empty($product)){
 					$product = 'R Mbps';
 				}else {
@@ -650,6 +681,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,
@@ -734,6 +766,13 @@ class WorkOrderController extends Controller
 					$name = $form->Subscriber->company_name;
 				}
 
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
+
 				if(empty($product)){
 					$product = 'R Mbps';
 				}else {
@@ -759,6 +798,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,
@@ -843,6 +883,13 @@ class WorkOrderController extends Controller
 					$name = $form->Subscriber->company_name;
 				}
 
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
+
 				if(empty($product)){
 					$product = 'R Mbps';
 				}else {
@@ -867,6 +914,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,
@@ -951,6 +999,13 @@ class WorkOrderController extends Controller
 					$name = $form->Subscriber->company_name;
 				}
 
+				$category = $form->customer_category;
+				if(empty($category)){
+					$category = '';
+				}else {
+					$category = $form->customer_category;
+				} 
+
 				if(empty($product)){
 					$product = 'R Mbps';
 				}else {
@@ -975,6 +1030,7 @@ class WorkOrderController extends Controller
 					'formT' => $n1.$i.$w->Form->type_application,
 					'service' => $w->nature_work,
 					'wo' => $w->wo,
+					'category' => $category,
 					'name' => $name,
 					'phone' => $form->Subscriber->phone1,
 					'unit' => $unit,

resources/views/customer-service/confirm_work_order.blade.php

@@ -80,7 +80,7 @@
 									<option value="Astro"<?php if($form->customer_category == "Astro") { echo "selected"; } ?>>Astro</option>
 									<option value="Maxis"<?php if($form->customer_category == "Maxis") { echo "selected"; } ?>>Maxis</option>
 									<option value="Digi"<?php if($form->customer_category == "Digi") { echo "selected"; } ?>>Digi</option>
-									<option value="Celcom"<?php if($form->customer_category == "Celcom") { echo "selected"; } ?>>Celcom</option>
+									<option value="Celcom"<?php if($form->cust_category == "Celcom") { echo "selected"; } ?>>Celcom</option>
 								</select>
 							</div>	
 							<div class="grid2">&nbsp;</div>

resources/views/customer-service/view_wo.blade.php

@@ -53,6 +53,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -76,6 +77,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -99,6 +101,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -122,6 +125,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -145,6 +149,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -168,6 +173,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -191,6 +197,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -215,6 +222,7 @@
 							<tr>
 								<th>#</th>
 								<th width="40">Service</th>
+								<th>Category</th>
 								<th width="40">W/O</th>
 								<th width="60">Cust.Name</th>
 								<th width="100">Contact No.</th>
@@ -317,6 +325,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -345,7 +354,7 @@
 					},
 					{
 						"width":"60px",
-						"targets": 2
+						"targets": 3
 					},
 					{
 						"render": function ( data, type, row ) {
@@ -358,7 +367,7 @@
 								return '<a target="_blank" href="'+link3+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});	
@@ -379,6 +388,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -415,7 +425,7 @@
 								return '<a target="_blank" href="'+link2+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});	
@@ -436,6 +446,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -473,7 +484,7 @@
 								return '<a target="_blank" href="'+link3+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});	
@@ -494,6 +505,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -531,7 +543,7 @@
 								return '<a target="_blank" href="'+link3+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});	
@@ -553,6 +565,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -590,7 +603,7 @@
 								return '<a target="_blank" href="'+link3+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});	
@@ -611,6 +624,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -648,7 +662,7 @@
 								return '<a target="_blank" href="'+link3+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});	
@@ -669,6 +683,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -701,7 +716,7 @@
 							var link = "{{ url('/customer-service/work-order/generate-pdf') }}"+"/"+data;
 							return '<a target="_blank" href="'+link+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 						},
-						"targets": 15
+						"targets": 16
 					}
 				],			
 			});
@@ -722,6 +737,7 @@
 				"columns": [
 					{ "data": "formT","name": "formT"},
 					{ "data": "service","name": "service"},
+					{ "data": "category", "name": "category"},
 					{ "data": "wo","name": "wo"},
 					{ "data": "name","name": "name"},
 					{ "data": "phone","name": "phone"},
@@ -759,7 +775,7 @@
 								return '<a target="_blank" href="'+link3+'" class="tablectrl_medium bGold tipS" original-title="View W/O"><span class="iconb" data-icon=""></span></a>';
 							}
 						},
-						"targets": 14
+						"targets": 15
 					}
 				],			
 			});