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
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/components/CassaOpenBehavior.php
View File

@@ -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);

1
frontend/components/DefaultAccountBehavior.php
View File

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

6
frontend/controllers/AccountStateController.php
View File

@@ -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;
}

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

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