From 75aeb64b192024dbe263b9b79a8d42a9073a3b28 Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Fri, 26 Feb 2016 21:19:51 +0100 Subject: [PATCH] detsta import improvements, procurement changes --- backend/controllers/ProcurementController.php | 11 ++++++- backend/controllers/ProductController.php | 3 ++ backend/models/DestaUploadForm.php | 3 +- backend/views/procurement/_form_product.php | 33 +++++++++++++++---- changelog.txt | 3 ++ common/components/giro/GiroBeszedFej.php | 2 +- common/config/params.php | 4 +-- frontend/models/ContractForm.php | 2 +- 8 files changed, 49 insertions(+), 12 deletions(-) diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php index 61b7114..eee905c 100644 --- a/backend/controllers/ProcurementController.php +++ b/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, diff --git a/backend/controllers/ProductController.php b/backend/controllers/ProductController.php index 333c9ea..6b13e6a 100644 --- a/backend/controllers/ProductController.php +++ b/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, diff --git a/backend/models/DestaUploadForm.php b/backend/models/DestaUploadForm.php index 11cd999..f9b3215 100644 --- a/backend/models/DestaUploadForm.php +++ b/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 )"); } } + } } diff --git a/backend/views/procurement/_form_product.php b/backend/views/procurement/_form_product.php index 725492d..c6aca77 100644 --- a/backend/views/procurement/_form_product.php +++ b/backend/views/procurement/_form_product.php @@ -17,21 +17,41 @@ $warehouseOptions = ArrayHelper::map($warehouses, 'id_warehouse', 'name') ; ?>

+
+
$product, 'attributes' =>[ - 'productCategoryName', - 'accountName', - 'product_number', - 'barcode', - 'stock', + [ + 'attribute' => 'productCategoryName', + 'label' => 'Termék kategória' + ], + [ + 'attribute' => 'accountName', + 'label' => 'Kassza' + ], + [ + 'attribute' => 'product_number', + 'label' => 'Termék szám' + ], + [ + 'attribute' => 'barcode', + 'label' => 'Vonalkód' + ], + [ + 'attribute' => 'stock', + 'label' => 'Raktáron' + ], ] ]); ?> - +
+
+
+
@@ -52,3 +72,4 @@ echo DetailView::widget([
+
diff --git a/changelog.txt b/changelog.txt index caf42e5..a555e74 100644 --- a/changelog.txt +++ b/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 diff --git a/common/components/giro/GiroBeszedFej.php b/common/components/giro/GiroBeszedFej.php index a90fca4..15d5827 100644 --- a/common/components/giro/GiroBeszedFej.php +++ b/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) diff --git a/common/config/params.php b/common/config/params.php index 8d032d6..8003b7d 100644 --- a/common/config/params.php +++ b/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 diff --git a/frontend/models/ContractForm.php b/frontend/models/ContractForm.php index 6449b53..da434d9 100644 --- a/frontend/models/ContractForm.php +++ b/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' , ]; }