add inventory admin fix, add procurement update

This commit is contained in:
2016-03-30 20:04:49 +02:00
parent 19761cb0cc
commit a12b87d3be
22 changed files with 853 additions and 245 deletions

View File

@@ -33,12 +33,15 @@ class TransferLaterSearch extends Transfer
public $total_money;
public $output;
/**
* @inheritdoc
*/
public function rules()
{
return [
[['output' ] ,'safe'],
[[ 'id_ticket_type','id_user'], 'integer'],
[[ 'start', ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
[[ 'end' , ], 'date' ,'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
@@ -72,11 +75,13 @@ class TransferLaterSearch extends Transfer
'transfer.money as transfer_money',
'transfer.status as transfer_status',
'user.username as user_username',
'customer.id_customer as customer_id_customer',
'customer.name as customer_name',
'ticket_type.name as ticket_type_name',
'product.name as product_name',
'ticket.start as ticket_start',
'ticket.end as ticket_end',
'ticket.comment as ticket_comment',
]);
$query->from("transfer");
$query->innerJoin('user', " user.id = transfer.id_user");
@@ -89,10 +94,15 @@ class TransferLaterSearch extends Transfer
$query->andWhere(["transfer.payment_method" => Transfer::PAYMENT_METHOD_TRANSFER_LATER ]);
$query->andWhere(['transfer.status' => Transfer::STATUS_NOT_PAID]);
$this->load($params);
$valid = $this->validate();
$dataProvider = new ActiveDataProvider([
'query' => $query,
'sort' =>[
'pagination' => $this->output == 'pdf' ? false : [],
'sort' => [
'defaultOrder' =>[
'transfer_created_at' => SORT_DESC
],
@@ -106,22 +116,18 @@ class TransferLaterSearch extends Transfer
['product_name'],
['ticket_start'],
['ticket_end'],
['ticket_comment'],
])
]
]);
// $query->addSelect( ['*' ]);
$this->load($params);
if (!$this->validate()) {
if (!$valid) {
// uncomment the following line if you do not want to return any records when validation fails
$query->where('0=1');
return $dataProvider;
}
$query->andFilterWhere([