From a18f00c29ffdeb00ebc28965bf04cfc75cfc3ad5 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 20 Jul 2018 10:26:18 +0800 Subject: [PATCH 01/20] added production env sample --- .env.prod | 80 ++++++++++++++++++++++++++++++ public/mix-manifest.json | 6 +-- resources/assets/js/pages/home.vue | 3 +- 3 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 .env.prod diff --git a/.env.prod b/.env.prod new file mode 100644 index 00000000..4b60c95c --- /dev/null +++ b/.env.prod @@ -0,0 +1,80 @@ +APP_NAME=IZYIM +APP_ENV=production +APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ= +APP_DEBUG=true +APP_URL=http://localhost + +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=mysql +DB_PORT=3306 +DB_DATABASE=default +DB_USERNAME=default +DB_PASSWORD=secret + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +SESSION_DRIVER=file +SESSION_LIFETIME=120 +QUEUE_DRIVER=sync + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" +APP_NAME=exchange +APP_ENV=local +APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ= +APP_DEBUG=true +APP_URL=http://localhost + +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=mysql +DB_PORT=3306 +DB_DATABASE=default +DB_USERNAME=default +DB_PASSWORD=secret + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +SESSION_DRIVER=file +SESSION_LIFETIME=120 +QUEUE_DRIVER=sync + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + +JWT_SECRET=FwYZ3SPFgjpEDqAwcaSIV6eEmQiMtGWt \ No newline at end of file diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 774f9597..06915eec 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.489521629fd49ac7628e.js": "/js/lang-zh-CN.489521629fd49ac7628e.js", + "/js/lang-es.459dcb868aa54d488979.js": "/js/lang-es.459dcb868aa54d488979.js", + "/js/lang-en.31386792460363b93c17.js": "/js/lang-en.31386792460363b93c17.js", "/js/app.js": "/js/app.js", "/css/app.css": "/css/app.css" } \ No newline at end of file diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index f1a88da0..092e563b 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -236,7 +236,8 @@
Refresh
- +
+
From aea6323a66880dba640680ef833697c92662fa86 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 20 Jul 2018 10:59:32 +0800 Subject: [PATCH 02/20] fix other loading button not working --- resources/assets/js/pages/home.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index ce8b285a..99e51477 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -321,6 +321,7 @@ export default { x2_cash: null, x2_cheque: null, }, + loading: false, loading_btn: false, status: '', booking: { From e2cf3fecdd0c81fbec5672e06c778bc1c02de78b Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 20 Jul 2018 11:12:20 +0800 Subject: [PATCH 03/20] fix term1 no service charge fix navbar extra --- app/Http/Controllers/BookingController.php | 6 +++--- resources/assets/js/components/Navbar.vue | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 5aae8aee..e5f350c3 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -283,7 +283,7 @@ class BookingController extends Controller } // Service charge (RMB) : if amount higher than 10,000, no service charge. if amount lower than 10,000, 20.00 service charge - if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) { + if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) { $svcharge = 0; } else { $svcharge = 20.00; @@ -583,8 +583,8 @@ class BookingController extends Controller ], 422); break; } - - if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) { + + if (($amount >= 10000) && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) { $svcharge = 0; } else { $svcharge = 20.00; diff --git a/resources/assets/js/components/Navbar.vue b/resources/assets/js/components/Navbar.vue index ccbabb91..9d8d5729 100644 --- a/resources/assets/js/components/Navbar.vue +++ b/resources/assets/js/components/Navbar.vue @@ -57,7 +57,6 @@
-