add contraint , that everybody expect admin is limited to 3 days, Add card package

This commit is contained in:
2016-02-13 17:23:43 +01:00
parent 556bdc3066
commit 70f43468af
37 changed files with 1418 additions and 19 deletions

View File

@@ -6,6 +6,7 @@ use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\AccountState;
use common\components\Helper;
/**
* AccountstateSearch represents the model behind the search form about `common\models\AccountState`.
@@ -80,6 +81,8 @@ class AccountstateSearch extends AccountState
$query->andFilterWhere([ '>=', 'account_state.created_at', $this->timestampStart ] );
$query->andFilterWhere([ '<', 'account_state.created_at', $this->timestampEnd ] );
Helper::restrictIfNotAdminTheStartDate($query, $this->timestampStart, ['account_state.created_at']);
$query->orderBy( 'created_at desc' );
$query->limit = 20;

View File

@@ -7,6 +7,7 @@ use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\MoneyMovement;
use yii\helpers\ArrayHelper;
use common\components\Helper;
/**
* MoneyMovementSearch represents the model behind the search form about `common\models\MoneyMovement`.
@@ -67,6 +68,8 @@ class MoneyMovementSearch extends MoneyMovement
$query->andFilterWhere([ '>=', 'money_movement.created_at', $this->timestampStart ] );
$query->andFilterWhere([ '<', 'money_movement.created_at', $this->timestampEnd ] );
Helper::restrictIfNotAdminTheStartDate($query, $this->timestampStart,['money_movement.created_at']);
return $dataProvider;
}

View File

@@ -12,6 +12,7 @@ use yii\db\Expression;
use common\models\Account;
use yii\helpers\ArrayHelper;
use common\components\Helper;
/**
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
*/
@@ -91,6 +92,8 @@ class TransferSearch extends Transfer
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
Helper::restrictIfNotAdminTheStartDate($query, $this->timestampStart);
return $dataProvider;
}
@@ -106,6 +109,7 @@ class TransferSearch extends Transfer
$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
$idUser = Yii::$app->user->id;
$this->totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);