Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into addMarkingColumn

.gitignore

@@ -1,14 +1,14 @@
-/node_modules
-/public/hot
-/public/storage
-/public/js
-/public/css
-/public/mix-manifest.json
-/storage/*.key
-/vendor/**
-/.idea
-/.vscode
-/.vagrant
+node_modules
+public/hot
+public/storage
+public/js
+public/css
+public/mix-manifest.json
+storage/*.key
+vendor/**
+.idea
+.vscode
+.vagrant
 /data
 vendor/composer
 Homestead.json

public/mix-manifest.json

@@ -1,7 +0,0 @@
-{
-    "/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"
-}

resources/assets/js/pages/booking/uploadPo.vue

@@ -9,7 +9,7 @@
       <div class="col">
         <div class="card">
           <div class="card-header">Upload PO
-            <a href="/po-format.xls" target="_blank">(Download Po Format)</a>
+            <a href="/CIEF-X-Plan-PO-Format-15.0.xlsm" target="_blank">(Download Po Format)</a>
           </div>
           <!-- upload image -->
           <div class="card-body">