Display price for articles

[misc/hallinta-metro] / ordersatz_pos.php

diff --git a/ordersatz_pos.php b/ordersatz_pos.php
index b060b8b..83bd4d1 100644 (file)
--- a/ordersatz_pos.php
+++ b/ordersatz_pos.php
@@ -48,10 +48,31 @@ function build_pdf()
   var source = document.getElementById('source');
   if (!source) return false;
 
-  var parms = 'source=' + source.innerHTML + '&callback=pdf&';
+  var parms = 'source=' + source.innerHTML + '&callback=pdf';
   ajax_request('function', parms, build_pdf_callback);
   return false;
 }
+
+function finish_callback(data)
+{
+  if (data.status == true) {
+    info('Ordersatz verschickt');
+
+    confirm("Der Ordersatz wurde verschickt.");
+    window.location.href = './?mask=metro__ordersatz';
+  }
+}
+
+function finish()
+{
+  var source = document.getElementById('source');
+  if (!source) return false;
+
+  var parms = 'source=' + source.innerHTML + '&callback=send';
+  ajax_request('function', parms, finish_callback);
+  return false;
+}
+
 EOC;
 
 $buttons = <<<EOC
@@ -81,6 +102,7 @@ $mask = array(
              'join' => array('metro_ordersatz_pos ON ordersatz = metro_ordersatz.id',
                              'metro_artikel ON artikel = metro_artikel.id'),
              'title' => get_title($_SESSION['ordersatz']),
+             'edit_title' => 'Ordersatz',
              'where' => sprintf('ordersatz = %d AND owner = %d AND done IS NULL', $_SESSION['ordersatz'], $_SESSION['sys']['uid']),
              'list' => array(
                              'id' => array(
@@ -97,6 +119,7 @@ $mask = array(
                                            'name' => 'Artnr',
                                            'width' => 60,
                                            'specs' => "filterUI: 't'",
+                                           'visible' => false,
                                            ),
                              'menge' => array(
                                            'name' => 'Menge',
@@ -105,9 +128,17 @@ $mask = array(
                                            ),
                              'bezeichnung' => array(
                                            'name' => 'Bezeichnung',
-                                           'width' => 260,
+                                           'width' => 300,
                                            'specs' => "filterUI: 't'",
                                            ),
+                             'preis' => array(
+                                           'name' => 'Preis',
+                                           'width' => 60,
+                                           'type' => 'number',
+                                           'specs' => "decPlaces: 2, ClassName: 'alignrightpad', filterUI: 't'",
+                                           'sql' => '(SELECT preis * ((100 + steuersatz)/100) FROM metro_artikel_preis ' .
+                                                    'WHERE artikel = metro_artikel.id ORDER BY datum DESC LIMIT 1)',
+                                           ),
                              'hersteller' => array(
                                            'name' => 'Hersteller',
                                            'width' => 80,
@@ -124,6 +155,7 @@ $mask = array(
                                            'width' => 80,
                                            'specs' => "ClassName: 'aligncenter', filterUI: 's'",
                                            'control' => "new Rico.TableColumn.lookup(".grid_lookup_sql('metro_abteilung','id','name').", 0, '')",
+                                           'visible' => false,
                                            ),
                              'gang' => array(
                                            'name' => 'Gang',
@@ -131,6 +163,7 @@ $mask = array(
                                            'sql' => 'abteilung',
                                            'specs' => "ClassName: 'aligncenter', filterUI: 's'",
                                            'control' => "new Rico.TableColumn.lookup(".grid_lookup_sql('metro_abteilung','id','gang').", 0, '')",
+                                           'visible' => false,
                                            ),
                              ),
              'edit' => array(
@@ -148,6 +181,11 @@ $mask = array(
              'files' => array(
                               'download' => process_download,
                               ),
+             'buttons' => array(
+                                'save' => false,
+                                'insert' => false,
+                                'delete' => false,
+                                ),
              );
 
 function cb_cellsave()
@@ -164,7 +202,6 @@ function cb_cellsave()
                   $_SESSION['ordersatz'], $_POST['id']);
 
   $sth = $db->query($sql);
-  error_log($sql);
 }
 
 
@@ -201,9 +238,9 @@ function cb_send()
   if ($result !== true)
     return array('error' => $result);
 
-  $fname = $tmpdir . '/ordersatz.pdf';
-
   rm_tempdir($tmpdir);
+
+  return array('status' => true);
 }
 
 ?>