diff --git a/.gitignore b/.gitignore
index adb09eb6..7d2f63e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ yarn-error.log
 vendor/composer/autoload_static.php
 vendor/composer/autoload_classmap.php
 package-lock.json
-composer.lock
\ No newline at end of file
+composer.lock
+config/database.php
diff --git a/app/Http/Controllers/Invoice.php b/app/Http/Controllers/Invoice.php
new file mode 100644
index 00000000..907c39d9
--- /dev/null
+++ b/app/Http/Controllers/Invoice.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class Invoice extends Controller
+{
+    //
+}
diff --git a/composer.json b/composer.json
index 95740116..527b3ff2 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
         "zizaco/entrust": "dev-master"
     },
     "require-dev": {
+        "beyondcode/laravel-er-diagram-generator": "^1.4",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "laravel/dusk": "^3.0",
diff --git a/config/database.php b/config/database.php
index 5633d24f..8fb874a2 100644
--- a/config/database.php
+++ b/config/database.php
@@ -43,9 +43,9 @@ return [
             'driver' => 'mysql',
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
+            'database' => env('DB_DATABASE', 'exchange'),
+            'username' => env('DB_USERNAME', 'exchange'),
+            'password' => env('DB_PASSWORD', 'exchange1!Q'),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
diff --git a/graph.png b/graph.png
new file mode 100644
index 00000000..0fbfaee6
Binary files /dev/null and b/graph.png differ
diff --git a/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf
index 73bc90f4..91b74de3 100644
Binary files a/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf and b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf differ
diff --git a/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff
index 28da65d4..02b9a253 100644
Binary files a/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff and b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index b0502809..bdcea994 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
-    "/js/lang-zh-CN.c0da3973e52421a8cfe5.js": "/js/lang-zh-CN.c0da3973e52421a8cfe5.js",
-    "/js/lang-es.f4a1a5b4a30e92527b46.js": "/js/lang-es.f4a1a5b4a30e92527b46.js",
-    "/js/lang-en.0f790217417404ecc662.js": "/js/lang-en.0f790217417404ecc662.js",
+    "/js/lang-zh-CN.301fa7c2a76971d5e1ff.js": "/js/lang-zh-CN.301fa7c2a76971d5e1ff.js",
+    "/js/lang-es.672a5851ff01fcf8d1b1.js": "/js/lang-es.672a5851ff01fcf8d1b1.js",
+    "/js/lang-en.3d0dc40deef054cb1338.js": "/js/lang-en.3d0dc40deef054cb1338.js",
     "/js/app.js": "/js/app.js",
     "/css/app.css": "/css/app.css"
 }
diff --git a/routes/api.php b/routes/api.php
index a689342a..f4b2679d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -128,7 +128,16 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::patch('booking/{id}/update-china-bankslip','ChinaBankSlipController@update');
 	Route::get('booking/{id}/po', 'BookingController@showPurchaseOrder');
 	Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice');
-	Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice');	
+	Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice');
+	
+	// New routes for invoice
+	Route::get('invoice/{id}');
+	Route::post('invoice/{id}');
+	Route::put('invoice/{id}');
+	Route::patch('invoice/{id}/status');
+	Route::get('invoice/{id}/po');
+	Route::get('invoice/{id}/do');
+	Route::get('invoice/{id}/supplier');
 
 	Route::get('admin/complete-orders', 'BookingController@adminShowCompletedOrders');
 	// for both user and admin