diff --git a/app/Controllers/Activities.php b/app/Controllers/Activities.php
index 7713eb6..4afa7bb 100644
--- a/app/Controllers/Activities.php
+++ b/app/Controllers/Activities.php
@@ -581,7 +581,7 @@ class Activities extends Controller {
FROM products p
LEFT JOIN productcatalog pc ON pc.`catalogid`=p.`catalogid`
LEFT JOIN producttype pt ON pt.`producttypeid`= pc.`producttypeid`
- WHERE p.siteid=$siteid and productaliasid<>0 and COALESCE(active, 1) = 1
+ WHERE p.siteid=$siteid and productaliasid<>0
ORDER BY FIELD(pt.producttypeid, 20, 19, 21, 12, 10, 14, 11, 13, 4, 3) DESC, pc.productname";
$query = $db->query($sql);
$results = $query->getResultArray();
diff --git a/app/Views/activities_getproduct.php b/app/Views/activities_getproduct.php
index 1694dbe..791cbb3 100644
--- a/app/Views/activities_getproduct.php
+++ b/app/Views/activities_getproduct.php
@@ -9,9 +9,16 @@
$qproductname = $data['productname'];
$qproductnumber = $data['productnumber'];
$qproductlocationenddate = $data['locationenddate'];
+ $qproductactive = $data['active'];
if($qproductlocationenddate == NULL){
if($productid == $qproductid) { echo ""; }
- else { echo ""; }
+ else {
+ if ($qproductactive == 2) {
+ echo "";
+ } else {
+ echo "";
+ }
+ }
}
}
?>