Update menambahkan active status pada export data

app/Controllers/Products.php

@@ -473,13 +473,11 @@ class Products extends BaseController {
 
 		$where = 0;
 		
-		$sql = "SELECT a2.accountname, p.statuspart, ps.productservicetext,  p.productid, pc.productname, p.productnumber, pc.catalognumber, pt.texts as type_name, pc.manufacturer, s.sitename, 
+		$sql = "SELECT a2.accountname, p.statuspart, ps.productservicetext,  p.productid, pc.productname, p.productnumber, p.active, pc.catalognumber, pt.texts as type_name, pc.manufacturer, s.sitename, 
 				z.zonename as city, z2.zonename as prov, p.installationdate, p.locationstartdate, p.locationenddate, p.warrantystartdate, p.warrantyenddate
 				FROM products p
 				left join productcatalog pc on pc.catalogid=p.catalogid
-
 				-- left join accoun pc2 on pc2.catalogid=p.accountid_productowner
-				
 				left join producttype pt on pt.producttypeid=pc.producttypeid
 				left join productservice ps on ps.productserviceid=p.productserviceid
 				left join sites s on s.siteid=p.siteid

app/Views/products_export_excel.php

@@ -48,7 +48,7 @@
 							<th scope="col">End Date</th>
 							<th scope="col">Warranty Start</th>
 							<th scope="col">Warranty End</th>
-							<th scope="col">Active</th>
+							<th scope="col">Active Status</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -72,7 +72,7 @@
 								<td><?= htmlspecialchars($item['locationenddate'] ?? '') ?></td>
 								<td><?= htmlspecialchars($item['warrantystartdate'] ?? '') ?></td>
 								<td><?= htmlspecialchars($item['warrantyenddate'] ?? '') ?></td>
-								<td><?= htmlspecialchars($item['locationenddate'] == '' ? 'Yes' : 'No' ) ?></td>
+								<td><?= htmlspecialchars($item['active'] != 2 ? 'Yes' : 'No' ) ?></td>
 							</tr>
 						<?php endforeach; ?>
 					</tbody>

app/Views/products_index.php

@@ -299,7 +299,7 @@ function exportToExcel() {
 	const producttypeid = $('#producttypeid').val();
 	const sitename = $('#sitename').val();
 
-	const url = `<?=base_url();?>/products/export?productaliasid=${encodeURIComponent(productaliasid)}&areaid=${encodeURIComponent(areaid)}&producttypeid=${encodeURIComponent(producttypeid)}&sitename=${encodeURIComponent(sitename)}`;
+	const url = `<?=base_url();?>products/export?productaliasid=${encodeURIComponent(productaliasid)}&areaid=${encodeURIComponent(areaid)}&producttypeid=${encodeURIComponent(producttypeid)}&sitename=${encodeURIComponent(sitename)}`;
 	window.open(url, '_blank');
 }