Dalsi vylepseni hromadnyho naskladnovani (bohuzel to rozbilo tipovani dodavatele...

[mirrors/SokoMan.git] / assistants / store.inc.php

diff --git a/assistants/store.inc.php b/assistants/store.inc.php
index 7b9bf27c65ae543eaba58fc8b2aceb4ea8c1f592..7e02e502d47565ddd3cd52733238283539cec2e9 100644 (file)
--- a/assistants/store.inc.php
+++ b/assistants/store.inc.php
@@ -1,30 +1,40 @@
 <?php
+$columns = $this->db->get_columns('item');
+$selectbox = $this->db->columns_get_selectbox($columns, 'item');
+
 switch($SUBPATH[0]) {
        default: case 1:
                $barcode = isset($_GET['barcode']) ? htmlspecialchars($_GET['barcode']) : ''; //TODO: XSS
+
                echo $this->html->form("$URL/2", 'GET', array(
                        array('barcode',$barcode,'text',false,'autofocus','model_barcode:'),
                        array('quantity','1','text',false,false,'quantity:'),
-                       array('serials',$barcode,'textarea',false,'autofocus','serial(s):'),
+                       array('serials','','textarea',false,'autofocus','serial(s):'),
+                       array('vendor',false,'select',$selectbox['vendor_id'],false,'vendor:'),
+                       array('room',false,'select',$selectbox['room_id'],false,'room:'),
                        array(false,'STORE','submit')
                ));
                break;
        case 2:
                $barcode=$_GET['barcode'];
-               $countable = $this->db->map_unique('model_barcode', $barcode, 'model_countable', 'model');
+
+               $barcode_id = $this->db->map_unique('barcode_name', $barcode, 'barcode_id', 'barcode');
+               $model_id = $this->db->map_unique('barcode_id', $barcode_id, 'model_id', 'barcode');
+               $model_price_in = $this->db->map_unique('model_id', $model_id, 'model_price_in', 'model');
+               $model_price_out = $this->db->map_unique('model_id', $model_id, 'model_price_out', 'model');
+               $item_price_in = $this->db->map_unique('item_serial', $barcode, 'item_price_in', 'item', false);
+               $item_price_out = $this->db->map_unique('item_serial', $barcode, 'item_price_out', 'item', false);
+               //$vendor_id = $this->db->map_unique('barcode_id', $barcode_id, 'vendor_id', 'item', false);
+
+               $countable = $this->db->map_unique('model_id', $model_id, 'model_countable', 'model');
 
                $serials=explode("\n",trim($_GET['serials']));
                if(!$countable || trim($_GET['serials']) == '') $serials = array('');
 
                foreach($serials as $serial) {
                        $serial=trim($serial);
-                       $model_id = $this->db->map_unique('model_barcode', $barcode, 'model_id', 'model');
-                       $item_price_in = $this->db->map_unique('item_serial', $barcode, 'item_price_in', 'item', false);
-                       $item_price_out = $this->db->map_unique('item_serial', $barcode, 'item_price_out', 'item', false);
-                       $model_price_in = $this->db->map_unique('model_barcode', $barcode, 'model_price_in', 'model');
-                       $model_price_out = $this->db->map_unique('model_barcode', $barcode, 'model_price_out', 'model');
 
-                       $disable_cols = array('status_id','item_price_out','item_customer', 'model_id','item_quantity','item_date_sold');
+                       $disable_cols = array('barcode_id','status_id','item_price_out','item_customer', 'model_id','item_quantity','item_date_sold','location_id','vendor_id','room_id');
                        if($countable) {
                                $multi_insert = true;
                                //$disable_cols[] = 'item_quantity';
@@ -46,13 +56,11 @@ switch($SUBPATH[0]) {
 
                                echo('Stock: '.$quantity_stored.'<br />Storing: '.$quantity_added.'<br />Total: '.$item_quantity);
                        }
-                       $columns = $this->db->get_columns('item');
 
-           $selectbox = $this->db->columns_get_selectbox($columns, 'item');
                        //print_r(array('<pre>', $selectbox));
                        //foreach($selectbox['model_id'] as $id => $name) if($id != $model_id) unset($selectbox['model_id'][$id]);
                        $current = array(array(
-                               'model_id' => $model_id,
+                               'barcode_id' => $barcode_id,
                                'item_serial' => $item_serial,
                                'item_quantity' => $item_quantity,
                                'status_id' => 1,
@@ -60,9 +68,12 @@ switch($SUBPATH[0]) {
                                'item_price_out' => $item_price_out + ($quantity_added * $model_price_out),
                                'item_author' => $this->db->auth->get_user_id(),
                                'item_date_bought' => date('Y-m-d'),
-                               'location_id' => 0
+                               'location_id' => 0,
+                               'room_id' => $_GET['room'],
+                               'vendor_id' => $_GET['vendor']
                        ));
 
+                       //echo("<pre>"); print_r($selectbox);
                        $insert_form[]=array('item', $columns, $selectbox, $current, $disable_cols, $action, $multi_insert);
                }