From 7e49714be67aeddada9b294a938966050813c5a1 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Wed, 25 Jul 2018 17:43:38 +0800
Subject: [PATCH 01/20] 70%done

---
 resources/assets/js/pages/settings/admin-marking-setting.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/pages/settings/admin-marking-setting.vue b/resources/assets/js/pages/settings/admin-marking-setting.vue
index 07bccc2d..491c9aa2 100644
--- a/resources/assets/js/pages/settings/admin-marking-setting.vue
+++ b/resources/assets/js/pages/settings/admin-marking-setting.vue
@@ -28,8 +28,9 @@
 			    </el-form>
 				<div align="right">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" icon="el-icon-plus" @click="CreateMarking('markingForm')">Add New Data</el-button>
+                <el-button type="primary"  :loading="loading_btn"  @click="CreateMarking('markingForm')">Add New Data</el-button>
 				</div>
+
 			</el-dialog>
 			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
 				<span>Data Added Successfully</span><br><br>
@@ -109,6 +110,7 @@
 	    },
 		methods: {
 			CreateMarking : function(formName){	
+				this.loading_btn = true
 				this.AddDatadialogVisible = false;
 				this.$refs[formName].validate((valid) => {
 					if (valid) {

From 4f3d225084a3fbf506ae92eb8760d3dd896cfbe3 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Thu, 26 Jul 2018 17:55:55 +0800
Subject: [PATCH 02/20] fix/Admin/Settings

---
 resources/assets/js/components/Navbar.vue     |  1 -
 .../js/pages/settings/admin-china-bank.vue    | 39 ++++++++++++--
 .../pages/settings/admin-credit-setting.vue   |  2 +-
 .../js/pages/settings/admin-malaysia-bank.vue | 54 ++++++++++++++++---
 4 files changed, 81 insertions(+), 15 deletions(-)

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 @@
             </div>
           </li>
           </template>
-          </li>
           <!-- Guest -->
           <template v-else>
             <li class="nav-item">
diff --git a/resources/assets/js/pages/settings/admin-china-bank.vue b/resources/assets/js/pages/settings/admin-china-bank.vue
index b743ccf9..db802df3 100644
--- a/resources/assets/js/pages/settings/admin-china-bank.vue
+++ b/resources/assets/js/pages/settings/admin-china-bank.vue
@@ -53,7 +53,7 @@
 				</el-form>
 				<div align="center">
 					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" @click="CreateBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="CreateBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">OK</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -62,7 +62,7 @@
 			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
 				<span>Data Added Successfully</span><br><br>
 				<div align="center">
-						<el-button type="primary" @click="DoneAddDatadialogVisible = false">OK</el-button>
+						<el-button type="primary" :loading="loading_btn" @click="DoneAddDatadialogVisible = false">OK</el-button>
 				</div>
 			</el-dialog>
 		<!-- popup add new data end -->
@@ -100,7 +100,7 @@
 				</el-form>
 				<div align="center">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" @click="EditBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">Submit</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="EditBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">Submit</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -109,7 +109,7 @@
 			<el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
 				<span>Data Updated Successfully</span><br><br>
 				<div align="center">
-					<el-button type="primary" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
 				</div>
 			</el-dialog>
 		<!-- popup edit data end -->
@@ -117,7 +117,7 @@
 			<el-dialog align="center" :visible.sync="DeleteAdddialogVisible" width="30%">
 				<span>Data Deleted</span><br><br>
 				<div align="center">
-					<el-button type="primary" @click="DeleteAdddialogVisible = false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="DeleteAdddialogVisible = false">OK</el-button>
 				</div>
 			</el-dialog>
 		<!-- popup delete end -->
@@ -130,6 +130,7 @@
 	export default {
 		data() {
 			return {
+				loading_btn: false,
 				tableData: [],
 				beneficiariesForm : {
 					company_name : '',
@@ -153,14 +154,17 @@
 		},
 		methods: {
 			CreateBeneficiaries : function(){
+				this.loading_btn = true
 				this.AddDatadialogVisible = false;
 				axios.post('/api/setting-beneficiary', this.beneficiariesForm)
 					.then((response) => {
+						this.loading_btn = false
 						this.DoneAddDatadialogVisible = true;
 						this.ClearBeneficiariesForm();
 						this.UpdateTableData();
 					})
 					.catch((error) => {
+						this.loading_btn = false
 						console.log(error);
 						this.$message({
 							showClose: true,
@@ -172,11 +176,17 @@
 					});
 			},
 			UpdateTableData : function(){
+				this.loading_btn = true
 				axios.get('/api/setting-beneficiary', this.beneficiariesForm)
 					.then((response) => {
+						this.loading_btn = false
 						this.tableData = response.data;
+						
 					})
+				
+				
 					.catch((error) => {
+						this.loading_btn = false
 						console.log(error);
 						this.$message({
 							showClose: true,
@@ -187,12 +197,21 @@
 					})
 			},
 			DeleteBeneficiaries : function(beneficiaries_id){
+				this.loading_btn = true
 				this.DeleteAdddialogVisible = true;
 				axios.delete('/api/setting-beneficiary/' + beneficiaries_id)
 					.then((response) => {
+						this.loading_btn = false
 						this.UpdateTableData();
+						this.$message({
+						showClose: true,
+						message: 'Data Deleted Successfully',
+						type: 'success',
+						duration: 5000
+					});
 					})
 					.catch((error) => {
+						this.loading_btn = false
 						console.log(error);
 						this.$message({
 							showClose: true,
@@ -203,14 +222,24 @@
 					});
 			},
 			EditBeneficiaries : function(){
+				this.loading_btn = true
 				this.EditDatadialogVisible = false; 
 				this.DoneUpdateDatadialogVisible = true;
 
 				axios.put('/api/setting-beneficiary/' + this.currentEdit, this.beneficiariesForm)
 					.then((response) => {
+						this.loading_btn = false
 						this.UpdateTableData();
+						this.$message({
+						showClose: true,
+						message: 'Data Updated Succesfully',
+						type: 'success',
+						duration: 5000
+					});
+				
 					})
 					.catch((error) => {
+						this.loading_btn = false
 						console.log(error);
 						this.$message({
 							showClose: true,
diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue
index 21b74e01..f776a0c8 100644
--- a/resources/assets/js/pages/settings/admin-credit-setting.vue
+++ b/resources/assets/js/pages/settings/admin-credit-setting.vue
@@ -62,7 +62,7 @@
                     this.loading_btn = false
 						this.$message({
 						showClose: true,
-						message: 'Success',
+						message: 'Time Limit and Credit Limit Updated Successfully',
 						type: 'success',
 						duration: 5000
 					});
diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
index 3f9345de..b8cffbd4 100644
--- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue
+++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
@@ -11,8 +11,8 @@
 			<el-table-column prop="bank_branch" label="Bank Branch"></el-table-column>
 			<el-table-column label="Action">
 				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="PopOutEditMalaysiaBank(scope.$index)">Edit</el-button>
-					<el-button type="text" size="small" @click="DeleteMalaysiaBank(tableData[scope.$index].id)">Delete</el-button>
+					<el-button type="text" size="small" :loading="loading_btn" @click="PopOutEditMalaysiaBank(scope.$index)">Edit</el-button>
+					<el-button type="text" size="small" :loading="loading_btn" @click="DeleteMalaysiaBank(tableData[scope.$index].id)">Delete</el-button>
 				</template>
 			</el-table-column>
 		</el-table><br>
@@ -53,7 +53,7 @@
 				</el-form>
 				<div align="center">
 					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" @click="CreateMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="CreateMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">OK</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -62,7 +62,7 @@
 			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
 				<span>Data Added Successfully</span><br><br>
 				<div align="center">
-						<el-button type="primary" @click="DoneAddDatadialogVisible = false">OK</el-button>
+						<el-button type="primary" :loading="loading_btn" @click="DoneAddDatadialogVisible = false">OK</el-button>
 				</div>
 			</el-dialog>
 		<!-- popup add new data end -->
@@ -100,7 +100,7 @@
 				</el-form>
 				<div align="center">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" @click="EditMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">Submit</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="EditMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">Submit</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -109,7 +109,7 @@
 			<el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
 				<span>Data Updated Successfully</span><br><br>
 				<div align="center">
-					<el-button type="primary" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
 				</div>
 			</el-dialog>
 		<!-- popup edit data end -->
@@ -117,7 +117,7 @@
 			<el-dialog align="center" :visible.sync="DeleteAdddialogVisible" width="30%">
 				<span>Data Deleted</span><br><br>
 				<div align="center">
-					<el-button type="primary" @click="DeleteAdddialogVisible = false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="DeleteAdddialogVisible = false">OK</el-button>
 				</div>
 			</el-dialog>
 		<!-- popup delete end -->
@@ -130,6 +130,7 @@
 	export default {
 		data() {
 			return {
+				loading_btn: false,
 				tableData: [],
 				malaysiaBankForm : {
 					company_name : '',
@@ -153,14 +154,23 @@
 	    },
 		methods: {
 			CreateMalaysiaBank : function(){
+				this.loading_btn = true
 	            this.AddDatadialogVisible = false;
 				axios.post('/api/setting-malaysia-bank', this.malaysiaBankForm)
 					.then((response) => {
+						this.loading_btn = false
 						this.DoneAddDatadialogVisible = true;
 						this.ClearMalaysiaBankForm();
 						this.UpdateTableData();
-					})
+						this.$message({
+                    showClose: true,
+                    message: 'Success',
+                    type: 'success',
+                    duration: 5000
+                });
+            })
 					.catch((error) => {
+						this.loading_btn = false
 						console.log(error);
 						this.$message({
 							showClose: true,
@@ -172,11 +182,21 @@
 					});
 			},
 			UpdateTableData : function(){
+				this.loading_btn = true
 				axios.get('/api/setting-malaysia-bank', this.malaysiaBankForm)
 					.then((response) => {
+						this.loading_btn = false;
 						this.tableData = response.data;
+						this.$message({
+                    showClose: true,
+                    message: 'Data Updated Successfully',
+                    type: 'success',
+                    duration: 5000
+                });
+            
 					})
 					.catch((error) => {
+						this.loading_btn = false
 						console.log(error);
 						this.$message({
 							showClose: true,
@@ -187,12 +207,21 @@
 					})
 			},
 			DeleteMalaysiaBank : function(malaysiaBank_id){
+				this.loading_btn = true;
 				this.DeleteAdddialogVisible = true;
 				axios.delete('/api/setting-malaysia-bank/' + malaysiaBank_id)
 					.then((response) => {
 						this.UpdateTableData();
+						this.$message({
+                    showClose: true,
+                    message: 'Data Deleted Successfully',
+                    type: 'success',
+                    duration: 5000
+                });
+            
 					})
 					.catch((error) => {
+						this.loading_btn = false;
 						console.log(error);
 						this.$message({
 							showClose: true,
@@ -203,11 +232,20 @@
 					});
 			},
 			EditMalaysiaBank : function(){
+				this.loading_btn = true;
 				this.EditDatadialogVisible = false;
 				this.DoneUpdateDatadialogVisible = true;
 				axios.put('/api/setting-malaysia-bank/' + this.currentEdit, this.malaysiaBankForm)
 					.then((response) => {
+						this.loading_btn = false;
 						this.UpdateTableData();
+						this.$message({
+                    showClose: true,
+                    message: 'Updated Successfully',
+                    type: 'success',
+                    duration: 5000
+                });
+            
 					})
 					.catch((error) => {
 						console.log(error);

From a3aee3e152729577a16fb999d44f78fbc1e29a21 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 26 Jul 2018 23:41:35 +0800
Subject: [PATCH 03/20] update for deployment to fix public storage not found

---
 Dockerfile      | 4 +++-
 caddy/Caddyfile | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index edff056f..c1fb53e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,5 +13,7 @@ RUN php artisan clear-compiled
 
 COPY wait.sh /usr/local/bin/wait.sh
 RUN chmod +x /usr/local/bin/wait.sh
-CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan storage:link && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000
+RUN php artisan storage:link
+
+CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload  && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000
 EXPOSE 8000
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 062f2168..1d6c1bcf 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,7 +1,6 @@
-# Docs: https://caddyserver.com/docs/caddyfile
 https://exchange-staging.izyim.com {
     root /var/www/public
-    fastcgi / 127.0.0.1:9000 php {
+    fastcgi / 127.0.0.1:8000 php {
         index index.php
     }
 
@@ -14,7 +13,7 @@ https://exchange-staging.izyim.com {
         to /index.php?{query}
     }
     gzip
-    browse
+    # browse
     log stdout
     errors stdout
     on startup php-fpm --nodaemonize

From b0b7b22dadb05723856cc8cc97e979bc98836b24 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 26 Jul 2018 23:57:46 +0800
Subject: [PATCH 04/20] added public folder to caddy

---
 caddy/Caddyfile  | 2 +-
 caddy/Dockerfile | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 1d6c1bcf..f518de53 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,5 +1,5 @@
 https://exchange-staging.izyim.com {
-    root /var/www/public
+    root /app/public
     fastcgi / 127.0.0.1:8000 php {
         index index.php
     }
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 675a39b5..f2c15948 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -10,8 +10,9 @@ RUN curl --silent --show-error --fail --location \
     && /usr/bin/caddy -version \
     && docker-php-ext-install mbstring pdo pdo_mysql
 
+ADD . /var/www
 COPY Caddyfile /etc/Caddyfile
 
-WORKDIR /var/www/public
+WORKDIR /var/www
 
 CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"]
\ No newline at end of file

From 6df48f6a4f3ff652925b7edee24a6bbb7636b691 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 09:46:33 +0800
Subject: [PATCH 05/20] updated payment for options in booking form

---
 resources/assets/js/pages/home.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 4ed1c829..1cfab181 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -433,6 +433,18 @@ export default {
       options3: [{
         value: 'Full Payment',
         label: 'Full Payment'
+      },
+      {
+        value: 'Deposit',
+        label: 'Deposit'
+      },
+      {
+        value: 'Balance',
+        label: 'Balance'
+      }
+      {
+        value: 'Others',
+        label: 'Others'
       }],
       value: 'RMB',
       dialogFormVisible: false,

From ebe5d06114f14f08aab05a886917d2fc0a8d96d8 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Fri, 27 Jul 2018 10:01:33 +0800
Subject: [PATCH 06/20] lingges/fix/user_refresh_rate_loading

---
 resources/assets/js/pages/home.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 98f28d41..b1f4b9a0 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -22,7 +22,7 @@
     <!-- Input-Amount-end -->
 
     <div align="right">
-    <el-button icon="el-icon-refresh" type="primary" size="mini" @click="refreshRate()">Refresh Rate</el-button></div>
+    <el-button type="primary" :loading="loading_btn" size="mini" @click="refreshRate()">Refresh Rate</el-button></div>
 
     <hr>
     <!-- Rate-Display -->
@@ -319,6 +319,7 @@ export default {
 
   data () {
     return {
+      loading_btn: false,
       confirmForm: new Form({
         term: '',
         amount: ''
@@ -423,7 +424,9 @@ export default {
     },
     refreshRate() {
       let $this = this
+      this.loading_btn = true
       axios.get('api/rate').then(response => {
+        this.loading_btn = false
         this.rate = response.data
         this.$message({
           showClose: true,

From 0aae3a8e76782ec8e6f62fee3a426959ae8fb1d3 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 10:18:59 +0800
Subject: [PATCH 07/20] fix syntax error

---
 public/mix-manifest.json           | 6 +++---
 resources/assets/js/pages/home.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 3d0e0ba9..d020c1f3 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -441,7 +441,7 @@ export default {
       {
         value: 'Balance',
         label: 'Balance'
-      }
+      },
       {
         value: 'Others',
         label: 'Others'

From f6cfd9a1885765da44e1d248b2e8450daac06a5f Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 10:41:57 +0800
Subject: [PATCH 08/20] updat the login session to be 12 hours fix status
 description not showing update user booking confirmation china beneficiary
 acc into one row

---
 app/Http/Controllers/BookingController.php |  1 +
 config/jwt.php                             |  2 +-
 resources/assets/js/pages/home.vue         | 12 +++---------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index dbfe44d2..844754e1 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -71,6 +71,7 @@ class BookingController extends Controller
                 default:
                     $status_desc = "";
             }
+            $booking->status_desc = $status_desc;
             $booking->marking = $booking->user->marking;
         }
        
diff --git a/config/jwt.php b/config/jwt.php
index c4ea92db..b9fffd28 100644
--- a/config/jwt.php
+++ b/config/jwt.php
@@ -100,7 +100,7 @@ return [
     |
     */
 
-    'ttl' => env('JWT_TTL', 60),
+    'ttl' => env('JWT_TTL', 60 * 12),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index d020c1f3..2031f0de 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -249,17 +249,11 @@
             </td>
           </tr>
           <tr>
-            <td>China Beneficiary Acc :</td>
+            <td>China Beneficiary Acc : <br>
+             Name : {{ bookingConfirmTable.acc_name }} <br>
+              Account No. : {{ bookingConfirmTable.acc_no }}</td>
             <td></td>
           </tr>
-          <tr>
-            <td>
-              Name : {{ bookingConfirmTable.acc_name }} <br>
-              Account No. : {{ bookingConfirmTable.acc_no }}
-            </td>
-            <td>
-            </td>
-          </tr>
           <tr>
             <td>Bank In Amount :</td>
             <td><b>RM {{ bookingConfirmTable.bankin_amount }}</b></td>

From 438d9fa602dd8c2c08fc5a5352f7fc136d94866d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 10:53:20 +0800
Subject: [PATCH 09/20] temporary added po format link in upload po page added
 back costing rate in supplier booking page

---
 .../Controllers/BookingSupplierController.php |   3 +-
 .../pages/admin/booking/supplierBooking.vue   |   6 +-
 .../assets/js/pages/booking/uploadPo.vue      | 328 +++++++++---------
 3 files changed, 170 insertions(+), 167 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 800f6971..3a606c98 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -103,7 +103,7 @@ class BookingSupplierController extends Controller
         //$transfer_amount = $request->input("transfer_amount");
         $supplier_id = $request->input("supplier_id");
         $booking_id = $request->input("booking_id");
-        //$rate = $request->input('rate');
+        $rate = $request->input('rate'); // costing rate 
         $rebate = $request->input('rebate');
         $supplier = SettingSupplier::find($supplier_id);
         $booking = Booking::find($booking_id);
@@ -120,7 +120,6 @@ class BookingSupplierController extends Controller
 
         // Update: changes in 1.1 according to new supplier booking report
         $transfer_amount = $booking->amount;
-        $rate = $booking->rate;
    
         $amount_in_myr = round($transfer_amount / $rate, 2);
         $amountInRMB = $transfer_amount;
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index 32042123..ad3da400 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -210,9 +210,9 @@
                   </el-select>
                 </el-form-item>
 
-                <!-- <el-form-item prop="rate">
+                <el-form-item prop="rate">
                   <el-input v-model="supplierBookingForm.rate" type="text" placeholder="Rate" style="width: 80%" />
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item prop="rebate">
                   <el-input v-model="supplierBookingForm.rebate" type="text" placeholder="Rebate" style="width: 80%" />
                 </el-form-item>
@@ -333,7 +333,7 @@
               booking_id: this.$route.params.id,
               supplier_id: this.supplierBookingForm.supplier,
               rebate: this.supplierBookingForm.rebate,
-              //rate: this.supplierBookingForm.rate,
+              rate: this.supplierBookingForm.rate,
               //transfer_amount: this.supplierBookingForm.transfer_amount,
             }
 
diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue
index 12a28cb6..ff36bce7 100644
--- a/resources/assets/js/pages/booking/uploadPo.vue
+++ b/resources/assets/js/pages/booking/uploadPo.vue
@@ -1,64 +1,56 @@
 <template>
-<el-main>
-  <progress-track v-model="status"/>
-  <h1>Transfer Completed</h1>
-  <h2> Please upload your purchase order </h2>
-  <!-- upload card -->
-  <div class="row">
-    <div class="col">
-      <div class="card">
-        <div class="card-header">Upload PO</div>
-        <!-- upload image -->
-        <div class="card-body">
-          
-          <el-upload :action="'/api/booking/' + booking_id + '/upload-po'" :on-exceed="handleExceed" :on-preview="handlePreview"
-             :on-remove="handleRemove"
-             :on-error="uploadError"
-             class="upload-demo  uploadAreaOne"
-             accept=".jpeg, .jpg, .png, .bmp, .doc, .docx, .xls, .xlsx, .pdf"
-             drag
-             multiple>
-            <i class="el-icon-upload"/>
-            <div class="el-upload__text">Drop file here or
-              <em>click to upload</em>
-            </div>
-            <div slot="tip" class="el-upload__tip">bmp/jpeg/jpg/png/pdf/xls/xlxs/doc/docx files with a size less than 3MB</div>
-          </el-upload>
-          <el-upload
-            class="upload-demo uploadAreaTwo"
-            :action="'/api/booking/' + booking_id + '/upload-po'"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            multiple
-            :file-list="fileList">
-            <el-button size="small" type="primary">Click to upload</el-button>
-            <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 500kb</div>
-          </el-upload>
-          
-          <div class="bottom clearfix" style="text-align:right;">
-            <el-button :loading="loading_btn" type="primary" @click="uploadPo">Submit</el-button>
+  <el-main>
+    <progress-track v-model="status" />
+    <h1>Transfer Completed</h1>
+    <h2> Please upload your purchase order </h2>
+    <!-- upload card -->
+    <div class="row">
+      <div class="col">
+        <div class="card">
+          <div class="card-header">Upload PO
+            <a href="/po-format.xls" target="_blank">(Download Po Format)</a>
+          </div>
+          <!-- upload image -->
+          <div class="card-body">
+
+            <el-upload :action="'/api/booking/' + booking_id + '/upload-po'" :on-exceed="handleExceed" :on-preview="handlePreview" :on-remove="handleRemove"
+              :on-error="uploadError" class="upload-demo  uploadAreaOne" accept=".jpeg, .jpg, .png, .bmp, .doc, .docx, .xls, .xlsx, .pdf"
+              drag multiple>
+              <i class="el-icon-upload" />
+              <div class="el-upload__text">Drop file here or
+                <em>click to upload</em>
+              </div>
+              <div slot="tip" class="el-upload__tip">bmp/jpeg/jpg/png/pdf/xls/xlxs/doc/docx files with a size less than 3MB</div>
+            </el-upload>
+            <el-upload class="upload-demo uploadAreaTwo" :action="'/api/booking/' + booking_id + '/upload-po'" :on-preview="handlePreview"
+              :on-remove="handleRemove" :before-remove="beforeRemove" multiple :file-list="fileList">
+              <el-button size="small" type="primary">Click to upload</el-button>
+              <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 500kb</div>
+            </el-upload>
+
+            <div class="bottom clearfix" style="text-align:right;">
+              <el-button :loading="loading_btn" type="primary" @click="uploadPo">Submit</el-button>
+            </div>
+            <!-- upload image end -->
+          </div>
+        </div>
+      </div>
+      <div class="col">
+        <div class="card">
+          <div class="card-header">China Bank Slip</div>
+          <div class="card-body">
+            <a target="_blank" :href="getURL(booking_details.china_bankslip_path)">
+              <img v-if="isImage(booking_details.china_bankslip_path)" v-bind:src="booking_details.china_bankslip_path" class="image">
+              <p v-else>Download</p>
+            </a>
           </div>
-        <!-- upload image end -->
         </div>
       </div>
     </div>
-    <div class="col">
-      <div class="card">
-        <div class="card-header">China Bank Slip</div>
-        <div class="card-body">
-           <a target="_blank" :href="getURL(booking_details.china_bankslip_path)">
-            <img v-if="isImage(booking_details.china_bankslip_path)" v-bind:src="booking_details.china_bankslip_path" class="image">
-            <p v-else>Download</p>
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!-- order details -->
-  <div class="card">
-    <div class="card-header">Order Details</div>
-    <div class="card-body">
+    <!-- order details -->
+    <div class="card">
+      <div class="card-header">Order Details</div>
+      <div class="card-body">
         <div class="row">
           <div class="col">
             <table class="table table-striped">
@@ -69,11 +61,11 @@
                 </tr>
                 <tr>
                   <td>Date :</td>
-                  <td>{{ booking_details.created_at }}</td> 
+                  <td>{{ booking_details.created_at }}</td>
                 </tr>
                 <tr>
                   <td>Customer Marking :</td>
-                  <td>{{ booking_details.marking }}</td> 
+                  <td>{{ booking_details.marking }}</td>
                 </tr>
                 <tr>
                   <td>Term: </td>
@@ -95,15 +87,17 @@
                 </tr>
                 <tr>
                   <td>+ Service Charge :</td>
-                  <td>CNY {{ booking_details.service_charge }}</td> 
+                  <td>CNY {{ booking_details.service_charge }}</td>
                 </tr>
                 <tr>
                   <td>RATE :</td>
-                  <td>{{ booking_details.rate }}</td> 
+                  <td>{{ booking_details.rate }}</td>
                 </tr>
                 <tr>
                   <td></td>
-                  <td><b>MYR {{ booking_details.bia }}</b></td>
+                  <td>
+                    <b>MYR {{ booking_details.bia }}</b>
+                  </td>
                 </tr>
                 <tr>
                   <td>Beneficiary Account Number : </td>
@@ -120,9 +114,9 @@
       <div class="row">
         <div class="card-body">
           <a target="_blank" :href="getURL(booking_details.user_bankslip_path)">
-              <img v-if="isImage(booking_details.user_bankslip_path)" v-bind:src="booking_details.user_bankslip_path" class="image">
-              <p v-else>Download</p>
-            </a>  
+            <img v-if="isImage(booking_details.user_bankslip_path)" v-bind:src="booking_details.user_bankslip_path" class="image">
+            <p v-else>Download</p>
+          </a>
         </div>
       </div>
     </div>
@@ -132,19 +126,23 @@
   * {
     box-sizing: border-box;
   }
+
   h1 {
-    margin-top:5%;
-    font-size:3vw;
-    text-align:center;
+    margin-top: 5%;
+    font-size: 3vw;
+    text-align: center;
   }
+
   h2 {
-    font-size:2vw;
-    text-align:center;
-    margin-bottom:3%;
+    font-size: 2vw;
+    text-align: center;
+    margin-bottom: 3%;
   }
+
   .booking-details {
     font-weight: bold;
   }
+
   .bankinSlipImage {
     border: 1px solid #ddd;
     border-radius: 4px;
@@ -153,26 +151,30 @@
     width: 150px;
     display: block;
   }
+
   .bankinSlipImage:hover {
     box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
   }
+
   .uploadAreaTwo {
     display: none;
   }
+
   .card {
     margin-bottom: 3%;
   }
-  @media only screen and (max-width : 767px) {
+
+  @media only screen and (max-width: 767px) {
     .uploadAreaOne {
       display: none;
     }
     .uploadAreaTwo {
       display: unset;
     }
-		.table {
-			font-size: 3.5vmin;
-		}
-		h1 {
+    .table {
+      font-size: 3.5vmin;
+    }
+    h1 {
       font-size: 1em;
     }
     h2 {
@@ -181,104 +183,106 @@
   }
 </style>
 <script>
-import VueCountdown from '@dmaksimovic/vue-countdown'
-import ProgressTrack from '~/components/ProgressTrack'
-import axios from 'axios'
+  import VueCountdown from '@dmaksimovic/vue-countdown'
+  import ProgressTrack from '~/components/ProgressTrack'
+  import axios from 'axios'
 
-export default {
-  components: {
-    'progress-track': ProgressTrack
-  },
-  data () {
-    return {
-      booking_id: this.$route.params.id,
-      status: 5,
-      loading_btn: false,
-      booking_details:{
-        id: null,
-        amount: null,
-        bia: null,
-        user_bankslip_path: null,
-        china_bankslip_path: null,
+  export default {
+    components: {
+      'progress-track': ProgressTrack
+    },
+    data() {
+      return {
+        booking_id: this.$route.params.id,
+        status: 5,
+        loading_btn: false,
+        booking_details: {
+          id: null,
+          amount: null,
+          bia: null,
+          user_bankslip_path: null,
+          china_bankslip_path: null,
+        }
       }
-    }
-  },
-  beforeCreate () {
-    const loading = this.$loading({
-      lock: true,
-      text: 'Please wait..',
-      spinner: 'el-icon-loading',
-      background: 'rgba(0, 0, 0, 0.7)'
-    })
-
-    axios
-      .get('/api/booking/' + this.$route.params.id)
-      .then((response) => {
-        this.booking_details = response.data
-        loading.close()
-
-      }).catch((error) => {
-        console.log(error)
-        loading.close()
-        this.$router.push({
-          name: 'notfound'
-        })
+    },
+    beforeCreate() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Please wait..',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
       })
-  },
-  methods: {
-    uploadPo () {
-      this.loading_btn = true
+
       axios
-        .post('/api/booking/' + this.$route.params.id + '/confirm-po')
+        .get('/api/booking/' + this.$route.params.id)
         .then((response) => {
-          this.$message({
-            showClose: true,
-            message: 'Your PO has been uploaded. We are processing the Invoice.',
-            type: 'success',
-            duration: 5000
-          })
-          this.$router.push({
-            name: 'home'
-          })
-          this.loading_btn = false
+          this.booking_details = response.data
+          loading.close()
+
         }).catch((error) => {
+          console.log(error)
+          loading.close()
+          this.$router.push({
+            name: 'notfound'
+          })
+        })
+    },
+    methods: {
+      uploadPo() {
+        this.loading_btn = true
+        axios
+          .post('/api/booking/' + this.$route.params.id + '/confirm-po')
+          .then((response) => {
+            this.$message({
+              showClose: true,
+              message: 'Your PO has been uploaded. We are processing the Invoice.',
+              type: 'success',
+              duration: 5000
+            })
+            this.$router.push({
+              name: 'home'
+            })
+            this.loading_btn = false
+          }).catch((error) => {
             this.$message({
               showClose: true,
               message: "Please upload your purchase order",
               type: 'error',
               duration: 30000
             })
-          this.loading_btn = false
-        })
-    },
-    handleRemove (file, fileList) {
-      console.log(file, fileList)
-      // Should send some reqeust to controller to delete the file
-    },
-    handlePreview (file) {
-      console.log(file)
-    },
-    handleExceed (files, fileList) {
-      this.$message.warning(`The limit is 3, you selected ${files.length} files this time, add up to ${files.length + fileList.length} totally`)
-    },
-    beforeRemove (file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`)
-    },
-    uploadError(file,fileList){
-      this.$message.warning(`Incorrect file format or file size too big.`)
-    },
-    getExtension(path){
-      return path.slice(-3);
-    },
-    isImage(path){
-      var ext = this.getExtension(path);
-      return ext === 'jpg' || ext === 'jpeg' || ext === 'bmp' || ext === 'png';
-    },
-    getURL(path){
-      var getUrl = window.location;
-      var baseUrl = getUrl.protocol + "//" + getUrl.host;
-      return baseUrl + path;
+            this.loading_btn = false
+          })
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList)
+        // Should send some reqeust to controller to delete the file
+      },
+      handlePreview(file) {
+        console.log(file)
+      },
+      handleExceed(files, fileList) {
+        this.$message.warning(
+          `The limit is 3, you selected ${files.length} files this time, add up to ${files.length + fileList.length} totally`
+        )
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${file.name}？`)
+      },
+      uploadError(file, fileList) {
+        this.$message.warning(`Incorrect file format or file size too big.`)
+      },
+      getExtension(path) {
+        return path.slice(-3);
+      },
+      isImage(path) {
+        var ext = this.getExtension(path);
+        return ext === 'jpg' || ext === 'jpeg' || ext === 'bmp' || ext === 'png';
+      },
+      getURL(path) {
+        var getUrl = window.location;
+        var baseUrl = getUrl.protocol + "//" + getUrl.host;
+        return baseUrl + path;
+      }
     }
   }
-}
-</script>
+</script>
\ No newline at end of file

From 727374abb8016431ab209fd5ccabb1048c6cae55 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 11:02:06 +0800
Subject: [PATCH 10/20] added back rate in supplierbooking changed back to 9000
 in caddy server

---
 app/Http/Controllers/BookingSupplierController.php | 2 +-
 caddy/Caddyfile                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 3a606c98..7f84c087 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -103,7 +103,7 @@ class BookingSupplierController extends Controller
         //$transfer_amount = $request->input("transfer_amount");
         $supplier_id = $request->input("supplier_id");
         $booking_id = $request->input("booking_id");
-        $rate = $request->input('rate'); // costing rate 
+        $rate = $request->input('rate'); // costing rate
         $rebate = $request->input('rebate');
         $supplier = SettingSupplier::find($supplier_id);
         $booking = Booking::find($booking_id);
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index f518de53..913d7ed6 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,6 +1,6 @@
 https://exchange-staging.izyim.com {
     root /app/public
-    fastcgi / 127.0.0.1:8000 php {
+    fastcgi / 127.0.0.1:9000 php {
         index index.php
     }
 

From ba45091cf7d8dd23876b3ecb2494feb982746796 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 11:19:10 +0800
Subject: [PATCH 11/20] removed logo in supplier report

---
 caddy/Caddyfile                               |   5 +++++
 public/banklogo.png                           | Bin 12770 -> 0 bytes
 .../js/pages/admin/booking/supplierReport.vue |  21 +++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 public/banklogo.png

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 913d7ed6..304f45c1 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -12,6 +12,11 @@ https://exchange-staging.izyim.com {
         ext /
         to /index.php?{query}
     }
+
+    header / {
+        Cache-Control no-cache
+    }
+
     gzip
     # browse
     log stdout
diff --git a/public/banklogo.png b/public/banklogo.png
deleted file mode 100644
index 90b6a8c8f5694e28012f19a91e92bab9575e9211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12770
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

diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue
index 83e17a3a..44961a51 100644
--- a/resources/assets/js/pages/admin/booking/supplierReport.vue
+++ b/resources/assets/js/pages/admin/booking/supplierReport.vue
@@ -201,7 +201,6 @@
         <el-row :gutter="12" style="text-align:center">
           <el-col :span="20" style="text-align:center">
             <canvas id="myCanvas" ref="myCanvas" v-insert-message="supplier_booking"></canvas>
-            <img id="banklogo" src="/banklogo.png" style="display: none"/>
             <br>
             <el-button @click="downloadReport()" type="text">Download Now</el-button>
           </el-col>
@@ -533,17 +532,17 @@
             //// Row 17
             //// Row 18
             //// Row 19
-            var img = new Image();
-            img.src = "/banklogo.png";
-            img.crossOrigin = "anonymous";
-            var maxwidth = 70;
-            var ratio = maxwidth / img.width;
-            var offset = ((rowHeight[22] - rowHeight[21]) / 2) - (img.height * ratio / 2);
-            var y = rowHeight[21] + offset; // to make it always center
+            // var img = new Image();
+            // img.src = "/banklogo.png";
+            // img.crossOrigin = "anonymous";
+            // var maxwidth = 70;
+            // var ratio = maxwidth / img.width;
+            // var offset = ((rowHeight[22] - rowHeight[21]) / 2) - (img.height * ratio / 2);
+            // var y = rowHeight[21] + offset; // to make it always center
 
-            img.onload=function(){
-    		      ctx.drawImage(img, 50, 530, 80, 50);
-    	      };
+            // img.onload=function(){
+    		    //   ctx.drawImage(img, 50, 530, 80, 50);
+    	      // };
 
             // text
             ctx.font = "bold 14px Arial";

From 05757911b19079b5b767626b564697298d9e645a Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Fri, 27 Jul 2018 11:30:19 +0800
Subject: [PATCH 12/20] Lingges/Fix_no_refNo

---
 resources/assets/js/pages/admin/complete-orders.vue | 2 +-
 resources/assets/js/pages/admin/home.vue            | 2 +-
 resources/assets/js/pages/home.vue                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/admin/complete-orders.vue b/resources/assets/js/pages/admin/complete-orders.vue
index bccc9a90..9ed8dac5 100644
--- a/resources/assets/js/pages/admin/complete-orders.vue
+++ b/resources/assets/js/pages/admin/complete-orders.vue
@@ -6,7 +6,7 @@
     </div>
     <h1 align="center" style="margin-bottom:50px;">Completed Orders</h1>
     <el-table :data="tableData" stripe height="500" style="width: 100%">
-        <el-table-column label="No." prop="id" sortable></el-table-column>
+        <el-table-column label="Ref No." prop="id" sortable></el-table-column>
         <el-table-column label="Order Date"  prop="created_at" width="180" sortable></el-table-column>
         <el-table-column label="Marking" width="120" prop="marking"></el-table-column>
         <el-table-column label="Rate" prop="rate" width="74"></el-table-column>
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 8c689d93..2fbabad2 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -10,7 +10,7 @@
   <el-row :gutter="20">
     <div>
       <el-table :data="bookingTable">
-        <el-table-column label="No." width="100">
+        <el-table-column label="Ref No." width="100">
           <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
           <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> {{ scope.row.id }}</el-button>
         </el-table-column>
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index b1f4b9a0..e1807e69 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -254,7 +254,7 @@
     <el-row :gutter="20">
       <div>
         <el-table :data="bookingTable">
-          <el-table-column label="No." width="100">
+          <el-table-column label="Ref No." width="100">
             <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id) }"> {{ scope.row.id }}</el-button>
           </el-table-column>

From cedc7dfc1beeb267af6c94d1192b78622aa05269 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 12:25:33 +0800
Subject: [PATCH 13/20] removed cache controll in caddy

---
 caddy/Caddyfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 304f45c1..6c1618bd 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -13,10 +13,6 @@ https://exchange-staging.izyim.com {
         to /index.php?{query}
     }
 
-    header / {
-        Cache-Control no-cache
-    }
-
     gzip
     # browse
     log stdout

From 69f6598c8944c206eb41d54abeefaba327e0e326 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 12:27:35 +0800
Subject: [PATCH 14/20] update root folder for caddy

---
 caddy/Caddyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 6c1618bd..9a3865d8 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,5 +1,5 @@
 https://exchange-staging.izyim.com {
-    root /app/public
+    root /var/www/public
     fastcgi / 127.0.0.1:9000 php {
         index index.php
     }

From 5bb7a2d652fba9ef1ed7f62ac9a37f9dda071d98 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 12:34:43 +0800
Subject: [PATCH 15/20] fix 404 for storage folder in staging site

---
 caddy/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index f2c15948..d40e8acc 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -11,6 +11,7 @@ RUN curl --silent --show-error --fail --location \
     && docker-php-ext-install mbstring pdo pdo_mysql
 
 ADD . /var/www
+RUN rm -rf /var/www/public/storage && php artisan storage:link
 COPY Caddyfile /etc/Caddyfile
 
 WORKDIR /var/www

From 3afa7bd539e037ba8b5f0dc5b95ec9a5c0235901 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 12:37:10 +0800
Subject: [PATCH 16/20] fix 404 error for storage

---
 caddy/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index d40e8acc..8fe448cd 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -10,10 +10,9 @@ RUN curl --silent --show-error --fail --location \
     && /usr/bin/caddy -version \
     && docker-php-ext-install mbstring pdo pdo_mysql
 
-ADD . /var/www
-RUN rm -rf /var/www/public/storage && php artisan storage:link
 COPY Caddyfile /etc/Caddyfile
 
 WORKDIR /var/www
+RUN php artisan storage:link
 
 CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"]
\ No newline at end of file

From e0a3969d3ec46b092b62f1e67adfa84756e6cb23 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 12:39:06 +0800
Subject: [PATCH 17/20] fix caddy build error

---
 caddy/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 8fe448cd..bff61e5d 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -13,6 +13,6 @@ RUN curl --silent --show-error --fail --location \
 COPY Caddyfile /etc/Caddyfile
 
 WORKDIR /var/www
-RUN php artisan storage:link
+RUN ln -sf /var/www/storage/app/public /var/www/public
 
 CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"]
\ No newline at end of file

From 68add5f1a23d66fe5f587c272f878c0c28e0f50d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 14:10:34 +0800
Subject: [PATCH 18/20] disable cache in caddy

---
 caddy/Caddyfile                                          | 5 +++++
 resources/assets/js/pages/settings/admin-tax-setting.vue | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 9a3865d8..e4f1b0d1 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,9 +1,14 @@
 https://exchange-staging.izyim.com {
     root /var/www/public
+    
     fastcgi / 127.0.0.1:9000 php {
         index index.php
     }
 
+    header / {
+        Cache-Control no-cache
+    }
+
     # To handle .html extensions with laravel change ext to
     # ext / .html
 
diff --git a/resources/assets/js/pages/settings/admin-tax-setting.vue b/resources/assets/js/pages/settings/admin-tax-setting.vue
index b26c8636..4809493f 100644
--- a/resources/assets/js/pages/settings/admin-tax-setting.vue
+++ b/resources/assets/js/pages/settings/admin-tax-setting.vue
@@ -7,7 +7,7 @@
         <el-form>
             <el-form-item align="center">
                 Tax : 
-                <el-input size="mini" v-model="tax_setting.tax_rate" style=width:20%></el-input> %
+                <el-input size="mini" v-model="tax_setting.tax_rate" style=width:20%></el-input> <br>(Example : 1%, input 1.01 and 0% input 1.0)
             </el-form-item>
             <el-form-item align="center">
                 <el-button type="primary" align="center" :loading="loading_btn" size="primary" @click="updateTaxSetting">Update</el-button>

From 3c70fc22e585c0f8b660cb3f2205e551cbc51cc3 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Fri, 27 Jul 2018 15:36:43 +0800
Subject: [PATCH 19/20] fix empty supplier, china, malaysia bank setting page
 due to vee-validate

---
 .../js/pages/settings/admin-china-bank.vue    | 60 +++++++++---------
 .../js/pages/settings/admin-malaysia-bank.vue | 62 +++++++++----------
 .../js/pages/settings/admin-supplier.vue      | 44 ++++++-------
 3 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/resources/assets/js/pages/settings/admin-china-bank.vue b/resources/assets/js/pages/settings/admin-china-bank.vue
index db802df3..9509fff1 100644
--- a/resources/assets/js/pages/settings/admin-china-bank.vue
+++ b/resources/assets/js/pages/settings/admin-china-bank.vue
@@ -22,38 +22,38 @@
 		<!-- popup add new data -->
 			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
 				<el-form label-width="150px">
-					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+					<el-form-item label="Company Name">
 						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+					<el-form-item label="Bank Name">
 						<el-input v-model="beneficiariesForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+					<el-form-item label="Bank Account No">
 						<el-input v-model="beneficiariesForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					
 					</el-form-item>
-					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+					<el-form-item label="Bank Address">
 						<el-input v-model="beneficiariesForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					
 					</el-form-item>
-					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+					<el-form-item label="SWIFT Code">
 						<el-input v-model="beneficiariesForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					
 					</el-form-item>
-					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+					<el-form-item label="CNAP">
 						<el-input v-model="beneficiariesForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
-						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+					<el-form-item label="Bank Branch">
 						<el-input v-model="beneficiariesForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="CreateBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="CreateBeneficiaries" :disabled="beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">OK</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -69,38 +69,36 @@
 		<!-- popup edit data -->
 			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
 				<el-form label-width="150px">
-					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
-						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					<el-form-item label="Company Name">
+						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>	
 					</el-form-item>
-					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+					<el-form-item label="Bank Name">
 						<el-input v-model="beneficiariesForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
 					</el-form-item>
-					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+					<el-form-item label="Bank Account No">
 						<el-input v-model="beneficiariesForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+					<el-form-item label="Bank Address">
 						<el-input v-model="beneficiariesForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+					<el-form-item label="SWIFT Code">
 						<el-input v-model="beneficiariesForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+					<el-form-item label="CNAP">
 						<el-input v-model="beneficiariesForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
-						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+					<el-form-item label="Bank Branch">
 						<el-input v-model="beneficiariesForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="EditBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">Submit</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="EditBeneficiaries" :disabled="beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">Submit</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
index b8cffbd4..7cd0186f 100644
--- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue
+++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
@@ -22,38 +22,38 @@
 		<!-- popup add new data -->
 			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
 				<el-form label-width="150px">
-					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+					<el-form-item label="Company Name">
 						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+					<el-form-item label="Bank Name">
 						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+					<el-form-item label="Bank Account No">
 						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+					<el-form-item label="Bank Address">
 						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+					<el-form-item label="SWIFT Code">
 						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+					<el-form-item label="CNAP">
 						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
-						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+					<el-form-item label="Bank Branch">
 						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="CreateMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">OK</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="CreateMalaysiaBank" :disabled="malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">OK</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -69,38 +69,38 @@
 		<!-- popup edit data -->
 			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
 				<el-form label-width="150px">
-					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+					<el-form-item label="Company Name">
 						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+					<el-form-item label="Bank Name">
 						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+					<el-form-item label="Bank Account No">
 						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+					<el-form-item label="Bank Address">
 						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+					<el-form-item label="SWIFT Code">
 						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+					<el-form-item label="CNAP">
 						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
-						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					
 					</el-form-item>
-					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+					<el-form-item label="Bank Branch">
 						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-					<el-button type="primary" :loading="loading_btn" @click="EditMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">Submit</el-button>
+					<el-button type="primary" :loading="loading_btn" @click="EditMalaysiaBank" :disabled="malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">Submit</el-button>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					* Please key in the data in Chinese
@@ -260,8 +260,6 @@
 			PopOutAddMalaysiaBank : function(){
 				this.AddDatadialogVisible = true;
 				this.ClearMalaysiaBankForm();
-				this.$validator.validateAll();
-				console.log(this.errors.count());
 			},
 			PopOutEditMalaysiaBank : function(tableDataRow){
 				this.EditDatadialogVisible = true;
diff --git a/resources/assets/js/pages/settings/admin-supplier.vue b/resources/assets/js/pages/settings/admin-supplier.vue
index 00ce985a..eb151563 100644
--- a/resources/assets/js/pages/settings/admin-supplier.vue
+++ b/resources/assets/js/pages/settings/admin-supplier.vue
@@ -20,30 +20,30 @@
 		<!-- popup add new supplier -->
 			<el-dialog title="Add New Supplier" align="center" :visible.sync="AddNewSupplierdialogVisible" width="40%">
 				<el-form  label-width="150px" >
-					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+					<el-form-item label="Company Name">
 						<el-input v-model="supplierForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Registration No" :class="{'has-error': errors.has('supplier_reg_no') }">
+					<el-form-item label="Registration No">
 						<el-input v-model="supplierForm.supplier_reg_no" v-validate="'required|max:191'" name="supplier_reg_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('supplier_reg_no')">{{ errors.first('supplier_reg_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="GST No" :class="{'has-error': errors.has('gst_no') }">
+					<el-form-item label="GST No">
 						<el-input v-model="supplierForm.gst_no" v-validate="'required|max:191'" name="gst_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('gst_no')">{{ errors.first('gst_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+					<el-form-item label="Bank Name">
 						<el-input v-model="supplierForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Account No" :class="{'has-error': errors.has('acc_no') }">
+					<el-form-item label="Account No">
 						<el-input v-model="supplierForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 						<el-button @click="AddNewSupplierdialogVisible = false">Cancel</el-button>
-						<el-button type="primary" @click="CreateSupplier" :disabled="errors.any() || supplierForm.company_name=='' || supplierForm.supplier_reg_no=='' || supplierForm.gst_no=='' || supplierForm.bank_name=='' || supplierForm.acc_no =='' ? true : false">OK</el-button>
+						<el-button type="primary" @click="CreateSupplier" :disabled="supplierForm.company_name=='' || supplierForm.supplier_reg_no=='' || supplierForm.gst_no=='' || supplierForm.bank_name=='' || supplierForm.acc_no =='' ? true : false">OK</el-button>
 				</div>
 			</el-dialog>
 			<el-dialog align="center" :visible.sync="DoneAddSupplierdialogVisible" width="30%">
@@ -56,30 +56,30 @@
 		<!-- popup edit supplier -->
 			<el-dialog title="Edit Supplier" align="center" :visible.sync="EditSupplierdialogVisible" width="40%">
 					<el-form  label-width="150px" >
-					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+					<el-form-item label="Company Name">
 						<el-input v-model="supplierForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Registration No" :class="{'has-error': errors.has('supplier_reg_no') }">
+					<el-form-item label="Registration No">
 						<el-input v-model="supplierForm.supplier_reg_no" v-validate="'required|max:191'" name="supplier_reg_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('supplier_reg_no')">{{ errors.first('supplier_reg_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="GST No" :class="{'has-error': errors.has('gst_no') }">
+					<el-form-item label="GST No">
 						<el-input v-model="supplierForm.gst_no" v-validate="'required|max:191'" name="gst_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('gst_no')">{{ errors.first('gst_no') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+					<el-form-item label="Bank Name">
 						<el-input v-model="supplierForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+						
 					</el-form-item>
-					<el-form-item label="Account No" :class="{'has-error': errors.has('acc_no') }">
+					<el-form-item label="Account No">
 						<el-input v-model="supplierForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
-						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+						
 					</el-form-item>
 				</el-form>
 				<div align="center">
 						<el-button @click="EditSupplierdialogVisible = false">Cancel</el-button>
-						<el-button type="primary" @click="EditSupplier" :disabled="errors.any() || supplierForm.company_name=='' || supplierForm.supplier_reg_no=='' || supplierForm.gst_no=='' || supplierForm.bank_name=='' || supplierForm.acc_no =='' ? true : false">OK</el-button>
+						<el-button type="primary" @click="EditSupplier" :disabled="supplierForm.company_name=='' || supplierForm.supplier_reg_no=='' || supplierForm.gst_no=='' || supplierForm.bank_name=='' || supplierForm.acc_no =='' ? true : false">OK</el-button>
 				</div>
 			</el-dialog>
 			<el-dialog align="center" :visible.sync="DoneUpdateSupplierdialogVisible" width="30%">

From f1d49ef82c57ce81a7288e14352894e6afd9f05e Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Fri, 27 Jul 2018 17:24:37 +0800
Subject: [PATCH 20/20] Fix-OrderNo/RefNo

---
 resources/assets/js/pages/admin/booking/bookingDetail.vue  | 2 +-
 resources/assets/js/pages/admin/booking/completed.vue      | 4 ++--
 .../assets/js/pages/admin/booking/supplierBooking.vue      | 2 +-
 resources/assets/js/pages/admin/booking/supplierReport.vue | 4 ++--
 .../assets/js/pages/admin/booking/uploadChinaBankslip.vue  | 2 +-
 resources/assets/js/pages/admin/booking/uploadInvoice.vue  | 2 +-
 resources/assets/js/pages/admin/booking/verification.vue   | 2 +-
 .../assets/js/pages/admin/upload-supplier-bank-slip.vue    | 2 +-
 resources/assets/js/pages/booking/completed.vue            | 4 ++--
 resources/assets/js/pages/booking/confirmation.vue         | 2 +-
 resources/assets/js/pages/booking/po.vue                   | 2 +-
 resources/assets/js/pages/booking/poComplete.vue           | 2 +-
 resources/assets/js/pages/booking/transfer.vue             | 2 +-
 resources/assets/js/pages/booking/uploadPo.vue             | 2 +-
 resources/assets/js/pages/home.vue                         | 2 +-
 resources/assets/js/pages/settings/admin-malaysia-bank.vue | 7 +------
 16 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/bookingDetail.vue b/resources/assets/js/pages/admin/booking/bookingDetail.vue
index 002b219e..197f77c9 100644
--- a/resources/assets/js/pages/admin/booking/bookingDetail.vue
+++ b/resources/assets/js/pages/admin/booking/bookingDetail.vue
@@ -28,7 +28,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
index eee2c21b..e3f14b71 100644
--- a/resources/assets/js/pages/admin/booking/completed.vue
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -37,7 +37,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12" align="center">
-              <div v-for="cn_bankslip in booking_details.china_bankslip_path">
+              <div v-for="cn_bankslip in booking_details.china_bankslip_path" :key='cn_bankslip'>
                 <a target="_blank" :href="getURL(cn_bankslip)">
                   <img v-if="isImage(cn_bankslip)" v-bind:src="cn_bankslip" class="image">
                   <p v-else>Download</p>
@@ -101,7 +101,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index dc4910c0..56c2e9fc 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -29,7 +29,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue
index b5e6e75d..0656fb9e 100644
--- a/resources/assets/js/pages/admin/booking/supplierReport.vue
+++ b/resources/assets/js/pages/admin/booking/supplierReport.vue
@@ -29,7 +29,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
@@ -464,7 +464,7 @@
             ctx.fillStyle = "#000000";
             ctx.font = "13px Arial";
             //// Row 4
-            ctx.fillText("Payment For(Order No.) :", column1X, rowHeight[4] - 5);
+            ctx.fillText("Payment For(Ref No) :", column1X, rowHeight[4] - 5);
             ctx.fillText(binding.value.id, column3X, rowHeight[4] - 5);
             //// Row 4
             ctx.fillText("Payment For :", column1X, rowHeight[5] - 5);
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 5ac9ede6..fa8be99f 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -29,7 +29,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
index fa8adcd4..13c9016d 100644
--- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue
+++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
@@ -36,7 +36,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue
index 65b13a07..39b2f2b3 100644
--- a/resources/assets/js/pages/admin/booking/verification.vue
+++ b/resources/assets/js/pages/admin/booking/verification.vue
@@ -31,7 +31,7 @@
                   <tbody>
                     <tr class="el-table__row">
                       <td class="el-table_2_column_9 is-right ">
-                        <div class="cell">Order Number :</div>
+                        <div class="cell">Ref No :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
                         <div class="cell">{{ booking_details.id }}</div>
diff --git a/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
index 7f853d77..7dcbc597 100644
--- a/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
+++ b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
@@ -5,7 +5,7 @@
             <el-button type="primary" icon="el-icon-plus" @click="AddNewDialogVisible = true">Add New</el-button>
         </div><br>
             <el-table :data="tableData" stripe style="width: 100%">
-            <el-table-column label="Order No" sortable></el-table-column>
+            <el-table-column label="Ref No" sortable></el-table-column>
             <el-table-column label="Amount (RMB)" sortable></el-table-column>
             <el-table-column label="Date" sortable></el-table-column>
             <el-table-column label="Bank Slip File"></el-table-column>
diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue
index e3446bfe..19c6c4e8 100644
--- a/resources/assets/js/pages/booking/completed.vue
+++ b/resources/assets/js/pages/booking/completed.vue
@@ -24,7 +24,7 @@
         <div class="card">
           <div class="card-header">China Bank Slip</div>
           <div class="row">
-            <div v-for="cn_bankslip in booking_details.china_bankslip_path">
+            <div  v-for="cn_bankslip in booking_details.china_bankslip_path" :key='cn_bankslip'> 
               <a target="_blank" :href="getURL(cn_bankslip)">
                 <img v-if="isImage(cn_bankslip)" v-bind:src="cn_bankslip" class="image">
                 <p v-else>Download</p>
@@ -57,7 +57,7 @@
             <table class="table table-striped">
               <tbody>
                 <tr>
-                  <td>Order Number :</td>
+                  <td>Ref No :</td>
                   <td>{{ booking_details.id }}</td>
                 </tr>
                 <tr>
diff --git a/resources/assets/js/pages/booking/confirmation.vue b/resources/assets/js/pages/booking/confirmation.vue
index 18b06a6f..24dc64a5 100644
--- a/resources/assets/js/pages/booking/confirmation.vue
+++ b/resources/assets/js/pages/booking/confirmation.vue
@@ -13,7 +13,7 @@
             <table class="table table-striped">
               <tbody>
                 <tr>
-                  <td>Order Number :</td>
+                  <td>Ref No :</td>
                   <td>{{ booking_details.id }}</td>
                 </tr>
                 <tr>
diff --git a/resources/assets/js/pages/booking/po.vue b/resources/assets/js/pages/booking/po.vue
index ab8d5d5f..8f248d6b 100644
--- a/resources/assets/js/pages/booking/po.vue
+++ b/resources/assets/js/pages/booking/po.vue
@@ -53,7 +53,7 @@
             <table class="table table-striped">
               <tbody>
                 <tr>
-                  <td>Order Number :</td>
+                  <td>Ref No :</td>
                   <td>{{ booking_details.id }}</td>
                 </tr>
                 <tr>
diff --git a/resources/assets/js/pages/booking/poComplete.vue b/resources/assets/js/pages/booking/poComplete.vue
index 2bcec40f..78a53e43 100644
--- a/resources/assets/js/pages/booking/poComplete.vue
+++ b/resources/assets/js/pages/booking/poComplete.vue
@@ -69,7 +69,7 @@
             <table class="table table-striped">
               <tbody>
                 <tr>
-                  <td>Order Number :</td>
+                  <td>Ref No :</td>
                   <td>{{ booking_details.id }}</td>
                 </tr>
                 <tr>
diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue
index 1346fc78..877f757b 100644
--- a/resources/assets/js/pages/booking/transfer.vue
+++ b/resources/assets/js/pages/booking/transfer.vue
@@ -15,7 +15,7 @@
             <table class="table table-striped">
               <tbody>
                 <tr>
-                  <td>Order Number :</td>
+                  <td>Ref No:</td>
                   <td>{{ booking_details.id }}</td>
                 </tr>
                 <tr>
diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue
index 12a28cb6..b6de792a 100644
--- a/resources/assets/js/pages/booking/uploadPo.vue
+++ b/resources/assets/js/pages/booking/uploadPo.vue
@@ -64,7 +64,7 @@
             <table class="table table-striped">
               <tbody>
                 <tr>
-                  <td>Order Number :</td>
+                  <td>Ref No :</td>
                   <td>{{ booking_details.id }}</td>
                 </tr>
                 <tr>
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index e1807e69..d768b0d7 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -179,7 +179,7 @@
             <td> {{ bookingConfirmTable.marking }}</td>
           </tr>
           <tr>
-            <td>Payment for (Order No.) : </td>
+            <td>Payment for (Ref No.) : </td>
             <td> {{ bookingConfirmTable.payment_order }}</td>
           </tr>
           <tr>
diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
index b8cffbd4..74e28fca 100644
--- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue
+++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue
@@ -187,12 +187,7 @@
 					.then((response) => {
 						this.loading_btn = false;
 						this.tableData = response.data;
-						this.$message({
-                    showClose: true,
-                    message: 'Data Updated Successfully',
-                    type: 'success',
-                    duration: 5000
-                });
+						
             
 					})
 					.catch((error) => {