detsta import improvements, procurement changes

backend/controllers/ProcurementController.php

@@ -13,6 +13,7 @@ use common\models\Product;
 use common\models\User;
 use common\components\Helper;
 use common\models\Account;
+use yii\helpers\Url;
 
 /**
  * ProcurementController implements the CRUD actions for Procurement model.
@@ -193,7 +194,15 @@ class ProcurementController  extends \backend\controllers\BackendController
         	}
         	
         	
-            return $this->redirect(['view', 'id' => $model->id_procurement]);
+//             return $this->redirect(['view', 'id' => $model->id_procurement]);
+            	$url = Url::previous("product_index");
+            	if ( isset($url)){
+            		return $this->redirect(  $url );
+            	}else{
+            		return $this->redirect(['product/index']);
+            	}
+            
+//             return $this->redirect(Yii::$app->request->referrer);
         } else {
             return $this->render('create_product', [
                 'model' => $model,

backend/controllers/ProductController.php

@@ -12,6 +12,7 @@ use common\models\Account;
 use common\models\ProductCategory;
 use backend\models\ProductStatisticsSearch;
 use PHPExcel;
+use yii\helpers\Url;
 
 /**
  * ProductController implements the CRUD actions for Product model.
@@ -47,6 +48,8 @@ class ProductController extends \backend\controllers\BackendController
         $searchModel = new ProductSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
+        Url::remember(Url::current(),"product_index");
+        
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,

backend/models/DestaUploadForm.php

@@ -39,16 +39,17 @@ class DestaUploadForm extends Model
 			$datum = $destaUzenet->fej->csoportosUzenetSorszam->osszeallitasDatuma;
 			$koteg = Ugiro::find()->andWhere(['number' =>$number,'datum' => $datum ])->one();
 			$this->koteg = $koteg;
-			$idKoteg =  $this->koteg->id_ugiro;
 			if (!isset($koteg)){
 				$this->addError($attribute,"Nincs ilyen köteg! ( Datum: $datum, Sorszam: $number )");
 			}else{
 				if ( $koteg->status != Ugiro::$STATUS_SENT ){
+					$idKoteg =  $this->koteg->id_ugiro;
 					$this->addError($attribute,"A köteg detsta fájl-ja már fel van töltve !( Köteg azonosító: $idKoteg )");
 				}
 			}
 			
 			
+			
 		}
 	}
 

backend/views/procurement/_form_product.php

@@ -17,21 +17,41 @@ $warehouseOptions = ArrayHelper::map($warehouses, 'id_warehouse', 'name') ;
 ?>
 
 <h3><?=  Yii::t('common/product', 'Product') ?> </h3>
+<div class="row">
+<div class="col-md-6">
 <?php 
 
 echo DetailView::widget([
 	'model' => $product,
 	'attributes' =>[
-		'productCategoryName',
+		[
-		'accountName',
+			'attribute' => 'productCategoryName',
-		'product_number',
+			'label' => 'Termék kategória'
-		'barcode',	
+		],
-		'stock',	
+		[
+			'attribute' => 'accountName',
+			'label' => 'Kassza'
+		],
+		[
+			'attribute' => 'product_number',
+			'label' => 'Termék szám'
+		],
+		[
+			'attribute' => 'barcode',
+			'label' => 'Vonalkód'
+		],
+		[
+			'attribute' => 'stock',
+			'label' => 'Raktáron'
+		],
 	]
 ]);
 
 ?>
-
+</div>
+</div>
+<div class="row">
+<div class="col-md-4" >
 <div class="procurement-form">
 
     <?php $form = ActiveForm::begin(); ?>
@@ -52,3 +72,4 @@ echo DetailView::widget([
     <?php ActiveForm::end(); ?>
 
 </div>
+</div></div>

changelog.txt

@@ -1,3 +1,6 @@
+-0.0.42
+	- add detsta import improvements
+	- add procurement/create-product , translations, redirects
 -0.0.41
 	- add button kulcs "visszaad"
 	- fix ReceptionFomr#getFirstKey method

common/components/giro/GiroBeszedFej.php

@@ -30,7 +30,7 @@ class GiroBeszedFej extends GiroBase{
 		return $this->recordTipus 
 		.$this->uzenetTipus 
 		. $this->duplumKod 
-		. $this->szamKitolt( $this->kezdemenyezoAzonosito  , 13)
+		. $this->szovegKitolt( $this->kezdemenyezoAzonosito  , 13)
 		. $this->uzenetSorszam->toString()
 		. $this->kezdemenyezoBankszamla->toString()
 		. $this->szamKitolt($this->ertesitesiHatarido,8)

common/config/params.php

@@ -4,7 +4,7 @@ return [
     'supportEmail' => 'rocho02@gmail.com',
     'infoEmail' => 'info@rocho-net.hu',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.41',
+	'version' => 'v0.0.42',
 	'company' => 'movar',//gyor
 	'company_name' => "Freimann Kft.",
 	'product_visiblity' => 'account',// on reception which products to display. account or global
@@ -18,7 +18,7 @@ return [
 	'account_state_close_preload_money' => 'true',//preload money wnen show account state close page
 	'ugiro_duplom_kod' => 1,
 	'ugiro_kezdemenyezo_szamlaszam' => '000000000000000',//5860025215371128
-	'ugiro_kezdemenyezo_azonosito' => 'A25366936T244',
+	'ugiro_kezdemenyezo_azonosito' => 'A25006285',//
 	//a recepicó kosár csak az aktuális user által kiadott termékeket tartalmazza
 	//vagy mindent 
 	//értékek  user|all

frontend/models/ContractForm.php

@@ -157,7 +157,7 @@ class ContractForm extends Model {
 				'phone' => 'Telefonszám',
 				'email' => 'E-mail',
 				'ticket_type' => 'Bérlet típus' ,
-				'payment_method' => 'Fizetési mód' ,
+				'payment_method' => 'Fizetési mód (első bérlet)' ,
 				'id_discount' => 'Kedvezmény' ,
 		];
 	}