diff --git a/app/Http/Controllers/Fo/BasketController.php b/app/Http/Controllers/Fo/BasketController.php index 87f0078..5bc60f1 100644 --- a/app/Http/Controllers/Fo/BasketController.php +++ b/app/Http/Controllers/Fo/BasketController.php @@ -51,9 +51,9 @@ class BasketController extends Controller foreach ($basket->contents as $content) { $coupon = $content->coupon()->whereRaw( - "coupon_published = 1 AND - (coupon_mindatediffusion IS NULL OR coupon_mindatediffusion <= NOW()) AND - (coupon_maxdatediffusion IS NULL OR coupon_maxdatediffusion >= NOW()) AND + "coupon_published = 1 AND + (coupon_mindatediffusion IS NULL OR coupon_mindatediffusion <= NOW()) AND + (coupon_maxdatediffusion IS NULL OR coupon_maxdatediffusion >= NOW()) AND (coupon_maxdatevalidity IS NULL OR coupon_maxdatevalidity >= NOW())" )->first(); @@ -88,6 +88,6 @@ class BasketController extends Controller // $coupons contains all printed coupons $pdf = PDF::loadView('pdf.coupons', ['coupons' => $coupons]); - return $pdf->download(sprintf("coupons_%s_%s_%s.pdf", $crmInfos->firstname, $crmInfos->lastname, date('d-m-Y'))); + return $pdf->download(sprintf("coupons_%s_%s_%s.pdf", $crmInfos->firstname, $crmInfos->lastname, date('d-m-Y_H-i-s'))); } }