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

diff --git a/assistants/store.inc.php b/assistants/store.inc.php
index 6c7b2f8..a105f1a 100644
--- a/assistants/store.inc.php
+++ b/assistants/store.inc.php
@@ -3,26 +3,37 @@ 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,'textarea',false,'autofocus','model_barcode(s):'),
+			array('barcode',$barcode,'text',false,'autofocus','model_barcode:'),
 			array('quantity','1','text',false,false,'quantity:'),
+			array('serials','','textarea',false,'autofocus','serial(s):'),
 			array(false,'STORE','submit')
 		));
 		break;
 	case 2:
-		$barcodes=explode("\n", trim($_GET['barcode']));
-		foreach($barcodes as $barcode) {
-			$barcode=trim($barcode);
-			$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');
+		$barcode=$_GET['barcode'];
 
-			$disable_cols = array('status_id','item_price_out','item_customer', 'model_id','item_quantity','item_date_sold');
-			if($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);
+
+			$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 = '';
+				$item_serial = $serial;
 				$item_quantity = $quantity_added = 1;
 				$action = $_SERVER['SCRIPT_NAME'].'/item/new';
 			} else {
@@ -46,7 +57,7 @@ switch($SUBPATH[0]) {
 			//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,
@@ -54,7 +65,8 @@ 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,
+				'vendor_id' => $vendor_id
 			));
 
 			$insert_form[]=array('item', $columns, $selectbox, $current, $disable_cols, $action, $multi_insert);