From 4d7b9b931f4edc82eccb8a94a0dda305252c22bf Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Tue, 15 May 2018 12:13:06 +0800 Subject: [PATCH] complete the model, controller, and migration --- app/So.php | 6 +++++- app/Soitem.php | 9 ++++++++- ...le.php => 2018_05_15_034032_create_soitems_table.php} | 8 ++++++++ routes/api.php | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) rename database/migrations/{2018_05_07_075445_create_soitems_table.php => 2018_05_15_034032_create_soitems_table.php} (81%) diff --git a/app/So.php b/app/So.php index 9fad772..0dec710 100644 --- a/app/So.php +++ b/app/So.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Model; class So extends Model { protected $fillable = [ - 'id', 'ff_id', 'supplier_company_name', 'supplier_contact_person', @@ -16,4 +15,9 @@ class So extends Model 'warehouse_id', ]; + public function Soitem() + { + return $this->hasMany(Soitem::class); + } + } diff --git a/app/Soitem.php b/app/Soitem.php index c17bc3c..4ef8b82 100644 --- a/app/Soitem.php +++ b/app/Soitem.php @@ -7,7 +7,8 @@ use Illuminate\Database\Eloquent\Model; class Soitem extends Model { protected $fillable = [ - 'id', + 'so_id', + 'status', 'order_id', 'brand_no', 'model_no', @@ -24,4 +25,10 @@ class Soitem extends Model ]; + public function So() + { + return $this->belongsTo(So::class); + } + + } diff --git a/database/migrations/2018_05_07_075445_create_soitems_table.php b/database/migrations/2018_05_15_034032_create_soitems_table.php similarity index 81% rename from database/migrations/2018_05_07_075445_create_soitems_table.php rename to database/migrations/2018_05_15_034032_create_soitems_table.php index 86334f3..827de63 100644 --- a/database/migrations/2018_05_07_075445_create_soitems_table.php +++ b/database/migrations/2018_05_15_034032_create_soitems_table.php @@ -16,6 +16,14 @@ class CreateSoitemsTable extends Migration Schema::create('soitems', function (Blueprint $table) { $table->increments('id'); + // foreign key for the so table + $table->unsignedInteger('so_id'); + $table->foreign('so_id') + ->references('id')->on('sos') + ->onDelete('cascade') + ->onUpdate('cascade'); + $table->Integer('status')->default('0'); + //Item details $table->integer('order_id'); $table->integer('brand_no'); diff --git a/routes/api.php b/routes/api.php index 8cc89af..da283a7 100644 --- a/routes/api.php +++ b/routes/api.php @@ -16,7 +16,7 @@ use Illuminate\Http\Request; //Route for the shipping order Route::get('/so', 'SoController@index');// get the list of the shipping order Route::get('/so/{so_id}', 'SoController@so');//get the shipping order -Route::post('/so/{so_id}', 'SoController@store');//create shipping order +Route::post('/so/{so_id}', 'SoController@store');//store shipping order Route::post('/so/{so_id}/cancel-order', '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