ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #549 from DODMax/e-offline-pay 

Allow offline payment when no gateway is defined
This commit is contained in:
Jeremy Quinton 2019-02-18 09:31:44 +02:00 committed by GitHub
parent 957c87c0e0 2b320c7c81
commit 935170f256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/EventCheckoutController.php
View File

@ -186,14 +186,14 @@ class EventCheckoutController extends Controller
$paymentGateway = $activeAccountPaymentGateway; $paymentGateway = $activeAccountPaymentGateway;
} else { } else {
$activeAccountPaymentGateway = $event->account->getGateway($event->account->payment_gateway_id); $activeAccountPaymentGateway = $event->account->getGateway($event->account->payment_gateway_id);
//if no payment gateway configured don't go to the next step and show user error //if no payment gateway configured and no offline pay, don't go to the next step and show user error
if (empty($activeAccountPaymentGateway)) { if (empty($activeAccountPaymentGateway) && !$event->enable_offline_payments) {
return response()->json([ return response()->json([
'status' => 'error', 'status' => 'error',
'message' => 'No payment gateway configured', 'message' => 'No payment gateway configured',
]); ]);
} }
$paymentGateway = $activeAccountPaymentGateway->payment_gateway; $paymentGateway = $activeAccountPaymentGateway ? $activeAccountPaymentGateway->payment_gateway : false;
} }
/* /*
@ -389,7 +389,7 @@ class EventCheckoutController extends Controller
break; break;
default: default:
Log::error('No payment gateway configured.'); Log::error('No payment gateway configured.');
return repsonse()->json([ return response()->json([
'status' => 'error', 'status' => 'error',
'message' => 'No payment gateway configured.' 'message' => 'No payment gateway configured.'
]); ]);

1
app/Jobs/SendOrderNotification.php
View File

@ -7,6 +7,7 @@ use App\Models\Order;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Log;
class SendOrderNotification extends Job implements ShouldQueue class SendOrderNotification extends Job implements ShouldQueue
{ {

8
resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php
View File

@ -159,7 +159,13 @@
@if($event->enable_offline_payments) @if($event->enable_offline_payments)
<div class="offline_payment_toggle"> <div class="offline_payment_toggle">
<div class="custom-checkbox"> <div class="custom-checkbox">
<input data-toggle="toggle" id="pay_offline" name="pay_offline" type="checkbox" value="1"> @if($payment_gateway === false)
{{-- Force offline payment if no gateway --}}
<input type="hidden" name="pay_offline" value="1">
<input id="pay_offline" type="checkbox" value="1" checked disabled>
@else
<input data-toggle="toggle" id="pay_offline" name="pay_offline" type="checkbox" value="1">
@endif
<label for="pay_offline">@lang("Public_ViewEvent.pay_using_offline_methods")</label> <label for="pay_offline">@lang("Public_ViewEvent.pay_using_offline_methods")</label>
</div> </div>
</div> </div>