diff --git a/app/Http/Controllers/SoController.php b/app/Http/Controllers/SoController.php
index 32f2a45..b39aa20 100644
--- a/app/Http/Controllers/SoController.php
+++ b/app/Http/Controllers/SoController.php
@@ -9,6 +9,11 @@ use App\Soitem;
 class SoController extends Controller
 {
 
+    public function showso($id)
+    {
+        $so = So::find($id);
+        return view('show')->with('so', $so);
+    }
 
     /**
      * Store shipping order item.
@@ -20,15 +25,21 @@ class SoController extends Controller
     public function store(Request $request)
     {   
 
+        //TODO so
+        // retrieve FK from Contact, Delivery, Warehouse
+        //user->company->id, 
+
         $so = new So;
         $so = So::where("user_id", Auth::user()->com_id)->first();
-        $so->ff_id = Auth::user()->company()->id;
+        $so->ff_id = Auth::user()->company()->id;// have to write a logic (validation) that only freight forwarder that added into contact can use the ff_id
         $so->supplier_company_name = $request->input('supplier_company_name');
         $so->supplier_contact_person = $request->input('supplier_contact_person');
         $so->supplier_contact_person_no = $request->input('supplier_contact_person_no');
-        $so->delivery_id = $request->input('delivery_id');
-        $so->warehouse_id = $request->input('warehouse_id');
+        $so->delivery_id = $request->input('delivery_id');// delivery info
+        $so->warehouse_id = $request->input('warehouse_id');// warehouse
         $so->save();
+
+        //Auth::user()->company()->so->save($so);
         
         //shipping order item
         $soitems = $request->input('soitem');
@@ -53,6 +64,8 @@ class SoController extends Controller
                 ));
         $new_soitem->save();
 
+        //Auth::user()->company()->soitem->save($soitem);
+
           }
 
         return response()->json(['so'=>$so], 201);
@@ -94,7 +107,7 @@ class SoController extends Controller
         $soitems = $request->input('soitem');       
         foreach ($soitems as $soitem)
          {
-                $new_soitem = Soitem::where('so_id', $id)->first();  
+                $new_soitem = Soitem::where('so_id', $id)->first();
                 $new_soitem->status = $soitem['status'];
                 $new_soitem->order_id = $soitem['order_id'];
                 $new_soitem->brand_no = $soitem['brand_no'];
diff --git a/routes/api.php b/routes/api.php
index 04fffa0..4bb5d61 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,17 +13,10 @@ use Illuminate\Http\Request;
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
-//Route for the shipping order
-Route::get('/so', 'SoController@index');// get the list of the shipping order 
-Route::get('/so/{so_id}', 'SoController@showso');//get the shipping order 
-Route::post('/so', 'SoController@store');//store shipping order 
-Route::put('/so/{so_id}/cancelOrder', 'SoController@cancelOrder');//post the cancel order 
-Route::delete('/so/{so_id}', 'SoController@delete');// delete the shipping order
-Route::put('/so/{so_id}', 'SoController@update');//update the shipping order
 
-//Route for the shipping order item
-Route::delete('/so/soitem/{so_id}', 'SoController@deleteitem');//delete the shipping order item
-Route::put('/so/soitem/{so_id}', 'SoController@updateitem');//update the shipping order item
+
+
+
 
 
 
@@ -37,7 +30,15 @@ Route::post('recover', 'AuthController@recover');
 
 Route::group(['middleware' => ['jwt.auth']], function() {
     Route::get('logout', 'AuthController@logout');
-    Route::get('test', function(){
-        return response()->json(['foo'=>'bar']);
+    Route::patch('user', 'AuthController@updateUser');
+    Route::get('test', function(Request $request){
+        return response()->json(['user'=> $request->user()]);
     });
-});
\ No newline at end of file
+
+    /* shipping order */
+    Route::get('/so/{so_id}', 'SoController@showso');//get the shipping order
+    Route::post('/so', 'SoController@store');//store shipping order 
+    Route::delete('/so/{so_id}', 'SoController@delete');// delete the shipping order
+    Route::put('/so/{so_id}/cancelOrder', 'SoController@cancelOrder');//post the cancel order 
+    Route::put('/so/{so_id}', 'SoController@update');//update the shipping order
+});