diff --git a/changelog.txt b/changelog.txt index 3f7db34..57f5c1b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +-0.0.23 + - fix small bugs -0.0.22 - fix product barcode unique on admin site - When checking ticket, use status = Active diff --git a/common/config/params.php b/common/config/params.php index 102700d..e6a8a8e 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.22', + 'version' => 'v0.0.23', 'company' => 'movar',//gyor 'company_name' => "Freimann Kft.", 'product_visiblity' => 'account',// on reception which products to display. account or global diff --git a/common/models/AccountState.php b/common/models/AccountState.php index 4039fb4..3936121 100644 --- a/common/models/AccountState.php +++ b/common/models/AccountState.php @@ -227,7 +227,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord $this->prev_money = 0; if ( $this->type == AccountState::TYPE_CLOSE){ - $lastOpen = AccountState::readLast(AccountState::TYPE_OPEN,null, $this->id_account); + $lastOpen = AccountState::readLast(AccountState::TYPE_OPEN,\Yii::$app->user->id, $this->id_account); if ( $lastOpen != null ){ $start = $lastOpen->created_at; $this->prev_state = $lastOpen->id_account_state; diff --git a/frontend/components/CassaOpenBehavior.php b/frontend/components/CassaOpenBehavior.php index 3c9e35a..8b194f0 100644 --- a/frontend/components/CassaOpenBehavior.php +++ b/frontend/components/CassaOpenBehavior.php @@ -19,7 +19,7 @@ class CassaOpenBehavior extends Behavior public function validateCassaOpen($event){ - $cassaOpen = AccountState::readLast(null, null, Account::readDefault() ); + $cassaOpen = AccountState::readLast(null, \Yii::$app->user->id, Account::readDefault() ); if ( !isset($cassaOpen) ){ return $this->redirectToCassaOpen($event); diff --git a/frontend/components/DefaultAccountBehavior.php b/frontend/components/DefaultAccountBehavior.php index 7de2f5c..da63271 100644 --- a/frontend/components/DefaultAccountBehavior.php +++ b/frontend/components/DefaultAccountBehavior.php @@ -17,7 +17,6 @@ class DefaultAccountBehavior extends Behavior } public function validateDefaultAccount($event){ - echo "deafult"; $account = Account::readDefault(); if ( !isset($account) ){ diff --git a/frontend/controllers/AccountStateController.php b/frontend/controllers/AccountStateController.php index 1c5b947..2b15d45 100644 --- a/frontend/controllers/AccountStateController.php +++ b/frontend/controllers/AccountStateController.php @@ -156,11 +156,13 @@ class AccountStateController extends Controller { protected function readCassaClose(){ $total = 0; - $cassaOpen = AccountState::readLast(AccountState::TYPE_OPEN,null, Account::readDefault()); + $openDate = null; + $cassaOpen = AccountState::readLast(AccountState::TYPE_OPEN,\Yii::$app->user->id, Account::readDefault()); if ( isset($cassaOpen )){ $total += $cassaOpen->money; + $openDate = $cassaOpen->created_at; } - $total += Transfer::readPaid($cassaOpen->created_at, date('Y-d-m h:i:s'), \Yii::$app->user->id); + $total += Transfer::readPaid($openDate, date('Y-m-d h:i:s'), \Yii::$app->user->id); return $total; } diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js index 4d68b5f..cfe746a 100644 --- a/frontend/web/js/product.sell.js +++ b/frontend/web/js/product.sell.js @@ -264,7 +264,6 @@ function ProductSell(o){ data = { 'query' : s, }; - $.ajax({ dataType: "json", url: url,