+
$fortune
EOF;
@@ -324,6 +330,15 @@ EOF;
}
}
+ function table_add_row_parameters(&$table, $param_col='_row_parameters') { //TODO: rename to table_add_row_classes()
+ $image = array('status_name' => ' item_status_');
+ foreach($table as $id => $row) {
+ foreach($image as $column => $param) if(isset($table[$id][$column])) {
+ @$table[$id][$param_col] .= $param.$table[$id][$column];
+ }
+ }
+ }
+
function table_add_relations(&$table, $class, $suffix_relations='_relations') {
$where_url = '%d/?where[%c]==%v';
$relations = array( //TODO: Autodetect???
@@ -333,7 +348,7 @@ EOF;
'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query
),
'item' => array(
- 'item_serial' => array(array('dispose','assistant/%d?serial=%v','not_sold'),array('sell','assistant/%d?serial=%v','not_sold')),
+ 'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
'item_id' => array(array('edit','item/%v/edit/'))
),
'category' => array('category_id' => array(array('item',$where_url), array('model',$where_url))),
@@ -343,8 +358,9 @@ EOF;
'status' => array('status_id' => array(array('item',$where_url)))
);
$relations_conditions=array(
- //'not_sold' => function(&$table,$id,$class=false,$column=false) { return(@$table[$id]['status_id'] != 3); }
- 'not_sold' => 'return(@$table[$id]["status_id"] != 3);'
+ 'in_stock' => 'return(@$table[$id]["status_name"] == "stored");',
+ 'not_sold' => 'return(@$table[$id]["status_name"] != "saled");',
+ 'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "saled" && @$table[$id]["status_name"] != "disposed");'
);
foreach($table as $id => $row) {
foreach($row as $column => $value) {
@@ -359,7 +375,7 @@ EOF;
//$condition = $relations_conditions[$destination[2]]($table,$id);
if(!eval($relations_conditions[$destination[2]])) continue;
}
- @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !isset($destination[2])).',';
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url).',';
}
}
}
@@ -376,6 +392,7 @@ EOF;
'room_id' => 'room_name',
'status_id' => 'status_name',
'item_author' => 'item_author_backend',
+ 'item_customer' => 'item_customer',
);
foreach($table as $id => $row) {
@@ -385,7 +402,8 @@ EOF;
if($link != $title) unset($table[$id][$link]);
switch($link) { //TODO: Move to array for easy configuration
case 'item_author':
- $table[$id][$title]=$this->link($row[$title], '?where[item_author]=='.$row[$link], false);
+ case 'item_customer':
+ $table[$id][$title]=$this->link($row[$title], "?where[$link]==".$row[$link], false);
break;
default:
$table[$id][$title]=$this->link($row[$title], $type.'/'.$row[$link].'/');
@@ -422,6 +440,7 @@ EOF;
function render_item_table($table,$class=false) {
if(empty($table)) return '
'.T('holy primordial emptiness is all you can find here...').'
';
+ $this->table_add_row_parameters($table);
$this->table_add_images($table);
if($class) $this->table_add_relations($table,$class);
$this->table_add_barcodes($table);
@@ -443,7 +462,7 @@ EOF;
$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
- if(!$val) $val = '';
+ if(is_bool($val) && !$val) $val = '';
$html.=$this->input($name, $val, 'hidden');
$html.=$val.'(AUTO)';
break;
@@ -610,7 +629,7 @@ class Sklad_DB extends PDO {
}
function translate_query_results(&$result) {
- $translate_cols = array('status_name', 'item_valid_till'); //TODO: Hardcoded
+ $translate_cols = array('item_valid_till'); //TODO: Hardcoded
foreach($result as $key => $row) {
foreach($translate_cols as $col) if(isset($result[$key][$col])){
$result[$key][$col] = T($result[$key][$col]);
@@ -636,7 +655,6 @@ class Sklad_DB extends PDO {
return $result;
}
-
function get_listing($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
$sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history);
$result = $this->safe_query_fetch($sql);