Commit f36616db authored by Khumoyunmirzo Sodiqov's avatar Khumoyunmirzo Sodiqov

Release 28.10.2019

(
   - Disabled Auto LogIn before Register
)
parent 3cad2176
...@@ -222,8 +222,8 @@ class OrderController extends Controller ...@@ -222,8 +222,8 @@ class OrderController extends Controller
DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'), DB::raw('(SELECT concat(name, \' \', surname) FROM clients WHERE id=orders.client_id) as client'),
DB::raw('(SELECT title FROM status WHERE id=orders.status_id) as statuses'), DB::raw('(SELECT title FROM status WHERE id=orders.status_id) as statuses'),
DB::raw('(SELECT color_class FROM status WHERE id=orders.status_id) as status_class'), DB::raw('(SELECT color_class FROM status WHERE id=orders.status_id) as status_class'),
DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.from_address) as sender'), DB::raw('(SELECT concat(firstname,\' \',secondname) FROM address_info WHERE id=orders.from_address) as sender'),
DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'), DB::raw('(SELECT concat(firstname,\' \',secondname) FROM address_info WHERE id=orders.to_address_id) as recipient'),
DB::raw('(SELECT concat(passport,\' | \',passport_by,\', \',passport_issue) FROM address_info WHERE id=orders.to_address_id) as recipient_passport'), DB::raw('(SELECT concat(passport,\' | \',passport_by,\', \',passport_issue) FROM address_info WHERE id=orders.to_address_id) as recipient_passport'),
DB::raw('(SELECT concat(country,\', \',city,\', \',street,\' \',house,\' \',apartment,\', \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'), DB::raw('(SELECT concat(country,\', \',city,\', \',street,\' \',house,\' \',apartment,\', \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'),
])->where([ ])->where([
...@@ -243,6 +243,8 @@ class OrderController extends Controller ...@@ -243,6 +243,8 @@ class OrderController extends Controller
'description', 'description',
])->where('order_id', '=', $orderId)->get(); ])->where('order_id', '=', $orderId)->get();
// dd($order[0]);
return view('pages.parcels.payment', ['order' => $order[0], 'payment' => $payment[0]]); return view('pages.parcels.payment', ['order' => $order[0], 'payment' => $payment[0]]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment