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

src/components/admin/status/agentsUserManagementPage.vue

@@ -153,8 +153,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions('registerIndividual', ['getAgents']),
-
+    ...mapActions('register', ['getAgents']),
     addNewAgent({ commit }) {
       axios
         .post('/api/agent')
@@ -200,7 +199,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('registerIndividual', ['agents']),
+    ...mapState('register', ['agents']),
 
     SortDirection() {
       return this.reverse ? 'desc' : 'asc';

src/components/admin/status/userManagementPage.vue

@@ -147,8 +147,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions('registerIndividual', ['getIndividuals']),
-
+    ...mapActions('register', ['getIndividuals']),
     routerGoTo(goTo) {
       this.$router.push(goTo);
     },
@@ -188,7 +187,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('registerIndividual', ['individuals']),
+    ...mapState('register', ['individuals']),
 
     SortDirection() {
       return this.reverse ? 'desc' : 'asc';

src/components/shared/alert.vue

@@ -11,7 +11,7 @@
     </div>
     <div class="alert alert-warning" v-if="type === 'WARNING'">
       <eva-icon name="alert-circle-outline"></eva-icon>
-      <strong>{{ text }}</strong>
+      <strong class="color-black">{{ text }}</strong>
     </div>
     <div class="alert alert-danger" v-if="type === 'ERROR'">
       <eva-icon name="slash-outline"></eva-icon>
@@ -41,4 +41,7 @@ export default {
 </script>
 
 <style>
+.color-black {
+  color: black;
+}
 </style>

src/components/timeshare/buy/weekListComponent.vue

@@ -47,7 +47,7 @@
             class="img-fluid"
             src="/img/kloader.gif"
             alt="UVProp logo"
-            style="width:400px;height:364px;"
+            style="width:128px;height:128px;"
           />
         </div>
         <div v-else>No Results Found</div>

src/components/timeshare/sell/sellPage.vue

@@ -16,9 +16,15 @@
             <div style="float: right;" class="btn btn-link color-b"></div>
           </div>
           <br />
-          <br />
-          <p>* You need to be logged in to submit your listing. Please register and log in if you have not done so already.</p>
+          <div v-if="!isLoggedIn">
+            <hr />
+            <Alert
+              :text="'* You need to be logged in to submit your listing. Please register and log in if you have not done so already.'"
+              :type="'WARNING'"
+            />
+          </div>
           <hr />
+          <br />
           <div class="form-group row">
             <div class="col-md-4">
               <div class="form-group">
@@ -118,7 +124,7 @@
                     >
                       <option value="Other">Other</option>
                       <option
-                        v-for="(resort, r) in resorts"
+                        v-for="(resort, r) in filteredResort"
                         :key="r"
                         :value="resort"
                       >{{resort.resortName}}</option>
@@ -507,10 +513,16 @@ import { mapState, mapActions } from 'vuex';
 import DetailIndividual from '../../user/timeshareIndividual.vue';
 import BankDetails from '../../shared/bankAccount.vue';
 import Address from '../../misc/address.vue';
+import Alert from '../../shared/alert.vue';
 
 export default {
   name: 'TimeshareToSell',
-  components: { DetailIndividual, BankDetails, Address },
+  components: {
+    DetailIndividual,
+    BankDetails,
+    Address,
+    Alert,
+  },
   created() {
     this.initTimeshare();
   },
@@ -528,9 +540,28 @@ export default {
       'agencies',
       'agents',
     ]),
+    ...mapState('authentication', ['isLoggedIn']),
     refAgent() {
       return this.sellItem && this.sellItem.referedByAgent;
     },
+    filteredResort() {
+      let list = [];
+      if (
+        this.sellItem
+        && this.sellItem.region
+        && this.sellItem.region.regionCode
+      ) {
+        const item = this.detailedRegion.find(
+          region => region.region.regionCode === this.sellItem.region.regionCode,
+        );
+        if (item) {
+          list = item.children;
+        }
+      } else {
+        list = this.resorts;
+      }
+      return _.sortBy(list, x => x.resortName);
+    },
   },
   methods: {
     submitSale() {

src/components/user/registerAgencySection.vue

@@ -237,10 +237,10 @@ export default {
     };
   },
   computed: {
-    ...mapState('registerAgency', ['registerAgency']),
+    ...mapState('register', ['registerAgency']),
   },
   methods: {
-    ...mapActions('registerAgency', [
+    ...mapActions('register', [
       'getAgency',
       'saveAgency',
       'updateAgency',

src/components/user/registerPage.vue

@@ -181,7 +181,7 @@ export default {
     };
   },
   computed: {
-    ...mapState('registerIndividual', ['registerIndividual']),
+    ...mapState('register', ['registerIndividual']),
 
     Header() {
       return this.RegisterHeader
@@ -190,7 +190,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions('registerIndividual', [
+    ...mapActions('register', [
       'getIndividual',
       'saveIndividual',
       'updateIndividual',

src/components/user/updateProfileInfo.vue

@@ -59,13 +59,13 @@ export default {
     return {};
   },
   methods: {
-    ...mapActions('registerIndividual', ['getIndividuals']),
+    ...mapActions('register', ['getIndividuals']),
   },
   mounted() {
     this.getIndividuals();
   },
   computed: {
-    ...mapState('registerIndividual', ['individuals']),
+    ...mapState('register', ['individuals']),
   },
 };
 </script>

src/store/index.js

@@ -40,8 +40,7 @@ export default new Vuex.Store({
     propertyAdmin: PropertyAdminModule,
     propertyList: PropertyList,
     propertyTypes: PropertyTypes,
-    registerIndividual: Register,
-    registerAgency: Register,
+    register: Register,
     weekList: WeekList,
     bid: Bid,
     authentication: Authentication,