From 1361538f8bf5bf35d946f16f2f9cce91f0033842 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Thu, 7 Jun 2018 09:55:43 +0800 Subject: [PATCH] solve multiple error --- app/Http/Controllers/SoController.php | 2 +- app/So.php | 7 +++- .../2018_05_07_062017_create_sos_table.php | 6 --- ...add_foreign_key_comid_to_the_sos_table.php | 38 +++++++++++++++++++ database/seeds/SoSeeder.php | 7 ++-- database/seeds/SoitemSeeder.php | 4 +- 6 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 database/migrations/2018_06_06_074452_add_foreign_key_comid_to_the_sos_table.php diff --git a/app/Http/Controllers/SoController.php b/app/Http/Controllers/SoController.php index efb7955..917067c 100644 --- a/app/Http/Controllers/SoController.php +++ b/app/Http/Controllers/SoController.php @@ -44,7 +44,7 @@ class SoController extends Controller //shipping order $so = new So; - $so->ff_id = $request->input('ff_id'); + $so->ff_id = Auth::user()->company()->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'); diff --git a/app/So.php b/app/So.php index e096127..fd5404a 100644 --- a/app/So.php +++ b/app/So.php @@ -17,7 +17,12 @@ class So extends Model public function Soitem() { - return $this->hasMany('App\Soitem', 'so_id'); + return $this->hasMany('App\Soitem'); + } + + public function company() + { + return $this->belongsTo('App\Company'); } diff --git a/database/migrations/2018_05_07_062017_create_sos_table.php b/database/migrations/2018_05_07_062017_create_sos_table.php index ce2adf3..09ba4da 100644 --- a/database/migrations/2018_05_07_062017_create_sos_table.php +++ b/database/migrations/2018_05_07_062017_create_sos_table.php @@ -15,17 +15,11 @@ class CreateSosTable extends Migration { Schema::create('sos', function (Blueprint $table) { $table->increments('id'); - - //Order details $table->integer('ff_id'); $table->string('supplier_company_name'); $table->string('supplier_contact_person'); $table->integer('supplier_contact_person_no'); - - //Delivery details $table->integer('delivery_id'); - - //Warehouse details $table->integer('warehouse_id'); $table->timestamps(); diff --git a/database/migrations/2018_06_06_074452_add_foreign_key_comid_to_the_sos_table.php b/database/migrations/2018_06_06_074452_add_foreign_key_comid_to_the_sos_table.php new file mode 100644 index 0000000..7f332f9 --- /dev/null +++ b/database/migrations/2018_06_06_074452_add_foreign_key_comid_to_the_sos_table.php @@ -0,0 +1,38 @@ +unsignedInteger('com_id'); + $table->foreign('com_id') + ->references('id')->on('companies') + ->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('sos', function (Blueprint $table) { + // + }); + } +} diff --git a/database/seeds/SoSeeder.php b/database/seeds/SoSeeder.php index fafe984..ab6dbaf 100644 --- a/database/seeds/SoSeeder.php +++ b/database/seeds/SoSeeder.php @@ -16,14 +16,15 @@ class SoSeeder extends Seeder DB::table('sos')->insert([ 'id' => '9999', - 'ff_id' => '4', + 'ff_id' => '1', 'supplier_company_name' => 'SEED', 'supplier_contact_person' => 'SEED', 'supplier_contact_person_no' => '1234', - 'delivery_id' => '4', - 'warehouse_id' => '4', + 'delivery_id' => '1', + 'warehouse_id' => '1', 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), + ]); } } diff --git a/database/seeds/SoitemSeeder.php b/database/seeds/SoitemSeeder.php index 2c61db6..3515a96 100644 --- a/database/seeds/SoitemSeeder.php +++ b/database/seeds/SoitemSeeder.php @@ -32,7 +32,7 @@ class SoitemSeeder extends Seeder 'packaging_width' => '1', 'packaging_depth' => '1', 'packaging_gross' => '1', - 'packaging_nett' => '41', + 'packaging_nett' => '1', 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), @@ -53,7 +53,7 @@ class SoitemSeeder extends Seeder 'packaging_width' => '1', 'packaging_depth' => '1', 'packaging_gross' => '1', - 'packaging_nett' => '41', + 'packaging_nett' => '1', 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), ]),