add rest application and discount-status rest method - lastXdays fix

This commit is contained in:
Roland Schneider 2018-09-01 22:19:31 +02:00
parent 767211d6c7
commit 7ec1a95a07

View File

@ -24,59 +24,61 @@ class CustomerController extends RestController
* @return array
* @throws \Exception
*/
public function actionDiscountStatus($number , $lastXDays = 0 ){
public function actionDiscountStatus($number, $lastXDays = null)
{
$number = Helper::fixAsciiChars( $number );
$number = Helper::fixAsciiChars($number);
$query = Card::find();
$query->andWhere(['or',
['and',[ 'in','card.number' , [$number]],"trim(coalesce(card.number, '')) <>'' " ],
['and', ['in','card.rfid_key' ,[ $number] ],"trim(coalesce(card.rfid_key, '')) <>'' "],
['and', ['in', 'card.number', [$number]], "trim(coalesce(card.number, '')) <>'' "],
['and', ['in', 'card.rfid_key', [$number]], "trim(coalesce(card.rfid_key, '')) <>'' "],
]);
$card = $query->one();
if ( !isset($card)){
if (!isset($card)) {
throw new NotFoundHttpException("Kártya nem található");
}
$customer = $card->customer;
if ( !isset($customer) ){
if (!isset($customer)) {
throw new NotFoundHttpException("Vendég nem található");
}
if ( isset($lastXDays) ){
if (!is_numeric($lastXDays)){
if (isset($lastXDays)) {
if (!is_numeric($lastXDays)) {
throw new BadRequestHttpException("lastXDays paraméter hibás");
}
if ( $lastXDays > 6 || $lastXDays < 1){
if ($lastXDays > 6 || $lastXDays < 1) {
throw new BadRequestHttpException("lastXDays paraméter érték hibás");
}
}
// check if has valid ticket today
/** @var \common\models\Card $card */
$tickets = Ticket::readActive($card );
$tickets = Ticket::readActive($card);
$hasValidTicket = count($tickets) > 0;
if (isset($lastXDays)) {
// try to find any valid ticket in the lastXDays
$minusDay = 1;
while ( !$hasValidTicket && $minusDay <= $lastXDays ){
while (!$hasValidTicket && $minusDay <= $lastXDays) {
/** @var integer $minusDay */
$day = $this->getDateMinusDays($minusDay);
$tickets = Ticket::readActive($card, $day );
$tickets = Ticket::readActive($card, $day);
$hasValidTicket = count($tickets) > 0;
$minusDay = $minusDay + 1;
}
}
$result = [
'discount' => $hasValidTicket
];
if ( isset($customer) ){
if (isset($customer)) {
$result['card_number'] = $card->number;
$result['name'] = $customer->name;
}
@ -89,10 +91,11 @@ class CustomerController extends RestController
* @return \DateTime
* @throws \Exception
*/
private function getDateMinusDays($minusDays){
private function getDateMinusDays($minusDays)
{
$date = new \DateTime('now');
$date->sub(new \DateInterval('P'.$minusDays.'D'));
$date->setTime(0,0,0);
$date->sub(new \DateInterval('P' . $minusDays . 'D'));
$date->setTime(0, 0, 0);
return $date;
}