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

fix small bugs

Browse Source
This commit is contained in:
Roland Schneider 2016-01-17 08:23:48 +01:00
parent 4f255ad93d
commit abb69ce92d
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.0.23
- fix small bugs
-0.0.22 -0.0.22
- fix product barcode unique on admin site - fix product barcode unique on admin site
- When checking ticket, use status = Active - When checking ticket, use status = Active

2
common/config/params.php
View File

@ -4,7 +4,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.22', 'version' => 'v0.0.23',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global

2
common/models/AccountState.php
View File

@ -227,7 +227,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
$this->prev_money = 0; $this->prev_money = 0;
if ( $this->type == AccountState::TYPE_CLOSE){ 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 ){ if ( $lastOpen != null ){
$start = $lastOpen->created_at; $start = $lastOpen->created_at;
$this->prev_state = $lastOpen->id_account_state; $this->prev_state = $lastOpen->id_account_state;

2
frontend/components/CassaOpenBehavior.php
View File

@ -19,7 +19,7 @@ class CassaOpenBehavior extends Behavior
public function validateCassaOpen($event){ public function validateCassaOpen($event){
$cassaOpen = AccountState::readLast(null, null, Account::readDefault() ); $cassaOpen = AccountState::readLast(null, \Yii::$app->user->id, Account::readDefault() );
if ( !isset($cassaOpen) ){ if ( !isset($cassaOpen) ){
return $this->redirectToCassaOpen($event); return $this->redirectToCassaOpen($event);

1
frontend/components/DefaultAccountBehavior.php
View File

@ -17,7 +17,6 @@ class DefaultAccountBehavior extends Behavior
} }
public function validateDefaultAccount($event){ public function validateDefaultAccount($event){
echo "deafult";
$account = Account::readDefault(); $account = Account::readDefault();
if ( !isset($account) ){ if ( !isset($account) ){

6
frontend/controllers/AccountStateController.php
View File

@ -156,11 +156,13 @@ class AccountStateController extends Controller {
protected function readCassaClose(){ protected function readCassaClose(){
$total = 0; $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 )){ if ( isset($cassaOpen )){
$total += $cassaOpen->money; $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; return $total;
} }

1
frontend/web/js/product.sell.js
View File

@ -264,7 +264,6 @@ function ProductSell(o){
data = { data = {
'query' : s, 'query' : s,
}; };
$.ajax({ $.ajax({
dataType: "json", dataType: "json",
url: url, url: url,