mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git
synced 2026-08-19 12:34:06 +00:00
merged conflict
This commit is contained in:
@@ -8,24 +8,14 @@ use App\Soitem;
|
||||
|
||||
class SoController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
// get the list of the shipping order
|
||||
public function index()
|
||||
{
|
||||
return view('welcome');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
//get the shipping order
|
||||
public function showso($so_id)
|
||||
public function show($so_id)
|
||||
{
|
||||
$so_id = So::find($so_id);
|
||||
return response()->json($so_id, 200);
|
||||
|
||||
Reference in New Issue
Block a user