Support disabling products

[misc/hallinta-metro] / ordersatz_pos.php

diff --git a/ordersatz_pos.php b/ordersatz_pos.php
index 942cae4..8bb8cd1 100644 (file)
--- a/ordersatz_pos.php
+++ b/ordersatz_pos.php
@@ -127,7 +127,7 @@ function get_title($id)
 $mask = array(
              'table' => 'metro_ordersatz',
              'join' => array('metro_ordersatz_pos ON ordersatz = metro_ordersatz.id',
 $mask = array(
              'table' => 'metro_ordersatz',
              'join' => array('metro_ordersatz_pos ON ordersatz = metro_ordersatz.id',

-                             'metro_artikel ON artikel = metro_artikel.id'),
+                             'metro_artikel ON artikel = metro_artikel.id AND removed = 0'),

              'title' => get_title($_SESSION['ordersatz']),
              'edit_title' => 'Ordersatz',
              'where' => sprintf('ordersatz = %d AND owner = %d', $_SESSION['ordersatz'], $_SESSION['sys']['uid']),
              'title' => get_title($_SESSION['ordersatz']),
              'edit_title' => 'Ordersatz',
              'where' => sprintf('ordersatz = %d AND owner = %d', $_SESSION['ordersatz'], $_SESSION['sys']['uid']),


@@ -227,7 +227,10 @@ $mask = array(
                                 ),
              );
 
                                 ),
              );
 

-if ($done) unset($mask['edit']);
+if ($done) {
+  unset($mask['edit']);
+  $mask['join'] = str_replace(' AND removed = 0','',$mask['join']);
+}

 
 function cb_cellsave()
 {
 
 function cb_cellsave()
 {