From 0226847eea1e7d1be03666922932fda94ecc1572 Mon Sep 17 00:00:00 2001
From: Zain Fauzan Rofie Azizi <zanepojan94@gmail.com>
Date: Thu, 7 Jun 2018 17:21:08 +0800
Subject: [PATCH] dropped order_id column in soitem table

---
 app/Http/Controllers/SoController.php         | 19 ++++++-----
 app/Soitem.php                                |  1 -
 ...2018_06_07_083420_drop_order_id_column.php | 34 +++++++++++++++++++
 routes/api.php                                |  9 ++---
 4 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 database/migrations/2018_06_07_083420_drop_order_id_column.php

diff --git a/app/Http/Controllers/SoController.php b/app/Http/Controllers/SoController.php
index b39aa20..292e817 100644
--- a/app/Http/Controllers/SoController.php
+++ b/app/Http/Controllers/SoController.php
@@ -31,7 +31,7 @@ class SoController extends Controller
 
         $so = new So;
         $so = So::where("user_id", Auth::user()->com_id)->first();
-        $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->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');
@@ -46,9 +46,8 @@ class SoController extends Controller
         foreach ($soitems as $soitem)
          {
                 $new_soitem = new Soitem(array(
-                    'so_id'=>$soitem['so_id'],
+                    'so_id'=>$so->id,
                     'status'=>$soitem['status'],
-                    'order_id'=>$soitem['order_id'],
                     'brand_no'=>$soitem['brand_no'],
                     'model_no'=>$soitem['model_no'],
                     'item_code'=>$soitem['item_code'],
@@ -72,19 +71,23 @@ class SoController extends Controller
         
     }
 
-    
-    /**
-     * Store a newly created resource in storage.
+     /**
+     *cancel the shipping order.
      *
      * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    //post the cancel order 
     public function cancelOrder(Request $request)
     {
+        $so = So::find($id);
         
-    }
+        $so->save();
 
+        $com_id = auth()->user->id;
+
+        return response()->json(['so'=>$so],200);
+    }
 
     /**
      * Update the shipping order and item.
diff --git a/app/Soitem.php b/app/Soitem.php
index bd4433b..19195ae 100644
--- a/app/Soitem.php
+++ b/app/Soitem.php
@@ -9,7 +9,6 @@ class Soitem extends Model
      protected $fillable = [
         'so_id',
         'status',
-        'order_id',
         'brand_no',
         'model_no',
         'item_code',
diff --git a/database/migrations/2018_06_07_083420_drop_order_id_column.php b/database/migrations/2018_06_07_083420_drop_order_id_column.php
new file mode 100644
index 0000000..c2f0d04
--- /dev/null
+++ b/database/migrations/2018_06_07_083420_drop_order_id_column.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropOrderIdColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('soitems', function (Blueprint $table) {
+           
+            $table->dropColumn('order_id');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('soitems', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 4bb5d61..8eba037 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -14,12 +14,6 @@ use Illuminate\Http\Request;
 |
 */
 
-
-
-
-
-
-
 //Route::middleware('auth:api')->get('/user', function (Request $request) {
 //    return $request->user();
 //});
@@ -36,9 +30,10 @@ Route::group(['middleware' => ['jwt.auth']], function() {
     });
 
     /* shipping order */
-    Route::get('/so/{so_id}', 'SoController@showso');//get the shipping order
+    Route::get('/so', '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
+    
 });