Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties

src/components/admin/status/agentsUserManagementPage.vue

@@ -46,6 +46,9 @@
           <input v-model="searchItem" class="form-control" placeholder="Search ..." />
         </div>
       </div>
+      <div v-if="Delete === true">
+        <alert :text="'Private User removed successfully'" :type="'SUCCESS'" />
+      </div>
       <br />
       <table class="table table-bordered">
         <thead>
@@ -105,25 +108,15 @@
             <td>
               <button
                 type="button"
-                data-toggle="modal"
-                :data-target="'#myModal' + i"
                 class="btn"
                 style="margin:2px; color: #60CBEB"
+                @click="routerGoTo('/user/updateProfileInfo')"
               >Edit</button>
-              <div :id="'myModal' + i" class="modal fade" role="dialog">
-                <div class="modal-dialog modal-lg">
-                  <div class="modal-content">
-                    <div class="modal-header">
-                      <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    </div>
-                    <Agency name="Agency" :isAddAgent="false" :item="item" />
-                  </div>
-                </div>
-              </div>
             </td>
             <td>
               <button
                 type="button"
+                @click="Delete(item.id)"
                 class="btn"
                 style="width: 85px; height:40px; color:#60CBEB"
               >Delete</button>
@@ -155,12 +148,17 @@ import _ from 'lodash';
 import ItemsPerPageList from '../../../assets/staticData/itemsPerPage';
 import BasePagination from '../../shared/basePagination.vue';
 import Agency from '../../user/registerAgencySection.vue';
+import alert from '../../shared/alert.vue';
 
 export default {
   name: 'agentManagementPage',
   components: {
     BasePagination,
     Agency,
+    alert,
+  },
+  props: {
+    delete: Boolean,
   },
   data() {
     return {
@@ -171,10 +169,11 @@ export default {
       visibleItemsPerPageCount: 0,
       currentPage: 1,
       item: {},
+      delete: false,
     };
   },
   methods: {
-    ...mapActions('register', ['getAgents']),
+    ...mapActions('register', ['getAgents', 'deleteAgent']),
     addNewAgent({ commit }) {
       axios
         .post('/api/agent')
@@ -206,6 +205,9 @@ export default {
         this.currentPage = 1;
       }
     },
+    Delete(id) {
+      this.deleteAgent(id);
+    },
   },
   mounted() {
     this.getAgents();
@@ -220,7 +222,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('register', ['agents']),
+    ...mapState('register', ['agents', 'removeAgent']),
 
     SortDirection() {
       return this.reverse ? 'desc' : 'asc';

src/components/admin/status/userManagementPage.vue

@@ -28,6 +28,9 @@
           <input v-model="searchItem" class="form-control" placeholder="Search ..." />
         </div>
       </div>
+      <div v-if="Delete === true">
+        <alert :text="'Private User removed successfully'" :type="'SUCCESS'" />
+      </div>
       <br />
       <table class="table table-bordered">
         <thead>
@@ -87,26 +90,18 @@
             <td>
               <button
                 type="button"
-                data-toggle="modal"
-                :data-target="'#myModal' + i"
                 class="btn"
                 style="margin:2px; color: #60CBEB"
+                @click="routerGoTo('/user/updateProfileInfo')"
               >Edit</button>
-              <div :id="'myModal' + i" class="modal fade" role="dialog">
-                <div class="modal-dialog modal-lg">
-                  <div class="modal-content">
-                    <div class="modal-header">
-                      <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    </div>
-                    <div padding-left="20px">
-                      <Individual name="PrivateIndividual" :isAddIndividual="false" :item="item" />
-                    </div>
-                  </div>
-                </div>
-              </div>
             </td>
             <td>
-              <button type="button" class="btn" style="margin:2px; color: #60CBEB">Delete</button>
+              <button
+                type="button"
+                @click="Delete(item.id)"
+                class="btn"
+                style="margin:2px; color: #60CBEB"
+              >Delete</button>
             </td>
           </tr>
         </tbody>
@@ -133,13 +128,13 @@ import { mapState, mapActions } from 'vuex';
 import _ from 'lodash';
 import ItemsPerPageList from '../../../assets/staticData/itemsPerPage';
 import BasePagination from '../../shared/basePagination.vue';
-import Individual from '../../user/registerPage.vue';
+import alert from '../../shared/alert.vue';
 
 export default {
   name: 'userManagementPage',
   components: {
     BasePagination,
-    Individual,
+    alert,
   },
   data() {
     return {
@@ -152,8 +147,9 @@ export default {
       item: {},
     };
   },
+  props: {},
   methods: {
-    ...mapActions('register', ['getIndividuals']),
+    ...mapActions('register', ['getIndividuals', 'deleteIndividual']),
     routerGoTo(goTo) {
       this.$router.push(goTo);
     },
@@ -179,6 +175,9 @@ export default {
         this.currentPage = 1;
       }
     },
+    Delete(id) {
+      this.deleteIndividual(id);
+    },
   },
   mounted() {
     this.getIndividuals();
@@ -193,7 +192,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('register', ['individuals']),
+    ...mapState('register', ['individuals', 'removeIndividual']),
 
     SortDirection() {
       return this.reverse ? 'desc' : 'asc';

src/components/user/updateProfileInfo.vue

@@ -27,7 +27,7 @@ import { mapState, mapActions, mapGetters } from 'vuex';
 import DetailIndividual from './timeshareIndividual.vue';
 
 export default {
-  name: 'TimeshareToSell',
+  name: 'UpdateInfo',
   data() {
     return { selectedItem: {} };
   },
@@ -36,7 +36,7 @@ export default {
     DetailIndividual,
   },
   mounted() {
-    this.selectedItem = this.indiv;
+    this.selectedItem = this.currentUser;
   },
   computed: {
     ...mapState('timeshare', [
@@ -64,7 +64,9 @@ export default {
   },
   methods: {
     ...mapActions('individual', ['getIndividual']),
-    ...mapActions('timeshare', ['initTimeshare', 'onResortChange', 'saveWeek']),
+    onSelectedItemItemChange(item) {
+      this.currentUser = item;
+    },
   },
 };
 </script>

src/store/modules/user/individual.js

@@ -18,10 +18,7 @@ export default {
   },
   getters: {},
   actions: {
-    getIndividual({
-      commit,
-      rootGetters,
-    }, userId) {
+    getIndividual({ commit, rootGetters }, userId) {
       let id = 0;
       if (!userId || userId === 0) {
         const rootItem = rootGetters['authentication/getUser'];
@@ -30,18 +27,19 @@ export default {
       axios
         .get(`/api/individual/getIndividual/${id}`)
         .then(r => commit('setItem', {
-          name: 'indiv',
-          value: r.data,
-        }))
+            name: 'indiv',
+            value: r.data,
+          }),)
         .catch(console.error);
     },
-    getAllIndividuals({
-      commit,
-    }) {
-      axios.get('/api/individual/getAllIndividuals').then(x => commit('setItem', {
-        name: 'items',
-        value: x.data,
-      })).catch(console.error);
+    getAllIndividuals({ commit }) {
+      axios
+        .get('/api/individual/getAllIndividuals')
+        .then(x => commit('setItem', {
+            name: 'items',
+            value: x.data,
+          }),)
+        .catch(console.error);
     },
   },
 };

src/store/modules/user/register.js

@@ -54,10 +54,8 @@ export default {
       state.registerIndividual.find(item => item.id === type.id).password = type.password;
     },
     updateAgency(state, type) {
-      state.registerAgency.find(item => item.id === type.id).eaabeffcNumber = type
-        .eaabeffcNumber;
-      state.registerAgency.find(item => item.id === type.id).companyRegNumber = type
-        .companyRegNumber;
+      state.registerAgency.find(item => item.id === type.id).eaabeffcNumber = type.eaabeffcNumber;
+      state.registerAgency.find(item => item.id === type.id).companyRegNumber =        type.companyRegNumber;
     },
     clearIndividual(state) {
       state.registerIndividual = {
@@ -90,20 +88,19 @@ export default {
     removeAgency(state, id) {
       state.registerAgency.pop(state.registerAgency.find(a => a.id === id));
     },
+    removeAgent(state, id) {
+      state.registerAgency.pop(state.registerAgency.find(a => a.id === id));
+    },
   },
   getters: {},
   actions: {
-    getIndividuals({
-      commit,
-    }) {
+    getIndividuals({ commit }) {
       axios
         .get('/api/individual')
         .then(result => commit('setIndividuals', result.data))
         .catch(console.error);
     },
-    getAgents({
-      commit,
-    }) {
+    getAgents({ commit }) {
       axios
         .get('/api/agent')
         .then(result => commit('setAgents', result.data))
@@ -118,25 +115,19 @@ export default {
     //     .catch(console.error);
     // },
 
-    saveIndividual({
-      commit,
-    }, item) {
+    saveIndividual({ commit }, item) {
       axios
         .post('/api/register/register', item)
         .then(result => commit('addIndividual', result.data))
         .catch(console.error);
     },
-    saveAgency({
-      commit,
-    }, item) {
+    saveAgency({ commit }, item) {
       axios
         .post('/api/register/registeragency', item)
         .then(result => commit('addAgency', result.data))
         .catch(console.error);
     },
-    saveAgent({
-      commit,
-    }, item) {
+    saveAgent({ commit }, item) {
       axios
         .post('/api/agent', item)
         .then(result => commit('addAgent', result.data))
@@ -168,14 +159,18 @@ export default {
     // }) {
     //   commit('clearAgency');
     // },
-    // deleteIndividual({
-    //   commit,
-    // }, id) {
-    //   axios
-    //     .delete(`/api/individual/${id}`)
-    //     .then(result => commit('removeIndividual', id))
-    //     .catch(console.error);
-    // },
+    deleteIndividual({ commit }, id) {
+      axios
+        .delete(`/api/individual/${id}`)
+        .then(result => commit('removeIndividual', id))
+        .catch(console.error);
+    },
+    deleteAgent({ commit }, id) {
+      axios
+        .delete(`/api/agent/${id}`)
+        .then(result => commit('removeAgent', id))
+        .catch(console.error);
+    },
     // deleteAgency({
     //   commit,
     // }, id) {