deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to order when auth user ordered for existing account

Browse Source
This commit is contained in:
Deon George 2018-08-20 22:53:16 +10:00
parent 8d9b0c7027
commit 90bcb7f5f1
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/OrderController.php
View File

@ -58,7 +58,9 @@ class OrderController extends Controller
// Check we have the custom attributes for the product // Check we have the custom attributes for the product
$options = $po->orderValidation($request); $options = $po->orderValidation($request);
$uo = User::firstOrNew(['email'=>$request->input('order_email') ?: $request->input('order_email_manual')]); if ($request->input('order_email_manual'))
{
$uo = User::firstOrNew(['email'=>$request->input('order_email_manual')]);
// If this is a new client // If this is a new client
if (! $uo->exists) if (! $uo->exists)
@ -73,6 +75,7 @@ class OrderController extends Controller
$uo->active = 1; $uo->active = 1;
$uo->save(); $uo->save();
} }
}
// If we have a new account. // If we have a new account.
if (is_null($request->input('account_id'))) if (is_null($request->input('account_id')))
@ -88,10 +91,7 @@ class OrderController extends Controller
$uo->accounts()->save($ao); $uo->accounts()->save($ao);
} else { } else {
// @todo This logic may be wrong, if account_id is not set, it'll pick the first account, which may be wrong. $ao = Account::findOrFail($request->input('account_id'));
$ao = $request->input('account_id')
? $uo->accounts->where('account_id',$request->input('account_id'))
: $uo->accounts->first();
} }
$so = new Service; $so = new Service;

6
resources/theme/frontend/metronic/order.blade.php
View File

@ -52,7 +52,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane row fade in active" id="account_exist"> <div class="tab-pane row fade in active" id="account_exist">
<div class="control-group form-group col-sm-12 {{ $errors->has('account_id') ? 'has-error' : '' }}"> <div class="control-group form-group col-sm-12 {{ $errors->has('account_id') ? 'has-error' : '' }}">
<label for="order_email">Client Account</label> <label for="account_id">Client Account</label>
<select class="form-control" id="account_id" name="account_id"> <select class="form-control" id="account_id" name="account_id">
<option value="">&nbsp;</option> <option value="">&nbsp;</option>
@foreach ($user->all_accounts()->sortBy('company') as $o) @foreach ($user->all_accounts()->sortBy('company') as $o)
@ -108,7 +108,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane row fade in active" id="account_exist"> <div class="tab-pane row fade in active" id="account_exist">
<div class="control-group form-group col-sm-12 {{ $errors->has('account_id') ? 'has-error' : '' }}"> <div class="control-group form-group col-sm-12 {{ $errors->has('account_id') ? 'has-error' : '' }}">
<label for="order_email">Existing Account</label> <label for="account_id">Existing Account</label>
<select class="form-control" id="account_id" name="account_id"> <select class="form-control" id="account_id" name="account_id">
<option value="">&nbsp;</option> <option value="">&nbsp;</option>
@foreach ($user->accounts->sortBy('company') as $o) @foreach ($user->accounts->sortBy('company') as $o)
@ -185,7 +185,7 @@
</div> </div>
<div class="control-group form-group col-sm-6 {{ $errors->has('product_id') ? 'has-error' : '' }}"> <div class="control-group form-group col-sm-6 {{ $errors->has('product_id') ? 'has-error' : '' }}">
<label for="order_email">Product</label> <label for="product_id">Product</label>
<select class="form-control" id="product_id" name="product_id"> <select class="form-control" id="product_id" name="product_id">
<option value="">&nbsp;</option> <option value="">&nbsp;</option>
@php @php