diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php
index 757220c..7e76757 100644
--- a/app/Controllers/Products.php
+++ b/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
diff --git a/app/Views/products_export_excel.php b/app/Views/products_export_excel.php
index f7d1f29..d3ee846 100644
--- a/app/Views/products_export_excel.php
+++ b/app/Views/products_export_excel.php
@@ -48,7 +48,7 @@
End Date |
Warranty Start |
Warranty End |
- Active |
+ Active Status |
@@ -72,7 +72,7 @@
= htmlspecialchars($item['locationenddate'] ?? '') ?> |
= htmlspecialchars($item['warrantystartdate'] ?? '') ?> |
= htmlspecialchars($item['warrantyenddate'] ?? '') ?> |
- = htmlspecialchars($item['locationenddate'] == '' ? 'Yes' : 'No' ) ?> |
+ = htmlspecialchars($item['active'] != 2 ? 'Yes' : 'No' ) ?> |
diff --git a/app/Views/products_index.php b/app/Views/products_index.php
index f98f191..202e90c 100644
--- a/app/Views/products_index.php
+++ b/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');
}
diff --git a/public/image-pandawa/finalpanda.png b/public/image-pandawa/finalpanda.png
new file mode 100644
index 0000000..9ae90e4
Binary files /dev/null and b/public/image-pandawa/finalpanda.png differ
diff --git a/public/image-pandawa/finalpanda_c.jpg b/public/image-pandawa/finalpanda_c.jpg
new file mode 100644
index 0000000..ba15375
Binary files /dev/null and b/public/image-pandawa/finalpanda_c.jpg differ
diff --git a/public/image-pandawa/maintenis.png b/public/image-pandawa/maintenis.png
new file mode 100644
index 0000000..c5ce887
Binary files /dev/null and b/public/image-pandawa/maintenis.png differ
diff --git a/public/image-pandawa/panda.jpg b/public/image-pandawa/panda.jpg
new file mode 100644
index 0000000..7ea0f61
Binary files /dev/null and b/public/image-pandawa/panda.jpg differ
diff --git a/public/image-pandawa/pandas.png b/public/image-pandawa/pandas.png
new file mode 100644
index 0000000..1cd1450
Binary files /dev/null and b/public/image-pandawa/pandas.png differ
diff --git a/public/image-pandawa/pandas2.png b/public/image-pandawa/pandas2.png
new file mode 100644
index 0000000..4c1b25d
Binary files /dev/null and b/public/image-pandawa/pandas2.png differ
diff --git a/public/image-pandawa/pandas3.png b/public/image-pandawa/pandas3.png
new file mode 100644
index 0000000..e23e091
Binary files /dev/null and b/public/image-pandawa/pandas3.png differ