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

add change card, add customer tab

Browse Source
This commit is contained in:
Roland Schneider
2016-01-25 23:09:43 +01:00
parent 8d29f47d49
commit 9fb349ee64
19 changed files with 241 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/models/Card.php
View File

@@ -116,9 +116,12 @@ class Card extends \common\models\BaseFitnessActiveRecord
public static function readCard($number,$free = null){
$card = null;
$query = Card::find()
->leftJoin(Customer::tableName(), 'card.id_card = customer.id_customer_card ' )
->andWhere(['number'=>$number ]);
->leftJoin(Customer::tableName(), 'card.id_card = customer.id_customer_card ' );
// ->andWhere(['number'=>$number ]);
Card::addCardNumberCondition($query, $number);
if ( isset($free) ){
if ( $free == true){
$query->andWhere('customer.id_customer is null');
@@ -149,4 +152,12 @@ class Card extends \common\models\BaseFitnessActiveRecord
return $name;
}
public static function addCardNumberCondition($query,$number, $field_number = "card.number",$field_rfid_key = "card.rfid_key"){
$query->andWhere(['or',
['and',[ 'in',$field_number , [$number]],"trim(coalesce(card.number, '')) <>'' " ],
['and', ['in',$field_rfid_key ,[ $number ] ],"trim(coalesce(card.rfid_key, '')) <>'' "],
]);
}
}