X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=assistants%2Fstore.inc.php;h=97e8922710a788949993905f883f1ee959fee5f7;hb=refs%2Fheads%2Fmaster;hp=a105f1ac9b27342ee751255ef048dded6606deef;hpb=1e0a73dc3e7bf25709b497eb8c98a572264bcdd1;p=mirrors%2FSokoMan.git

diff --git a/assistants/store.inc.php b/assistants/store.inc.php
index a105f1a..97e8922 100644
--- a/assistants/store.inc.php
+++ b/assistants/store.inc.php
@@ -1,11 +1,17 @@
 <?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','','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;
@@ -18,42 +24,22 @@ switch($SUBPATH[0]) {
 		$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');
+		//$vendor_id = $this->db->map_unique('barcode_id', $barcode_id, 'vendor_id', 'item', false);
 
 		$serials=explode("\n",trim($_GET['serials']));
-		if(!$countable || trim($_GET['serials']) == '') $serials = array('');
+		if(trim($_GET['serials']) == '') $serials = array('');
 
 		foreach($serials as $serial) {
 			$serial=trim($serial);
 
-			$disable_cols = array('barcode_id','status_id','item_price_out','item_customer', 'model_id','item_quantity','item_date_sold','location_id');
-			if($countable) {
-				$multi_insert = true;
-				//$disable_cols[] = 'item_quantity';
-				$item_serial = $serial;
-				$item_quantity = $quantity_added = 1;
-				$action = $_SERVER['SCRIPT_NAME'].'/item/new';
-			} else {
-				$multi_insert = false;
-				$quantity_added = $_GET['quantity'];
-				if($quantity_added <= 0) $this->post_redirect_get("$URL_INTERNAL/1","Can't store non-possitive amount of items!");
-				if(!is_numeric($quantity_added)) $quantity_added = 1;
-				$quantity_stored = $this->db->map_unique('item_serial', $barcode, 'item_quantity', 'item', false);
-				if(!is_numeric($quantity_stored)) $quantity_stored = 0;
-
-				$disable_cols[] = 'item_serial';
-				$item_serial = $barcode;
-				$item_quantity = $quantity_stored + $quantity_added;
-				$action = $_SERVER['SCRIPT_NAME'].'/item/0/edit';
+			$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');
 
-				echo('Stock: '.$quantity_stored.'<br />Storing: '.$quantity_added.'<br />Total: '.$item_quantity);
-			}
-			$columns = $this->db->get_columns('item');
+			$multi_insert = true;
+			//$disable_cols[] = 'item_quantity';
+			$item_serial = $serial;
+			$item_quantity = $quantity_added = 1;
+			$action = $_SERVER['SCRIPT_NAME'].'/item/new';
 
-	    $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(
@@ -66,9 +52,11 @@ switch($SUBPATH[0]) {
 				'item_author' => $this->db->auth->get_user_id(),
 				'item_date_bought' => date('Y-m-d'),
 				'location_id' => 0,
-				'vendor_id' => $vendor_id
+				'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);
 		}