@@ -78,7 +78,7 @@ class OrderController extends Controller
...
@@ -78,7 +78,7 @@ class OrderController extends Controller
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.to_address_id) as recipient'),
DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'),
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'),
])->get();
])->where('client_id','=',$id)->get();
}else{
}else{
...
@@ -119,12 +119,15 @@ class OrderController extends Controller
...
@@ -119,12 +119,15 @@ class OrderController extends Controller
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.to_address_id) as recipient'),
DB::raw('(SELECT concat(firstname,\' \',secondname,\' \',fathername) FROM address_info WHERE id=orders.to_address_id) as recipient'),
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('status_id','=',$status_id)->get();
])->where([
['client_id','=',$id],
['status_id','=',$status_id]
])->get();
}
}
$statuses=DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id) as count FROM status s');
$statuses=DB::select('SELECT s.id, s.sort, s.title, s.color_class, (SELECT count(*) FROM orders where status_id=s.id and client_id='.$id.') as count FROM status s');
$count=DB::select('SELECT COUNT(*) as count FROM orders');
$count=DB::select('SELECT COUNT(*) as count FROM orders where client_id='.$id);
// dd($orders);
// dd($orders);
...
@@ -214,7 +217,7 @@ class OrderController extends Controller
...
@@ -214,7 +217,7 @@ class OrderController extends Controller
$order=Orders::create([
$order=Orders::create([
'client_id'=>$request->get('client_id'),
'client_id'=>$user->id,
'name'=>$request->get('name'),
'name'=>$request->get('name'),
'flight_id'=>0,
'flight_id'=>0,
'added'=>Carbon::now(),
'added'=>Carbon::now(),
...
@@ -222,7 +225,7 @@ class OrderController extends Controller
...
@@ -222,7 +225,7 @@ class OrderController extends Controller
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
