merged conflict

database/factories/UserFactory.php

@@ -15,6 +15,9 @@ use Faker\Generator as Faker;
 
 $factory->define(App\User::class, function (Faker $faker) {
     return [
+        'name' => $faker->name,
+        'email' => $faker->unique()->safeEmail,
+        'password' => bcrypt(str_random(10)), // secret
         'phone' => $faker->unique()->randomDigit,
         'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
         'remember_token' => str_random(10),

database/migrations/2018_04_25_024318_create_deliveryinfos_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateDeliveryinfosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('deliveryinfos', function (Blueprint $table) {
+           
+	        $table->increments('id'); 
+            $table->string('branch');
+            $table->string('deli_info');
+            $table->string('address'); 
+            $table->string('city'); 
+            $table->integer('postcode'); 
+            $table->string('state'); 
+            $table->string('country'); 
+            $table->string('contact_person'); 
+            $table->integer('contact_person_no'); 
+            $table->timestamps();
+            
+            
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('deliveryinfos');
+    }
+}

database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php

@@ -25,6 +25,6 @@ class ChangeEmailToMobileFromUser extends Migration
      */
     public function down()
     {
-        $table->renameColumn('phone', 'email');
+        //$table->renameColumn('phone', 'email');
     }
 }

database/migrations/2018_06_11_033330_add_column_to_table_delivery_info.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnToTableDeliveryInfo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('deliveryinfos', function (Blueprint $table) {
+            
+             $table->unsignedInteger('com_id');//FK wrn id
+             $table->foreign('com_id')
+                   ->references('id')->on('companies')
+                   ->onDelete('cascade');
+   
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('deliveryinfos', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2018_06_28_083352_rename_wi_id_to_warehouseitem_id_to_decisonitems_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameWiIdToWarehouseitemIdToDecisonitemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('decisionitems', function (Blueprint $table) {
+           
+            $table->renameColumn('wi_id', 'warehouseitem_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('decisionitems', function (Blueprint $table) {
+           
+            $table->renameColumn('warehouseitem_id', 'wi_id');
+
+        });
+    }
+}

database/seeds/CompanySeeder.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use Carbon\Carbon;
+
+class CompanySeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+       DB::table('companies')->insert([
+        
+        'id' => '999',
+        'company_name'=>'testing',
+        'registration_no'=>'testing',
+        'tax_no'=>'testing',
+        'tel_no'=>'12345',
+        'fax'=>'12345',
+        'address'=>'testing',
+        'city'=>'testing',
+        'postcode'=>'12345',
+        'state'=>'testing',
+        'country'=>'testing',
+        'contact_person'=>'testing',
+        'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'user_id' => '2'
+
+        ]);
+    }
+}

database/seeds/DatabaseSeeder.php

@@ -17,5 +17,7 @@ class DatabaseSeeder extends Seeder
         $this->call(SoitemSeeder::class);
         $this->call(WarehousearrSeeder::class);
         $this->call(WarehouseitemSeeder::class);
+        $this->call(DeliveryInfoSeeder::class);
+        $this->call(CompanySeeder::class);
     }
 }

database/seeds/DeliveryInfoSeeder.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use Carbon\Carbon;
+
+class DeliveryInfoSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('deliveryinfos')->insert([
+        
+        'id' => '999', 
+        'branch' => 'Testing', 
+        'deli_info' => 'Testing',
+        'address' => 'Testing',
+        'city' => 'Test',
+        'postcode' => '12345',
+        'state' => 'Testing',
+        'country' => 'Testing',
+        'contact_person' => 'Testing',
+        'contact_person_no' => '12345',
+        'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
+        'com_id' => '999'
+
+        ]);
+    }
+}