@@ -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 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 concat(firstname,\' \',secondname,\' \',fathername) 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.from_address) as sender'),
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(country,\', \',city,\', \',street,\' \',house,\' \',apartment,\', \',zip) FROM address_info WHERE id=orders.to_address_id) as recipient_address'),
])->where([
...
...
@@ -243,6 +243,8 @@ class OrderController extends Controller