rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add editable account on reception/customer-cart, add towel handling

Browse Source
This commit is contained in:
Roland Schneider
2016-10-21 20:39:02 +02:00
parent 8585286150
commit 90c598f8c6
26 changed files with 649 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/models/CardSearch.php
View File

@@ -16,6 +16,7 @@ class CardSearch extends Card
{
public $customerName;
public $towel;
/**
* @inheritdoc
*/
@@ -23,7 +24,8 @@ class CardSearch extends Card
{
return [
['customerName','string','max' =>200],
['number','string','max' =>200]
['number','string','max' =>200],
['towel','integer']
];
}
@@ -40,7 +42,8 @@ class CardSearch extends Card
return ArrayHelper::merge(parent::attributeLabels(),
[
'card_number' => 'Kártya szám',
'customerName' => 'Vendég'
'customerName' => 'Vendég',
'towel' => 'Törölköző'
]
);
@@ -57,7 +60,7 @@ class CardSearch extends Card
{
$query = new Query();
$query->select(['card.id_card as card_id_card', 'card.number as card_number' , 'customer.name as customer_name', 'customer.email as customer_email','customer.phone as customer_phone']);
$query->select(['card.id_card as card_id_card', 'card.number as card_number' , 'customer.name as customer_name', 'customer.email as customer_email','customer.phone as customer_phone','customer.towel_count as towel_count']);
$query->from('card');
$query->innerJoin('customer','card.id_card = customer.id_customer_card');
$query->leftJoin("card_key_assignment", 'card.id_card = card_key_assignment.id_card');
@@ -85,6 +88,10 @@ class CardSearch extends Card
'asc' => ['customer.email' => SORT_ASC ],
'desc' => ['customer.email' => SORT_DESC],
],
'towel_count' => [
'asc' => ['customer.towel_count' => SORT_ASC ],
'desc' => ['customer.towel_count' => SORT_DESC],
],
],
'defaultOrder' =>[
'customer_name' => SORT_ASC,
@@ -115,6 +122,10 @@ class CardSearch extends Card
]);
}
if ( isset($this->towel) && !empty($this->towel)){
$query->andWhere(['>','customer.towel_count',0]);
}
$query->andFilterWhere(['like', 'customer.name', $this->customerName]);
return $dataProvider;