Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into refund_remark_refresh_on_pressed

Documentation.md

@@ -0,0 +1,72 @@
+# Setting up CIEF Exchange onto your local machine
+
+## Prerequisite:
+
+📌:Pre-requisites
+- **NodeJS version 14**
+- **Xampp**
+- **Laravel**
+
+## Setting up:
+
+1. Clone GitLab into Visual Studio Code
+
+2. Rename ``.env.example`` to ``.env``. If you're sentimental just make another copy and rename the copy.
+
+3. Open Terminal and run after installing Composer
+
+    ```
+    composer install --ignore-platform-reqs
+    ```
+
+4. Next is setting up your database. Naviagate to ``.env`` and name CIEF Portal Database. Example:
+
+    ```
+    DB_CONNECTION=mysql
+    DB_HOST=127.0.0.1
+    DB_PORT=3306
+    DB_DATABASE=exchange_db <------ Here
+    DB_USERNAME=root
+    DB_PASSWORD=   
+    ```
+
+5. Open Xampp, navigate to phpmyadmin then Create a new Database in phpmyadmin with the same name as the name you named it
+
+6. Migrate the database to inherit all the tables from the cloned repository by using these command in the terminal:
+
+    ```
+    php artisan migrate
+    ```
+    ```
+    php artisan migrate:fresh --seed
+    ```
+
+7. Once done you can check phpmyadmin if the database is properly migrated.
+
+8. Next is setting up the frontend. Assuming you already have nodejs ver14(Specifically) installed, run this in the terminal
+
+    ```
+    npm install
+    ```
+
+9. Next we install gulp with this command
+
+    ```
+    npm install -g gulp
+    ```
+
+10. Now we build gulp with this command
+
+    ```
+    gulp build
+    ```
+
+11. You are all set to view this project/repository locally. To run them run these command in 2 seperate terminals
+
+    ```
+    php artisan serve
+    ```
+
+    ```
+    npm run watch OR npm run dev
+    ```

resources/assets/vue/components/general/elements/RemarkComponent.vue

@@ -5,6 +5,9 @@
             <!-- <div class="row justify-content-center padding-30" v-show="!isLoading"> -->
             <div class="row justify-content-center flex-column bg-white rounded padding-30" v-show="!isLoading">
                 <h4 class="m-b-20">Remarks</h4>
+                <button class="btn btn-outline-success" @click="updateRemark()">
+                    <i class="fa fa-refresh"></i>
+                </button>
                 <div class="col">
                     <div class="row" v-for="remark in data.remarks">
                         <div class="col">
@@ -36,7 +39,7 @@
     </div>
 </template>
 <script>
-    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+import ModalFormHandler from '../../../general/mixins/modalFormHandler';
     export default {
         props: {
             module_type: {
@@ -44,6 +47,12 @@
                 required: true
             }
         },
+        methods: {
+            updateRemark() {
+                this.isLoading = true;
+                this.closeModal();
+            }
+        },
         mixins: [ModalFormHandler]
-    }
+        }
 </script>

resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue

@@ -47,7 +47,6 @@
         methods: {
             submitForm() {
                 this.submit(this.data ? this.route('api.remark.update', this.data.id) : this.route('api.remark.create', this.id), this.data ? 'put' : 'post', this.section, true, true);
-                this.$emit('submit')
             },
             successHandler() {
                 this.closeModal();