From 22cf5883acc8a641e198d7f726b5b8e7c7e3dd14 Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 16 May 2017 08:10:57 +0200 Subject: [PATCH 1/2] fix displaying available accounts on frontend/sellTicket --- common/models/Account.php | 28 +++++++++++++++-------- common/models/Ticket.php | 4 ++++ frontend/controllers/TicketController.php | 15 ++++++++---- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/common/models/Account.php b/common/models/Account.php index 77e51a9..2ded224 100644 --- a/common/models/Account.php +++ b/common/models/Account.php @@ -6,6 +6,8 @@ use Yii; use yii\behaviors\TimestampBehavior; use yii\helpers\ArrayHelper; +/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */ + /** * This is the model class for table "account". * @@ -86,7 +88,7 @@ class Account extends \yii\db\ActiveRecord public function getStatusHuman(){ $result = null; - $s = self::statuses($this->status); + $s = self::statuses(); if ( array_key_exists($this->status, $s)){ $result = $s[$this->status]; } @@ -102,7 +104,7 @@ class Account extends \yii\db\ActiveRecord public function getTypeHuman(){ $result = null; - $s = self::types($this->type); + $s = self::types(); if ( array_key_exists($this->type, $s)){ $result = $s[$this->type]; } @@ -112,14 +114,17 @@ class Account extends \yii\db\ActiveRecord public function isInactive(){ return $this->status == self::STATUS_DELETED; } - + /** * $param int $forceIncludeAccount id account, that should be included in list, even if it is inactive - * */ + * @param null $forceIncludeAccount the next account should be included too, even if it is not + * allowed for user + * @return array|null|\yii\db\ActiveRecord[] + */ public static function readAccounts($forceIncludeAccount = null){ $accounts = null; - if ( $forceIncludeAccount == null){ + if ( $forceIncludeAccount == null) { $accounts = Account::find()->andWhere(['status' => Account::STATUS_ACTIVE])->all(); }else{ $accounts = Account::find()->andWhere( ['or', ['status' => Account::STATUS_ACTIVE], ['id_account' => $forceIncludeAccount ] ])->all(); @@ -134,6 +139,7 @@ class Account extends \yii\db\ActiveRecord $query->innerJoinWith('userAccountAssignments'); $query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]); + if ( $forceIncludeAccount == null){ $query->andWhere(['status' => Account::STATUS_ACTIVE])->all(); }else{ @@ -166,7 +172,7 @@ class Account extends \yii\db\ActiveRecord /** * read default transfer object * return the default account or null, if not found - * @return common\models\Account + * @return \common\models\Account * */ public static function readDefaultObject( ){ $account = null; @@ -176,11 +182,13 @@ class Account extends \yii\db\ActiveRecord } return $account; } - - + + /** - * read assigned account - * */ + * read assigned account. + * @param $idAccount integer The id of the account to read + * @return array|null|\yii\db\ActiveRecord + */ public static function readOne($idAccount){ $accounts = null; diff --git a/common/models/Ticket.php b/common/models/Ticket.php index 02f4437..19a8f0c 100644 --- a/common/models/Ticket.php +++ b/common/models/Ticket.php @@ -8,6 +8,8 @@ use yii\db\Query; use yii\db\Expression; use common\components\Helper; +/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */ + /** * This is the model class for table "ticket". * @@ -30,6 +32,8 @@ use common\components\Helper; * @property string $created_at * @property string $updated_at * @property int id_contract + * + * @property \common\models\Card card */ class Ticket extends \common\models\BaseFitnessActiveRecord { diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php index 1ee2830..f6baaaf 100644 --- a/frontend/controllers/TicketController.php +++ b/frontend/controllers/TicketController.php @@ -2,18 +2,16 @@ namespace frontend\controllers; +use Exception; use Yii; use common\models\Ticket; use frontend\models\TicketSearch; -use frontend\models\ReceptionForm; use frontend\models\TicketCreate; -use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use common\models\Discount; use common\models\TicketType; use common\models\Account; -use yii\base\Object; use common\models\Transfer; use common\models\User; use common\models\ShoppingCart; @@ -30,6 +28,7 @@ class TicketController extends FrontendController { public function behaviors() { + /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */ return [ 'verbs' => [ 'class' => VerbFilter::className(), @@ -60,7 +59,9 @@ class TicketController extends FrontendController /** * Lists all Ticket models. + * @param null $number * @return mixed + * @throws NotFoundHttpException */ public function actionIndex($number = null) { @@ -84,7 +85,9 @@ class TicketController extends FrontendController /** * Creates a new Ticket model. * If creation is successful, the browser will be redirected to the 'view' page. + * @param null $number * @return mixed + * @throws NotFoundHttpException */ public function actionCreate($number = null) { @@ -108,7 +111,7 @@ class TicketController extends FrontendController $ticketTypes = TicketType::read(null, null); - $accounts = Account::readAccounts(); + $accounts = Account::read(); $user = User::findOne( [ 'id' => Yii::$app->user->id ] ); @@ -138,7 +141,9 @@ class TicketController extends FrontendController } public function actionUpdate($id){ - $model = TicketUpdate::findOne($id); + + /** @var \frontend\models\TicketUpdate $model */ + $model = TicketUpdate::findOne($id); if ( !isset($model)){ throw new NotFoundHttpException('The requested page does not exist.'); From 2cf6ceeb01aa252963e3d9a8b1413e2a6ccc386c Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 16 May 2017 08:15:54 +0200 Subject: [PATCH 2/2] Change version to v0.1.07 --- changelog.txt | 2 ++ common/config/params.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index ece2d81..17fef38 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +-0.1.07 + - fix frontend ticket/sell displayed accounts -0.1.06 - add inventory waste gui -0.1.05 diff --git a/common/config/params.php b/common/config/params.php index e1a41b1..574ad51 100644 --- a/common/config/params.php +++ b/common/config/params.php @@ -5,7 +5,7 @@ return [ 'supportEmail' => 'rocho02@gmail.com', 'infoEmail' => 'info@rocho-net.hu', 'user.passwordResetTokenExpire' => 3600, - 'version' => 'v0.1.06', + 'version' => 'v0.1.07', 'company' => 'movar',//gyor 'company_name' => "Freimann Kft.", 'product_visiblity' => 'account',// on reception which products to display. account or global