diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 4f27069f..543df94a 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -185,8 +185,8 @@ class EventCheckoutController extends Controller $activeAccountPaymentGateway->fill(['payment_gateway_id' => config('attendize.payment_gateway_dummy')]); $paymentGateway= $activeAccountPaymentGateway; } else { - $activeAccountPaymentGateway = $event->account->active_payment_gateway->count() ? $event->account->active_payment_gateway->firstOrFail() : false; - $paymentGateway = $event->account->active_payment_gateway->count() ? $event->account->active_payment_gateway->payment_gateway : false; + $activeAccountPaymentGateway = $event->account->active_payment_gateway ? $event->account->active_payment_gateway->firstOrFail() : false; + $paymentGateway = $event->account->active_payment_gateway ? $event->account->active_payment_gateway->payment_gateway : false; } /* @@ -331,11 +331,17 @@ class EventCheckoutController extends Controller $gateway = Omnipay::create('Dummy'); $gateway->initialize(); - } else { + } elseif ($ticket_order['payment_gateway']) { $gateway = Omnipay::create($ticket_order['payment_gateway']->name); $gateway->initialize($ticket_order['account_payment_gateway']->config + [ 'testMode' => config('attendize.enable_test_payments'), ]); + } else { + Log::error('No payment gateway configured.'); + return response()->json([ + 'status' => 'error', + 'message' => 'No payment gateway configured.' + ]); } $orderService = new OrderService($ticket_order['order_total'], $ticket_order['total_booking_fee'], $event); @@ -382,7 +388,7 @@ class EventCheckoutController extends Controller break; default: Log::error('No payment gateway configured.'); - return repsonse()->json([ + return response()->json([ 'status' => 'error', 'message' => 'No payment gateway configured.' ]); diff --git a/app/Jobs/SendOrderNotification.php b/app/Jobs/SendOrderNotification.php index 9c23a7c2..5a12704d 100644 --- a/app/Jobs/SendOrderNotification.php +++ b/app/Jobs/SendOrderNotification.php @@ -7,6 +7,7 @@ use App\Models\Order; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Log; class SendOrderNotification extends Job implements ShouldQueue { diff --git a/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php index 12bd1272..280de691 100644 --- a/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php @@ -159,7 +159,13 @@ @if($event->enable_offline_payments)