From cedc7dfc1beeb267af6c94d1192b78622aa05269 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 27 Jul 2018 12:25:33 +0800 Subject: [PATCH 1/7] 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 Date: Fri, 27 Jul 2018 12:27:35 +0800 Subject: [PATCH 2/7] 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 Date: Fri, 27 Jul 2018 12:34:43 +0800 Subject: [PATCH 3/7] 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 Date: Fri, 27 Jul 2018 12:37:10 +0800 Subject: [PATCH 4/7] 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 Date: Fri, 27 Jul 2018 12:39:06 +0800 Subject: [PATCH 5/7] 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 Date: Fri, 27 Jul 2018 14:10:34 +0800 Subject: [PATCH 6/7] 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 @@ Tax : - % +
(Example : 1%, input 1.01 and 0% input 1.0) Update From 3c70fc22e585c0f8b660cb3f2205e551cbc51cc3 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 27 Jul 2018 15:36:43 +0800 Subject: [PATCH 7/7] 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 @@ - + - {{ errors.first('company_name') }}
 + - + - {{ errors.first('bank_name') }}
 + - + - {{ errors.first('acc_no') }}
 + - + - {{ errors.first('bank_address') }}
 + - + - {{ errors.first('swift') }}
 + - + - {{ errors.first('cnap') }}
 + - + - {{ errors.first('bank_branch') }}
 +
Cancel - OK + OK
* Please key in the data in Chinese @@ -69,38 +69,36 @@ - - - {{ errors.first('company_name') }}
 + + - + - {{ errors.first('bank_name') }}
 - + - {{ errors.first('acc_no') }}
 + - + - {{ errors.first('bank_address') }}
 + - + - {{ errors.first('swift') }}
 + - + - {{ errors.first('cnap') }}
 + - + - {{ errors.first('bank_branch') }}
 +
Cancel - Submit + Submit
* 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 @@ - + - {{ errors.first('company_name') }}
 + - + - {{ errors.first('bank_name') }}
 + - + - {{ errors.first('acc_no') }}
 + - + - {{ errors.first('bank_address') }}
 + - + - {{ errors.first('swift') }}
 + - + - {{ errors.first('cnap') }}
 + - + - {{ errors.first('bank_branch') }}
 +
Cancel - OK + OK
* Please key in the data in Chinese @@ -69,38 +69,38 @@ - + - {{ errors.first('company_name') }}
 + - + - {{ errors.first('bank_name') }}
 + - + - {{ errors.first('acc_no') }}
 + - + - {{ errors.first('bank_address') }}
 + - + - {{ errors.first('swift') }}
 + - + - {{ errors.first('cnap') }}
 + - + - {{ errors.first('bank_branch') }}
 +
Cancel - Submit + Submit
* 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 @@ - + - {{ errors.first('company_name') }}
 + - + - {{ errors.first('supplier_reg_no') }}
 + - + - {{ errors.first('gst_no') }}
 + - + - {{ errors.first('bank_name') }}
 + - + - {{ errors.first('acc_no') }}
 +
Cancel - OK + OK
@@ -56,30 +56,30 @@ - + - {{ errors.first('company_name') }}
 + - + - {{ errors.first('supplier_reg_no') }}
 + - + - {{ errors.first('gst_no') }}
 + - + - {{ errors.first('bank_name') }}
 + - + - {{ errors.first('acc_no') }}
 +
Cancel - OK + OK