Merge branch 'zain/shipping-order' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/shippingorder-frontend

# Conflicts:
#	database/seeds/DatabaseSeeder.php
#	routes/api.php

database/migrations/2018_05_07_062017_create_sos_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        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();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('sos');
+    }
+}

database/migrations/2018_05_15_034032_create_soitems_table.php

@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSoitemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        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');
+            $table->integer('model_no');
+            $table->integer('item_code');
+            $table->string('quantity_of_item');
+            $table->string('uom');
+
+            //Packaging details
+            $table->integer('quantity_of_carton');
+            $table->string('packaging_type');
+
+            //Measurement details
+            $table->double('packaging_height');
+            $table->double('packaging_width');
+            $table->double('packaging_depth');
+
+            //Weight details
+            $table->double('packaging_gross');
+            $table->double('packaging_nett');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('soitems');
+    }
+}

database/seeds/DatabaseSeeder.php

@@ -11,7 +11,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
+<<<<<<< HEAD
         $this->call(LaratrustSeeder::class);
         $this->call(UsersTableSeeder::class);
+=======
+         //$this->call(UsersTableSeeder::class);
+         $this->call(SoSeeder::class);
+>>>>>>> 9619cab40743a5e70ea341c611c68500f2a047fe
     }
 }

database/seeds/SoSeeder.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\So;
+use Carbon\Carbon;
+
+class SoSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+         DB::table('sos')->insert([
+          
+        'id' => '9999',
+        'ff_id' => '4', 
+        'supplier_company_name' => 'SEED',
+        'supplier_contact_person' => 'SEED',
+        'supplier_contact_person_no' => '1234',
+        'delivery_id' => '4',
+        'warehouse_id' => '4',
+        'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
+       ]);
+    }
+}

database/seeds/SoitemSeeder.php

@@ -0,0 +1,63 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\Soitems;
+use Carbon\Carbon;
+
+class SoitemSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+       
+         DB::table('soitems')->insert([
+             
+        ([
+          
+        'so_id' => '9999', 
+        'status' => '0',
+        'order_id' => '1',
+        'brand_no' => '1',
+        'model_no' => '1',
+        'item_code' => '1', 
+        'quantity_of_item' => '1',
+        'uom' => 'SEED',
+        'quantity_of_carton' => '1',
+        'packaging_type' => '1',
+        'packaging_height' => '1',
+        'packaging_width' => '1',
+        'packaging_depth' => '1',
+        'packaging_gross' => '1',
+        'packaging_nett' => '41',
+        'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
+
+         ]),
+        ([
+     
+        'so_id' => '9999', 
+        'status' => '0',
+        'order_id' => '1',
+        'brand_no' => '1',
+        'model_no' => '1',
+        'item_code' => '1', 
+        'quantity_of_item' => '1',
+        'uom' => 'SEED',
+        'quantity_of_carton' => '1',
+        'packaging_type' => '1',
+        'packaging_height' => '1',
+        'packaging_width' => '1',
+        'packaging_depth' => '1',
+        'packaging_gross' => '1',
+        'packaging_nett' => '41',
+        'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        ]),
+        
+       ]);
+    }
+}