rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish beforeAction

Browse Source
This commit is contained in:
Roland Schneider 2016-01-16 19:02:38 +01:00
commit afb79cafb8
8 changed files with 104 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/models/AccountState.php
View File

@ -194,6 +194,8 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
* Read last accountstates
* @param $type int the type of accountstate to load
* @param $user $id of user to load the account
* @return common\models\AccountState
*
* */
public static function readLast($type, $user = null,$account = null){
$result = null;
@ -202,10 +204,14 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
if ( isset($type)){
$query->andWhere(['account_state.type' => $type]);
}
if ( $account ){
if ( isset( $account ) ){
$query->andWhere(["account_state.id_account" => $account ]);
}
if ( isset( $user ) ){
$query->andWhere(["account_state.id_user" => $user ]);
}
$query->limit(1);
$query->orderBy(['created_at' => SORT_DESC]);

6
common/models/Product.php
View File

@ -48,12 +48,14 @@ class Product extends \common\models\BaseFitnessActiveRecord {
[['product_number', 'barcode'], 'string', 'max' => 20],
[['name'], 'string', 'max' => 128],
[['description'], 'string', 'max' => 255],
[['product_number'], 'unique' ],
[['barcode'], 'unique' ],
// [['product_number'], 'unique' ],
// [['barcode'], 'unique' ],
// a1 and a2 need to be unique together, only a1 will receive error message
// ['a1', 'unique', 'targetAttribute' => ['a1', 'a2']]
[['barcode','product_number'], 'filter', 'filter' => function($value){return Helper::fixAsciiChars($value);}],
['barcode', 'unique', 'targetAttribute' => ['id_account', 'barcode']],
['product_number', 'unique', 'targetAttribute' => ['id_account', 'product_number']],
];
}

9
common/models/Ticket.php
View File

@ -165,10 +165,11 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
$query = Ticket::find();
$today = date('Y-m-d');
$query->andWhere(['id_card' => $card->id_card]);
$query->andWhere( 'start <= :today' ,[ 'today' => $today] );
$query->andWhere( 'end >= :today' ,[ 'today' => $today] );
$query->orderBy([ "created_at" =>SORT_DESC] );
$query->andWhere(['ticket.id_card' => $card->id_card]);
$query->andWhere( 'ticket.start <= :today' ,[ 'today' => $today] );
$query->andWhere( 'ticket.end >= :today' ,[ 'today' => $today] );
$query->andWhere( 'ticket.status = :status' ,[ 'status' => Ticket::STATUS_ACTIVE] );
$query->orderBy([ "ticket.created_at" =>SORT_DESC] );
$result = $query->all();
return $result;

37
frontend/components/CassaOpenBehavior.php Normal file
View File

@ -0,0 +1,37 @@
<?php
namespace frontend\components;
use yii\base\Behavior;
use yii\web\Controller;
use common\models\Account;
use common\models\AccountState;
class CassaOpenBehavior extends Behavior
{
// ...
public function events()
{
return [
Controller::EVENT_BEFORE_ACTION => 'validateCassaOpen',
];
}
public function validateCassaOpen($event){
$cassaOpen = AccountState::readLast(null, null, Account::readDefault() );
if ( !isset($cassaOpen) ){
return $this->redirectToCassaOpen($event);
}else if ( !$cassaOpen->isTypeOpen() ){
return $this->redirectToCassaOpen($event);
}
}
protected function redirectToCassaOpen($event ) {
\Yii::$app->session->setFlash ( 'error', 'Nem nyitottál kasszát!');
$this->owner->redirect([ 'account-state/open' ]);
$event->isValid = false;
$event->handled = true;
}
}

31
frontend/components/DefaultAccountBehavior.php Normal file
View File

@ -0,0 +1,31 @@
<?php
namespace frontend\components;
use yii\base\Behavior;
use yii\web\Controller;
use common\models\Account;
class DefaultAccountBehavior extends Behavior
{
// ...
public function events()
{
return [
Controller::EVENT_BEFORE_ACTION => 'validateDefaultAccount',
];
}
public function validateDefaultAccount($event){
echo "deafult";
$account = Account::readDefault();
if ( !isset($account) ){
$this->owner->redirect([ 'account/select' ]);
\Yii::$app->session->setFlash ( 'error', 'Válassz kasszát!!');
$event->isValid = false;
$event->handled = true;
return false;
}
}
}

2
frontend/controllers/AccountStateController.php
View File

@ -74,6 +74,8 @@ class AccountStateController extends Controller {
$lastStates = AccountState::readLastForUser ( AccountState::TYPE_CLOSE );
$lastStates = AccountState::modelsToArray ( $lastStates );
// \Yii::$app->session->setFlash('error','ok');
$model = new AccountState ();
$model->type = AccountState::TYPE_OPEN;
$model->id_user = Yii::$app->user->id;

11
frontend/controllers/ProductController.php
View File

@ -24,6 +24,8 @@ use common\models\ShoppingCart;
use frontend\models\ReceptionForm;
use frontend\models\CustomerCartPayoutForm;
use frontend\models\UserCartPayoutForm;
use frontend\components\DefaultAccountBehavior;
use frontend\components\CassaOpenBehavior;
/**
* ProductController implements the CRUD actions for Product model.
@ -61,7 +63,14 @@ class ProductController extends Controller {
]
// everything else is denied
]
] ,
// named behavior, configuration array
'defaultAccount' => [
'class' => DefaultAccountBehavior::className(),
],
'cassaIsOpen' => [
'class' => CassaOpenBehavior::className(),
],
];
}
public function actionSale($number = null) {

8
frontend/controllers/TicketController.php
View File

@ -19,6 +19,8 @@ use common\models\User;
use common\models\ShoppingCart;
use common\models\UserSoldItem;
use frontend\components\FrontendController;
use frontend\components\DefaultAccountBehavior;
use frontend\components\CassaOpenBehavior;
/**
* TicketController implements the CRUD actions for Ticket model.
@ -46,6 +48,12 @@ class TicketController extends FrontendController
// everything else is denied
],
],
'defaultAccount' => [
'class' => DefaultAccountBehavior::className(),
],
'cassaIsOpen' => [
'class' => CassaOpenBehavior::className(),
],
];
}