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

change account dropdown to fix account on account state open/close

Browse Source
This commit is contained in:
Schneider Roland
2016-01-10 17:32:54 +01:00
parent 7c584a0779
commit a782232ad8
12 changed files with 66 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/components/FrontendMenuStructure.php
View File

@@ -84,7 +84,7 @@ class FrontendMenuStructure{
if ( $isadmin || Yii::$app->user->can('reception.transfers') ){
$items[] = ['label' => Yii::t('frontend/transfer','Transfers'), 'url' => ['/transfer/index', 'TransferSearch[id_user]' =>\Yii::$app->user->id, 'TransferSearch[id_account]' => Account::readDefault(), 'TransferSearch[start]' => $this->start, 'TransferSearch[end]' => $this->tomorrow ] ];
$items[] = ['label' => Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ];
//$items[] = ['label' => Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ];
}
$items[] = ['label' => Yii::t('frontend/card','Vendégek'), 'url' => [ '/card/index' ] ];

9
frontend/controllers/AccountStateController.php
View File

@@ -74,10 +74,14 @@ class AccountStateController extends Controller {
$lastStates = AccountState::readLastForUser ( AccountState::TYPE_CLOSE );
$lastStates = AccountState::modelsToArray ( $lastStates );
$model = new AccountState ();
$model->type = AccountState::TYPE_OPEN;
$model->id_user = Yii::$app->user->id;
$model->id_account = Account::readDefault ();
$account = Account::readDefaultObject();
if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
// return $this->redirect(['view', 'id' => $model->id_account_state]);
@@ -96,7 +100,8 @@ class AccountStateController extends Controller {
return $this->render ( 'open', [
'model' => $model,
'accounts' => $accounts,
'lastStates' => $lastStates
'lastStates' => $lastStates,
'account' => $account
] );
}
}
@@ -113,6 +118,7 @@ class AccountStateController extends Controller {
$model->type = AccountState::TYPE_CLOSE;
$model->id_user = Yii::$app->user->id;
$model->id_account = Account::readDefault ();
$account = Account::readDefaultObject();
$lastCassaState = AccountState::readLast(null,null, Account::readDefault());
@@ -141,6 +147,7 @@ class AccountStateController extends Controller {
return $this->render ( 'close', [
'model' => $model,
'accounts' => $accounts,
'account' => $account,
'lastStates' => $lastStates ,
'lastCassaState' => $lastCassaState,
] );

10
frontend/views/account-state/_form_close.php
View File

@@ -16,10 +16,14 @@ use frontend\components\HtmlHelper;
<?php $form = ActiveForm::begin(); ?>
<div class='row'>
<div class='col-md-6'>
<?= $form->field($model, 'id_account')->dropDownList( HtmlHelper::mkAccountOptions($accounts) ) ?>
<div class='col-md-8'>
<div class="form-group field-accountstate-money required">
<label class="control-label" for="accountstate-money">Kassza</label><br>
<?php echo ( isset($account) ? $account->name : 'Nincs alapértelmezett kassza kiválasztva!' )?>
</div>
<?php //echo $form->field($model, 'id_account')->dropDownList( HtmlHelper::mkAccountOptions($accounts) ) ?>
</div>
<div class='col-md-6'>
<div class='col-md-4'>
<?= $form->field($model, 'money')->textInput(['class' => 'form-control text-right']); ?>
</div>
</div>

18
frontend/views/account-state/_form_open.php
View File

@@ -6,6 +6,7 @@ use frontend\components\HtmlHelper;
/* @var $this yii\web\View */
/* @var $model common\models\AccountState */
/* @var $account common\models\Account the default account */
/* @var $form yii\widgets\ActiveForm */
?>
@@ -16,12 +17,17 @@ use frontend\components\HtmlHelper;
<?php echo Html::activeHiddenInput($model, "prev_state") ?>
<div class='row'>
<div class='col-md-6'>
<?= $form->field($model, 'id_account')->dropDownList( HtmlHelper::mkAccountOptions($accounts) ) ?>
</div>
<div class='col-md-6'>
<?= $form->field($model, 'money')->textInput(['class' => 'form-control text-right']); ?>
</div>
<div class='col-md-8'>
<div class="form-group field-accountstate-money required">
<label class="control-label" for="accountstate-money">Kassza</label><br>
<?php echo ( isset($account) ? $account->name : 'Nincs alapértelmezett kassza kiválasztva!' )?>
</div>
<?php //echo $form->field($model, 'id_account')->dropDownList( HtmlHelper::mkAccountOptions($accounts) ) ?>
</div>
<div class='col-md-4'>
<?= $form->field($model, 'money')->textInput(['class' => 'form-control text-right']); ?>
</div>
</div>
<?php echo $this->render('_notes',[ 'form' => $form, 'model' => $model])?>

1
frontend/views/account-state/close.php
View File

@@ -22,6 +22,7 @@ $this->registerJs ( 'new AccountState( '. json_encode($options).');' );
<?= $this->render('_form_close', [
'model' => $model,
'accounts' => $accounts,
'account' => $account,
'lastCassaState' => $lastCassaState,
]) ?>

1
frontend/views/account-state/open.php
View File

@@ -24,6 +24,7 @@ $this->registerJs ( 'new AccountState( '. json_encode($options).');' );
<?= $this->render('_form_open', [
'model' => $model,
'accounts' => $accounts,
'account' => $account,
]) ?>
</div>