diff --git a/changelog.txt b/changelog.txt
index 3ff810a..0cb857c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+-0.0.21
+ - account state fix account on reception
+ - reception user - tickets > delete ticket
+ - show current account
-0.0.20
- account state email with pdf
- login email
diff --git a/common/components/DailyListing.php b/common/components/DailyListing.php
index 7fad687..85340f0 100644
--- a/common/components/DailyListing.php
+++ b/common/components/DailyListing.php
@@ -9,6 +9,7 @@ use common\models\Account;
use common\models\MoneyMovement;
use common\components\RoleDefinition;
+use common\models\AccountState;
/**
* TransferListSearch represents the model behind the search form about `common\models\Transfer`.
*/
@@ -108,7 +109,15 @@ class DailyListing
public $id_user;
public $type;
-
+ public $totalWithCassa;
+
+ public $cassaOpen;
+
+ public $showWithCassaOpen = false;// if easy total should be displayed with cassa open money
+
+ public $accountState; //the cassa object for we load the data
+
+
public function readTotalEasy(){
$this->readTicketMoney();
$this->readProductsMoney();
@@ -141,6 +150,7 @@ class DailyListing
public function loadAccountState($accountState){
$this->mode = 'accountstate';
+ $this->accountState = $accountState;
$this->start = $accountState->start_date;
$this->end = $accountState->created_at;
$this->timestampStart = $accountState->start_date;
@@ -149,13 +159,26 @@ class DailyListing
$this->id_user = $accountState->id_user;
}
+ public function readModeAccountState(){
+ $this->readTotalEasy ();
+ $this->readTotalDetailed ();
+ $this->readTotalMedium ();
+
+ $this->readCassaOpen();
+ $this->calcTotalWithCassaOpen();
+
+ $this->showWithCassaOpen = true;
+ }
+
public function isModeAdmin(){
return $this->mode == 'admin';
}
public function isModeAccountState(){
return $this->mode == 'accountstate';
}
-
+ public function isModeReception(){
+ return $this->mode == 'reception';
+ }
public function calcTotal(){
$this->total = 0;
@@ -170,6 +193,22 @@ class DailyListing
$this->totalNetto += $this->moneyMovementMoneis;
}
+ protected function readCassaOpen(){
+ if ( isset($this->accountState) && $this->accountState->isTypeClose() && isset($this->accountState->prev_state) ){
+ $this->cassaOpen = AccountState::findOne(['id_account_state' => $this->accountState->prev_state]);
+ }
+
+ }
+
+ protected function calcTotalWithCassaOpen(){
+ $this->totalWithCassa = 0;
+ $this->totalWithCassa += $this->total;
+ if ( isset($this->cassaOpen ) ){
+ $this->totalWithCassa += $this->cassaOpen->money;
+ }
+
+ }
+
public function addAccountConstraint($query){
@@ -513,7 +552,7 @@ class DailyListing
public function readMoneyMovements(){
$query = (new \yii\db\Query());
- $query->select([ 'user.username as user_name','account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', ]);
+ $query->select([ 'user.username as user_name','account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', 'money_movement.comment as money_movement_comment' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
diff --git a/common/components/Helper.php b/common/components/Helper.php
index 607aa37..d8b3a75 100644
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@@ -161,6 +161,9 @@ class Helper {
public static function isProductVisibilityAccount() {
return \Yii::$app->params ['product_visiblity'] == 'account';
}
+ public static function isAccountStateClosePreloadMoney() {
+ return \Yii::$app->params ['account_state_close_preload_money'] == true;
+ }
public static function getRealUserIp() {
$client = @$_SERVER ['HTTP_CLIENT_IP'];
$forward = @$_SERVER ['HTTP_X_FORWARDED_FOR'];
diff --git a/common/components/accountstate/AccountStateMail.php b/common/components/accountstate/AccountStateMail.php
index 105ab3f..089d02c 100644
--- a/common/components/accountstate/AccountStateMail.php
+++ b/common/components/accountstate/AccountStateMail.php
@@ -42,9 +42,11 @@ class AccountStateMail extends Object {
$this->details = new DailyListing();
$this->details->loadAccountState ( $this->model );
- $this->details->readTotalEasy ();
- $this->details->readTotalDetailed ();
- $this->details->readTotalMedium ();
+ $this->details->readModeAccountState();
+
+// $this->details->readTotalEasy ();
+// $this->details->readTotalDetailed ();
+// $this->details->readTotalMedium ();
}
}
@@ -61,7 +63,7 @@ class AccountStateMail extends Object {
$this->attachPdf();
- $this->message->setFrom('noreplay@fitnessadmin.hu')
+ $this->message->setFrom(\Yii::$app->params['infoEmail'])
->setTo( \Yii::$app->params['notify_mail'] )
->setSubject($subject )
->send();
diff --git a/common/components/total/TotalCassaOpenInfoWidget.php b/common/components/total/TotalCassaOpenInfoWidget.php
new file mode 100644
index 0000000..cd049cb
--- /dev/null
+++ b/common/components/total/TotalCassaOpenInfoWidget.php
@@ -0,0 +1,9 @@
+ 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600,
- 'version' => 'v0.0.20',
+ 'version' => 'v0.0.21',
'company' => 'movar',//gyor
'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global
@@ -12,5 +12,6 @@ return [
'mail_account_state_open' => true,
'login_reception_email' => true, //if reception login should send email
'login_admin_email' => true, //if admin login should send email
+ 'account_state_close_preload_money' => 'true',//preload money wnen show account state close page
];
diff --git a/common/mail/account_state.php b/common/mail/account_state.php
index 925643e..feee931 100644
--- a/common/mail/account_state.php
+++ b/common/mail/account_state.php
@@ -13,6 +13,7 @@ use common\components\total\TotalDifferenceWidget;
use common\models\AccountState;
use yii\helpers\Url;
use common\components\accountstate\AccountStateWidget;
+use common\components\total\TotalCassaOpenInfoWidget;
/* @var $this yii\web\View */
/* @var $model common\models\AccountState */
@@ -72,6 +73,8 @@ if ( $model ->type == AccountState::TYPE_OPEN ){
type == AccountState::TYPE_CLOSE ){?>
$details]);?>
+
+ $details]);?>
Közepes összesítés
Bérletek típus szerint
$details]);?>
diff --git a/common/messages/hu/common/account_state.php b/common/messages/hu/common/account_state.php
index 1bc3391..e28833d 100644
--- a/common/messages/hu/common/account_state.php
+++ b/common/messages/hu/common/account_state.php
@@ -34,7 +34,7 @@ return [
'Id Account' => 'Kassza',
'Id Account State' => 'Kassza művelet',
'Id User' => 'Felhasználó',
- 'Money' => 'Összeg',
+ 'Money' => 'Kasszában lévő összeg',
'Type' => 'Típus',
'Updated At' => 'Módosítás ideje',
];
diff --git a/common/models/Account.php b/common/models/Account.php
index 59c9438..77e51a9 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -152,11 +152,29 @@ class Account extends \yii\db\ActiveRecord
}
+ /** read id_transfer from session (default account )
+ *
+ * @return int id_transfer
+ * */
public static function readDefault( ){
$session = Yii::$app->session;
$result = $session->get('id_account');
return $result;
+ }
+
+ /**
+ * read default transfer object
+ * return the default account or null, if not found
+ * @return common\models\Account
+ * */
+ public static function readDefaultObject( ){
+ $account = null;
+ $id_account = self::readDefault();
+ if ( isset($id_account)){
+ $account = Account::findOne($id_account);
+ }
+ return $account;
}
diff --git a/common/models/AccountState.php b/common/models/AccountState.php
index 4251258..10dfb55 100644
--- a/common/models/AccountState.php
+++ b/common/models/AccountState.php
@@ -3,8 +3,8 @@
namespace common\models;
use Yii;
-use yii\db\QueryBuilder;
use yii\helpers\ArrayHelper;
+use yii\behaviors\TimestampBehavior;
/**
* This is the model class for table "account_state".
@@ -38,6 +38,17 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public $start_date;
+ /**
+ * @inheritdoc
+ */
+// public function behaviors()
+// {
+// return [[
+// 'class' => TimestampBehavior::className(),
+// 'value' => function(){ return date('Y-m-d H:i' ); }
+// ] ];
+// }
+
/**
* @inheritdoc
*/
@@ -52,11 +63,10 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function rules()
{
return [
- [['id_account','money' ], 'required'],
- [['id_account', 'type', 'money', 'banknote_5_ft', 'banknote_10_ft', 'banknote_20_ft', 'banknote_50_ft', 'banknote_100_ft', 'banknote_200_ft', 'banknote_500_ft', 'banknote_1000_ft', 'banknote_2000_ft', 'banknote_5000_ft', 'banknote_10000_ft', 'banknote_20000_ft' ], 'integer'],
+ [['money' ], 'required'],
+ [['type', 'money', 'banknote_5_ft', 'banknote_10_ft', 'banknote_20_ft', 'banknote_50_ft', 'banknote_100_ft', 'banknote_200_ft', 'banknote_500_ft', 'banknote_1000_ft', 'banknote_2000_ft', 'banknote_5000_ft', 'banknote_10000_ft', 'banknote_20000_ft' ], 'integer'],
[['comment' ], 'string' ,'max' => 255],
[['prev_state' ], 'integer'],
- [['id_account'] , 'validatePrevState'],
];
}
diff --git a/common/models/Product.php b/common/models/Product.php
index 3113161..d8eeed8 100644
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -46,6 +46,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
[['id_product_category', 'id_account', 'name'], 'required'],
[['id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
[['product_number', 'barcode'], 'string', 'max' => 20],
+ [['product_number', 'barcode'], 'filter', 'filter' => 'trim', 'skipOnArray' => true],
[['name'], 'string', 'max' => 128],
[['description'], 'string', 'max' => 255],
[['product_number'], 'unique' ],
diff --git a/common/models/TransferListSearch.php b/common/models/TransferListSearch.php
index e920419..3bae835 100644
--- a/common/models/TransferListSearch.php
+++ b/common/models/TransferListSearch.php
@@ -14,6 +14,7 @@ use common\models\Account;
use yii\helpers\ArrayHelper;
use common\models\MoneyMovement;
use common\components\RoleDefinition;
+use common\components\Helper;
/**
* TransferListSearch represents the model behind the search form about `common\models\Transfer`.
*/
@@ -22,30 +23,28 @@ class TransferListSearch extends Transfer
public $mode = "reception";//reception or admin
+ /**start date string*/
public $start;
+ /**end date string*/
public $end;
-
+ /**start date*/
public $timestampStart;
+ /** end date*/
public $timestampEnd;
-
-
-
-// public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
-// public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
-// public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
-// public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
-// public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
-
+ /**if include cassa open*/
+ public $includeCassaOpen = false;
+ /**total with cassa open*/
+ public $totalWithCassa;
+ /**last cassa open*/
+ public $cassaOpen;
public $totals;
-
+ /**The accounts*/
public $accounts;
-
+ /**types*/
public $types;
-
+ /**users*/
public $users;
-
-
/**
* all money gained with ticket sell
* */
@@ -124,6 +123,9 @@ class TransferListSearch extends Transfer
public function isModeAdmin(){
return $this->mode == 'admin';
}
+ public function isModeReception(){
+ return $this->mode == 'reception';
+ }
/**
* Creates data provider instance with search query applied
@@ -149,11 +151,20 @@ class TransferListSearch extends Transfer
}
+
$this->readTicketMoney();
$this->readProductsMoney();
$this->readMoneyMovementMoney();
$this->calcTotal();
+ if ( $this->isModeReception()){
+ if ( Helper::isAccountStateClosePreloadMoney()){
+ $this->readCassaOpen();
+ $this->calcTotalWithCassaOpen();
+ }
+ }
+
+
$this->readProductsByCategory();
$this->readProductsByCategoryDetailed();
$this->readTicketStas();
@@ -179,12 +190,24 @@ class TransferListSearch extends Transfer
}
+ protected function readCassaOpen(){
+ $this->cassaOpen = AccountState::readLast(AccountState::TYPE_OPEN,null,Account::readDefault());
+ }
+
protected function calcTotal(){
$this->total = 0;
$this->total += $this->ticketMoney;
$this->total += $this->productMoney;
$this->total += $this->moneyMovementMoneis;
}
+ protected function calcTotalWithCassaOpen(){
+ $this->totalWithCassa = 0;
+ $this->totalWithCassa += $this->total;
+ if ( isset($this->cassaOpen ) ){
+ $this->totalWithCassa += $this->cassaOpen->money;
+ }
+
+ }
protected function calcTotalNetto(){
$this->totalNetto = 0;
$this->totalNetto += $this->ticketMoney;
@@ -437,7 +460,7 @@ class TransferListSearch extends Transfer
protected function readMoneyMovements(){
$query = (new \yii\db\Query());
- $query->select([ 'user.username as user_name','account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', ]);
+ $query->select([ 'user.username as user_name','account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', 'money_movement.comment as money_movement_comment' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
diff --git a/common/views/account-state/account_state_pdf.php b/common/views/account-state/account_state_pdf.php
index 6c3df5c..ca3ab93 100644
--- a/common/views/account-state/account_state_pdf.php
+++ b/common/views/account-state/account_state_pdf.php
@@ -62,6 +62,9 @@ if ( $model ->type == AccountState::TYPE_OPEN ){
$model]);
?>
+
+
+
hasDifferenceToPrevState() ){
?>
diff --git a/common/views/total/total_cassa_open.php b/common/views/total/total_cassa_open.php
new file mode 100644
index 0000000..734e98f
--- /dev/null
+++ b/common/views/total/total_cassa_open.php
@@ -0,0 +1,31 @@
+
+showWithCassaOpen && isset($model->cassaOpen) ){?>
+
Aktuális záró összeg
+
+
+
+
Kasszanyitás
+
cassaOpen->user->username ) ?>
+
+
+
Kasszanyitás ideje
+
cassaOpen->created_at ) ?>
+
+
+
Kasszanyitás összege
+
cassaOpen) ? \Yii::$app->formatter->asInteger( $model->cassaOpen->money ) : ""?> FT
+
+
+
Végösszeg
+
formatter->asInteger($model->total)?> FT
+
+
+
Kasszában lévő összeg
+
formatter->asInteger( $model->totalWithCassa ) ?> FT
+
+
+
+
\ No newline at end of file
diff --git a/common/views/total/total_detailed_money_movement.php b/common/views/total/total_detailed_money_movement.php
index 140fe2f..8b22905 100644
--- a/common/views/total/total_detailed_money_movement.php
+++ b/common/views/total/total_detailed_money_movement.php
@@ -8,6 +8,7 @@
Név
Típus
Összeg
+
Megjegyzés
@@ -19,6 +20,7 @@
formatter->asInteger( $p['signed_money'])?> Ft
+
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 0449231..fbc439c 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -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' ] ];
diff --git a/frontend/controllers/AccountStateController.php b/frontend/controllers/AccountStateController.php
index 86d8d4e..1c5b947 100644
--- a/frontend/controllers/AccountStateController.php
+++ b/frontend/controllers/AccountStateController.php
@@ -12,6 +12,8 @@ use common\models\Account;
use common\components\DailyListing;
use common\models\User;
use common\components\accountstate\AccountStateMail;
+use common\models\Transfer;
+use common\components\Helper;
/**
* AccountStateController implements the CRUD actions for AccountState model.
@@ -72,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]);
@@ -94,7 +100,8 @@ class AccountStateController extends Controller {
return $this->render ( 'open', [
'model' => $model,
'accounts' => $accounts,
- 'lastStates' => $lastStates
+ 'lastStates' => $lastStates,
+ 'account' => $account
] );
}
}
@@ -111,6 +118,18 @@ 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());
+
+
+
+
+ if ( Helper::isAccountStateClosePreloadMoney()){
+ $model->money = $this->readCassaClose();
+ }
+
+
if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
@@ -128,11 +147,23 @@ class AccountStateController extends Controller {
return $this->render ( 'close', [
'model' => $model,
'accounts' => $accounts,
- 'lastStates' => $lastStates
+ 'account' => $account,
+ 'lastStates' => $lastStates ,
+ 'lastCassaState' => $lastCassaState,
] );
}
}
+ protected function readCassaClose(){
+ $total = 0;
+ $cassaOpen = AccountState::readLast(AccountState::TYPE_OPEN,null, Account::readDefault());
+ if ( isset($cassaOpen )){
+ $total += $cassaOpen->money;
+ }
+ $total += Transfer::readPaid($cassaOpen->created_at, date('Y-d-m h:i:s'), \Yii::$app->user->id);
+ return $total;
+ }
+
/**
* Finds the AccountState model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index 9306887..ad3253e 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -126,5 +126,54 @@ class TicketController extends FrontendController
'receptionForm' => $receptionForm,
]);
}
+
+ /**
+ * Deletes an existing Transfer model.
+ * If deletion is successful, the browser will be redirected to the 'index' page.
+ * @param integer $id
+ * @return mixed
+ */
+ public function actionDelete($id)
+ {
+ $ticket = $this->findModel($id);
+ $transfer = Transfer::find()->andWhere(['transfer.type' => Transfer::TYPE_TICKET])
+ ->andWhere(['transfer.id_object' => $ticket->id_ticket])
+ ->one();
+ $connection = \Yii::$app->db;
+ $transaction = $connection->beginTransaction();
+ try {
+ ShoppingCart::deleteAll([ 'id_transfer' => $transfer->id_transfer]);
+ UserSoldItem::deleteAll([ 'id_transfer' => $transfer->id_transfer]);
+ if ( $transfer->delete() ){
+ \Yii::$app->session->setFlash( 'success','Bérlet törölve' );
+ $transaction->commit();
+ }else{
+ throw new \Exception("Failed to save");
+ }
+
+ } catch(Exception $e) {
+ $transaction->rollback();
+ \Yii::$app->session->setFlash( 'danger','Bérlet törlése nem sikerült' );
+ }
+
+
+ return $this->redirect(Yii::$app->request->referrer);
+ }
+ /**
+ * Finds the Ticket model based on its primary key value.
+ * If the model is not found, a 404 HTTP exception will be thrown.
+ * @param integer $id
+ * @return Ticket the loaded model
+ * @throws NotFoundHttpException if the model cannot be found
+ */
+ protected function findModel($id)
+ {
+ if (($model = Ticket::findOne($id)) !== null) {
+ return $model;
+ } else {
+ throw new NotFoundHttpException('The requested page does not exist.');
+ }
+ }
+
}
diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php
index 5d4159e..814a5ab 100644
--- a/frontend/models/ReceptionForm.php
+++ b/frontend/models/ReceptionForm.php
@@ -9,6 +9,7 @@ use common\models\Customer;
use common\models\Ticket;
use common\models\Account;
use common\models\CardSearch;
+use common\models\AccountState;
/**
* ContactForm is the model behind the contact form.
@@ -21,6 +22,7 @@ class ReceptionForm extends Model
public $tickets;
public $defaultAccount;
public $cardSearchModel;
+ public $lastCassaState;
/**
* @inheritdoc
@@ -58,10 +60,33 @@ class ReceptionForm extends Model
$this->defaultAccount = Account::findOne($defaultAccount);
}
+ $this->readLastCassaState();
$this->cardSearchModel = new CardSearch();
}
+ public function readLastCassaState(){
+ $a = Account::readDefault();
+ if ( isset($a)){
+ $this->lastCassaState = AccountState::find()->andWhere(['account_state.id_account' => $a])
+ ->andWhere(['account_state.id_user' => \Yii::$app->user->id] )
+ ->orderBy(['account_state.created_at' => SORT_DESC])
+ ->limit(1)
+ ->one();
+ }
+ }
+
+ public function hasCassa(){
+ return isset($this->lastCassaState) ;
+ }
+
+ public function isCassaOpen(){
+ return ( isset($this->lastCassaState) && $this->lastCassaState->isTypeOpen());
+ }
+ public function isCassaClose(){
+ return ( isset($this->lastCassaState) && $this->lastCassaState->isTypeClose());
+ }
+
public function getDefaultAccountName(){
$result = "";
if ( $this->defaultAccount ){
diff --git a/frontend/views/account-state/_form_close.php b/frontend/views/account-state/_form_close.php
index 11839c0..a3a3d31 100644
--- a/frontend/views/account-state/_form_close.php
+++ b/frontend/views/account-state/_form_close.php
@@ -7,6 +7,7 @@ use frontend\components\HtmlHelper;
/* @var $this yii\web\View */
/* @var $model common\models\AccountState */
/* @var $form yii\widgets\ActiveForm */
+/* @var $lastCassaState common\models\AccountState */
?>
@@ -15,10 +16,14 @@ use frontend\components\HtmlHelper;