Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses

# Conflicts:
#	app/Http/Controllers/CompanyController.php
#	package-lock.json
#	routes/api.php
This commit is contained in:
Jack Goh
2018-06-20 11:32:02 +08:00
16 changed files with 368 additions and 23251 deletions
@@ -15,7 +15,7 @@ class CreateContactsTable extends Migration
{
Schema::create('contacts', function (Blueprint $table) {
$table->increments('id');
$table->integer('user_id')->unsigned();
$table->integer('user_id')->unsigned();
$table->foreign('user_id')
->references('id')->on('users')