fix small bugs
This commit is contained in:
parent
4f255ad93d
commit
abb69ce92d
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -17,7 +17,6 @@ class DefaultAccountBehavior extends Behavior
|
||||
}
|
||||
|
||||
public function validateDefaultAccount($event){
|
||||
echo "deafult";
|
||||
|
||||
$account = Account::readDefault();
|
||||
if ( !isset($account) ){
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -264,7 +264,6 @@ function ProductSell(o){
|
||||
data = {
|
||||
'query' : s,
|
||||
};
|
||||
|
||||
$.ajax({
|
||||
dataType: "json",
|
||||
url: url,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user