Finish account_state_non_cash

This commit is contained in:
2016-10-23 20:41:52 +02:00
34 changed files with 1103 additions and 316 deletions

View File

@@ -19,7 +19,7 @@ class LogSearch extends Log
public $end;
public $timestampStart;
public $timestampEnd;
/**
* @inheritdoc
*/

View File

@@ -48,7 +48,7 @@ class TransferSearch extends Transfer
public function rules()
{
return [
[['id_account', 'id_user', 'type', 'status', 'payment_method'], 'integer'],
[['id_account', 'id_user', 'type', 'status', 'payment_method','paid_by'], 'integer'],
[['customer_name','output','transfer_name', 'card_number' ], 'safe'],
// [[ 'searchObjectName' ], 'string'],
// [[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
@@ -189,7 +189,12 @@ class TransferSearch extends Transfer
$query->andFilterWhere([
'or',
['transfer.id_user' => $this->id_user],
['transfer.paid_by' => $this->id_user],
]);
}
if (isset($this->paid_by)) {
$query->andFilterWhere([
'or',
['transfer.paid_by' => $this->paid_by],
]);
}

View File

@@ -21,7 +21,7 @@ $items = [
[ 'Befizetések', ['ticket/index-customer', 'id' => $customer->id_customer ]],
[ 'Kulcsok', ['key/index-customer','id' => $customer->id_customer ]],
[ 'Szerződések', ['contract/index-customer', 'id' => $customer->id_customer ]],
// [ 'Kosár', ['transfer/customer-cart', 'id_card' => $card->id_card ]],
// [ 'Kosár', ['transfer/customer-cart', 'id_card' => $card->id_card ]],
];

View File

@@ -69,7 +69,9 @@ use kartik\widgets\DateTimePicker;
<?= $form->field($model, 'card_number')->label("Kártya szám") ?>
</div>
<div class='col-md-3'>
</div>
<?= $form->field($model, 'paid_by')->dropDownList( ['' => Yii::t('common/transfer', 'All')] +ArrayHelper::map($users,'id' , 'username') )
->label("Fizette")?>
</div>
<div class='col-md-3'>
</div>
</div>