merged conflict

This commit is contained in:
Zain Fauzan Rofie Azizi
2018-06-28 17:11:56 +08:00
37 changed files with 7961 additions and 255 deletions
+2 -12
View File
@@ -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);