From 4d3069a886e1a2bd0c9d647827e77745092c88d0 Mon Sep 17 00:00:00 2001
From: CheeSiong <cheesiong.leong@innity.com>
Date: Thu, 22 Oct 2020 15:15:57 +0800
Subject: [PATCH] switch

---
 composer.json                                 |  1 +
 config/app.php                                |  2 +
 .../2014_10_12_000000_create_users_table.php  |  8 ++--
 ..._08_19_000000_create_failed_jobs_table.php | 35 ---------------
 ...20_08_04_043647_create_addresses_table.php | 43 -------------------
 .../2020_09_08_035941_create_jobs_table.php   | 36 ----------------
 6 files changed, 7 insertions(+), 118 deletions(-)
 delete mode 100644 database/migrations/2019_08_19_000000_create_failed_jobs_table.php
 delete mode 100644 database/migrations/2020_08_04_043647_create_addresses_table.php
 delete mode 100644 database/migrations/2020_09_08_035941_create_jobs_table.php

diff --git a/composer.json b/composer.json
index f28aa35c..3c4ee5c9 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
         "laravel/framework": "^7.0",
         "laravel/tinker": "^2.0",
         "spatie/laravel-activitylog": "^3.14",
+        "spatie/laravel-permission": "^3.17",
         "tymon/jwt-auth": "^1.0"
     },
     "require-dev": {
diff --git a/config/app.php b/config/app.php
index 8409e00e..deade8b0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -175,6 +175,8 @@ return [
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
+        // Third Parties
+        Spatie\Permission\PermissionServiceProvider::class,
     ],
 
     /*
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 167a6a78..9fda5b3e 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -18,13 +18,13 @@ class CreateUsersTable extends Migration
             $table->id();
             $table->string('name');
             $table->string('email')->unique();
-            $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
-            $table->smallInteger('role_id')->default(Roles::USER);
-            $table->boolean('active')->default(true);
+            $table->integer('type')->nullable()->default(1);
+            $table->integer('status')->nullable()->default(1);
             $table->rememberToken();
-            $table->softDeletes();
+            $table->timestamp('active_at')->nullable();
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 
diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
deleted file mode 100644
index 9bddee36..00000000
--- a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateFailedJobsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('failed_jobs', function (Blueprint $table) {
-            $table->id();
-            $table->text('connection');
-            $table->text('queue');
-            $table->longText('payload');
-            $table->longText('exception');
-            $table->timestamp('failed_at')->useCurrent();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('failed_jobs');
-    }
-}
diff --git a/database/migrations/2020_08_04_043647_create_addresses_table.php b/database/migrations/2020_08_04_043647_create_addresses_table.php
deleted file mode 100644
index 8a20495b..00000000
--- a/database/migrations/2020_08_04_043647_create_addresses_table.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-
-class CreateAddressesTable extends Migration
-{
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('addresses', function (Blueprint $table) {
-            $table->id();
-            $table->string('street_one');
-            $table->string('street_two')->nullable();
-            $table->string('city');
-            $table->string('state');
-            $table->string('post_code');
-            $table->string('country');
-            $table->integer('default');
-            $table->integer('billing');
-
-            $table->timestamps();
-            $table->softDeletes();
-
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('addresses');
-    }
-}
diff --git a/database/migrations/2020_09_08_035941_create_jobs_table.php b/database/migrations/2020_09_08_035941_create_jobs_table.php
deleted file mode 100644
index 1be9e8a8..00000000
--- a/database/migrations/2020_09_08_035941_create_jobs_table.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateJobsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('queue')->index();
-            $table->longText('payload');
-            $table->unsignedTinyInteger('attempts');
-            $table->unsignedInteger('reserved_at')->nullable();
-            $table->unsignedInteger('available_at');
-            $table->unsignedInteger('created_at');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('jobs');
-    }
-}