Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
44b72e0f5f
2 changed files with 6 additions and 4 deletions
|
@ -61,6 +61,7 @@ class LicenseCheckoutController extends Controller
|
||||||
|
|
||||||
$licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
|
$licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
|
||||||
$licenseSeat->user_id = Auth::id();
|
$licenseSeat->user_id = Auth::id();
|
||||||
|
|
||||||
|
|
||||||
$checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
|
$checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
|
||||||
if ($this->$checkoutMethod($licenseSeat)) {
|
if ($this->$checkoutMethod($licenseSeat)) {
|
||||||
|
@ -76,14 +77,14 @@ class LicenseCheckoutController extends Controller
|
||||||
|
|
||||||
if (! $licenseSeat) {
|
if (! $licenseSeat) {
|
||||||
if ($seatId) {
|
if ($seatId) {
|
||||||
return redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.');
|
throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
|
throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'There are no available seats for this license.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $licenseSeat->license->is($license)) {
|
if (! $licenseSeat->license->is($license)) {
|
||||||
return redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.');
|
throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $licenseSeat;
|
return $licenseSeat;
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" readonly value="{{ old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}" style="background-color:inherit">
|
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" readonly value="{{ old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}" style="background-color:inherit">
|
||||||
<span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
|
<span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
|
||||||
</div>
|
</div>
|
||||||
|
<a style="cursor:pointer" onclick="document.getElementById('purchase_date').value = ''"> Clear </a>
|
||||||
{!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
{!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Reference in a new issue