From ec7964faceccb48adf24c73c93efcba365492da0 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 31 Jul 2018 16:54:03 +0800
Subject: [PATCH] fix credit setting error

---
 public/mix-manifest.json                               |  6 +++---
 .../assets/js/pages/admin/booking/supplierReport.vue   |  1 +
 .../assets/js/pages/settings/admin-credit-setting.vue  | 10 ----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 06915eec..774f9597 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
-    "/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/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/app.js": "/js/app.js",
     "/css/app.css": "/css/app.css"
 }
\ No newline at end of file
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue
index 72705c4a..ab5f6e8d 100644
--- a/resources/assets/js/pages/admin/booking/supplierReport.vue
+++ b/resources/assets/js/pages/admin/booking/supplierReport.vue
@@ -551,6 +551,7 @@
             ctx.fillText("户名 : " + binding.value.acc_name, column2X - 40, rowHeight[22] - 60);
             ctx.fillText(binding.value.acc_no, column2X - 40, rowHeight[22] - 40);
             ctx.fillText(binding.value.bank_name , column2X - 40, rowHeight[22] - 20);
+            ctx.fillText(binding.value.bank_branch , column2X - 40, rowHeight[22] - 20);
             
             ctx.font = "13px Arial";
     	}, 1000,canvasElement,binding);
diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue
index f776a0c8..d5273fd0 100644
--- a/resources/assets/js/pages/settings/admin-credit-setting.vue
+++ b/resources/assets/js/pages/settings/admin-credit-setting.vue
@@ -40,22 +40,12 @@
             this.getCreditSetting();
         },
         methods: {
-            ValidateAll : function(){
-                var working;
-                this.$validator.validateAll().then((result) => {
-                    working = result;
-                }).catch(() => {
-                    });
-            },
             getCreditSetting() {
                 axios.get('/api/setting-credit').then(response => {
                     this.credit_setting = response.data
                 })
             },
             updateCreditSetting (){
-                if(this.ValidateAll())
-                    return;
-                
                 this.loading_btn = true
 				axios.put('/api/setting-credit', this.credit_setting)
 				.then((response) => {