Timeshare sell edit & error fix

src/components/admin/property/propertyList.vue

@@ -18,8 +18,12 @@
       <div class="row">
         <br />
       </div>
-      <div class="row">
-        <div class="col-lg-12">
+
+      <div v-if="wait" id="preloader"></div>
+    </div>
+    <div class="container-fluid">
+      <div class="row justify-content-center">
+        <div class="col-auto">
           <table class="table table-striped table-responsive">
             <thead>
               <tr>
@@ -136,7 +140,6 @@
           </div>
         </div>
       </div>
-      <div v-if="wait" id="preloader"></div>
     </div>
   </section>
 </template>

src/components/admin/status/editTimeShareAdminPage.vue

@@ -235,7 +235,6 @@
                       v-model="depDateParam"
                     />
                   </float-label>
-
                   <div class="validation"></div>
                 </div>
                 <div class="form-group col-md-6 mt-2">

src/components/admin/status/timeshareAdminList.vue

@@ -203,12 +203,12 @@ export default {
       "deleteListing"
     ]),
     Publish(item) {
-      // var today = new Date();
-      // var dd = String(today.getDate()).padStart(2, "0");
-      // var mm = String(today.getMonth() + 1).padStart(2, "0"); //January is 0!
-      // var yyyy = today.getFullYear();
-      // item.pulbishedDate = today.toISOString().substring(0, 19);
-      // item.publish = true;
+      var today = new Date();
+      var dd = String(today.getDate()).padStart(2, "0");
+      var mm = String(today.getMonth() + 1).padStart(2, "0"); //January is 0!
+      var yyyy = today.getFullYear();
+      item.pulbishedDate = today.toISOString().substring(0, 19);
+      item.publish = true;
       // item.status.id = 26;
       // item.status.code = "FS";
       // item.status.description = "For Sale";

src/components/shared/navBar.vue

@@ -6,7 +6,7 @@
     <div>
       <header id="header" style="width: 100%; position: fixed; top:0px; z-index: 50;">
         <div class="container">
-          <div class="row">
+          <div class="row justify-content-center">
             <div id="logo" class="col-md-3 col-xs-4 pull-left">
               <a href="/">
                 <img
@@ -111,7 +111,7 @@
                       <li>
                         <router-link to="/timeshare/faq">FAQ</router-link>
                       </li>
-                      <li v-if="weekCount > 0">
+                      <li>
                         <hr />
                         <router-link to="/timeshare/myWeeks">My Timeshare Weeks</router-link>
                       </li>

src/components/timeshare/myWeeksPage.vue

@@ -160,7 +160,7 @@
 </template>
 <script>
 /* eslint-disable */
-import { mapState, mapActions } from "vuex";
+import { mapState, mapActions, mapGetters } from "vuex";
 import Log from "../../assets/Log";
 import ListView from "../shared/listView.vue";
 import BasePagination from "../shared/basePagination";
@@ -211,14 +211,18 @@ export default {
       ]
     };
   },
-  mounted() {
-    this.getItems(Log.getUser().id);
+  created() {
+    this.getItems(Log.getUser().id).then(() => {
+      this.wait = false;
+    });
   },
+  mounted() {},
   computed: {
+    ...mapGetters({ getNeedsVerify: "myWeeks/getNeedsVerify" }),
     ...mapState("myWeeks", ["items"]),
     FilteredListings() {
       if (this.filter) {
-        const list = _.filter(this.items, item =>
+        const list = _.filter(this.getNeedsVerify, item =>
           Object.values(item).some(
             i =>
               JSON.stringify(i)
@@ -228,7 +232,7 @@ export default {
         );
         return _.orderBy(list, this.sortKey, this.SortDirection);
       } else {
-        return _.orderBy(this.items, this.sortKey, this.SortDirection);
+        return _.orderBy(this.getNeedsVerify, this.sortKey, this.SortDirection);
       }
     },
     PageCount() {

src/components/timeshare/sell/contentSection.vue

@@ -809,7 +809,7 @@
                   type="number"
                   step="any"
                   name="commission"
-                  v-model="sellItem.agentCommission"
+                  v-model="sellItem.agentCommision"
                   placeholder="R"
                 />
                 <div class="validation"></div>
@@ -1050,7 +1050,8 @@ export default {
         this.sellItem.ownerObject = this.indiv;
         //console.log(this.sellItem.ownerObject);
         console.log(this.sellItem);
-        if (!this.boolError)
+        console.log(JSON.stringify(this.sellItem));
+        if (!this.boolError) {
           this.saveWeek(this.sellItem)
             .then(fulfilled => {
               // this.$router.push({ name: "PaymentOption", params: { week: fulfilled } });
@@ -1061,6 +1062,7 @@ export default {
               this.errorOccurred = "ERRORHTML";
               this.errorMessage = ex;
             });
+        }
       } else {
         this.$router.push("/user/login");
       }

src/components/timeshare/sell/contentSectionPF.vue

@@ -29,6 +29,7 @@
                       name="agency"
                       v-model="sellItem.agencyId"
                     >
+                      <option value=""></option>
                       <option v-for="(item, i) in agencies" :key="i" :value="item.id">
                         {{ item.agencyName }}
                       </option>
@@ -43,6 +44,7 @@
                       v-model="sellItem.agentId"
                       :disabled="!sellItem.agencyId"
                     >
+                      <option value=""></option>
                       <option
                         v-for="(item, i) in displayNotDeletedAgents"
                         :key="i"
@@ -313,6 +315,16 @@
             <h2>Detailed Individual Information</h2>
           </div>
           <div class="form">
+            <div class="row mb-4">
+              <div class="col-md-12">
+                <float-label label="OWNER TYPE" fixed>
+                  <select class="form-control uniSelect" name="" id="" v-model="selectedUserType">
+                    <option value="myself">MYSELF</option>
+                    <option value="custom">CUSTOM USER</option>
+                  </select>
+                </float-label>
+              </div>
+            </div>
             <div class="row mb-2">
               <div class="form-group col-md-6">
                 <float-label>
@@ -389,30 +401,22 @@
                     >
                   </span>
 
-                  <float-label label="Marital Status" style="width: 100%">
+                  <float-label fixed label="Marital Status" style="width: 100%">
                     <select
                       class="form-control uniSelect"
                       id="howMarried"
                       v-model="indiv.howMarried"
                     >
-                      <option value="N/A">N/A</option>
-                      <option value="In Community Of Property">
-                        In Community Of Property
-                      </option>
-                      <option value="Out of Community Of Property">
-                        Out of Community Of Property
-                      </option>
-                      <option value="Other">Other</option>
-                      <option value="Traditional Wedding">
-                        Traditional Wedding
-                      </option>
-                      <option value="Single">Single</option>
-                      <option value="Divorced">Divorced</option>
-                      <option value="Widow">Widow</option>
-                      <option value="Committed Relationship">
-                        Committed Relationship
-                      </option>
-                      <option value="Partner">Partner</option>
+                      <option v-bind:value="0">N/A</option>
+                      <option v-bind:value="1">In Community Of Property</option>
+                      <option v-bind:value="2">Out of Community Of Property</option>
+                      <option v-bind:value="3">Other</option>
+                      <option v-bind:value="4">Traditional Wedding</option>
+                      <option v-bind:value="5">Single</option>
+                      <option v-bind:value="6">Divorced</option>
+                      <option v-bind:value="7">Widow</option>
+                      <option v-bind:value="8">Committed Relationship</option>
+                      <option v-bind:value="9">Partner</option>
                     </select>
                   </float-label>
                 </div>
@@ -445,7 +449,7 @@
                     placeholder="Cell Number"
                     data-rule="minlen:4"
                     data-msg="Please enter your cell number"
-                    v-model="indiv.cellNumner"
+                    v-model="indiv.cellNumber"
                   />
                 </float-label>
 
@@ -468,10 +472,10 @@
               </div>
             </div>
           </div>
-          <div v-if="indiv.howMarried === 'In Community Of Property'" class="section-header">
+          <div v-if="indiv.howMarried === 1" class="section-header">
             <h2>Spouse Details</h2>
           </div>
-          <div v-if="indiv.howMarried === 'In Community Of Property'" class="form">
+          <div v-if="indiv.howMarried === 1" class="form">
             <div class="form-row mb-2">
               <div class="form-group col-md-6 mt-2">
                 <float-label>
@@ -805,7 +809,7 @@
                   type="number"
                   step="any"
                   name="commission"
-                  v-model="sellItem.agentCommission"
+                  v-model="sellItem.agentCommision"
                   placeholder="R"
                 />
                 <div class="validation"></div>
@@ -830,11 +834,9 @@
                 </p>
               </div>
             </div>
-            <div class="form-row" v-if="profileEmailError">
+            <div class="form-row">
               <div class="col-md-12">
-                <p class="alert myError">
-                  Please ensure that your email is correct before adding a timeshare week.
-                </p>
+                <alert :text="errorMessage" :type="errorOccurred" />
               </div>
             </div>
             <div class="text-center col-12" v-if="CanSave">

src/components/user/loginPage.vue

@@ -9,12 +9,9 @@
                 <div class="card card-signin my-5">
                   <div class="card-body">
                     <h3 class="card-title text-center">Login</h3>
-                    <div v-if="error">
-                      <alert
-                        :text="'User doesn\'t exist or Username and Password is incorrect'"
-                        :type="'ERROR'"
-                      />
-                    </div>
+
+                    <alert :text="errorMessage" :type="errorOccurred" />
+
                     <div v-if="page">
                       <alert :text="page.text" :type="'INFO'" />
                     </div>
@@ -100,6 +97,8 @@ export default {
     return {
       username: "",
       password: "",
+      errorOccurred: "",
+      errorMessage: "",
       isPasswordShown: "password",
       selectItems: [{ text: "password", value: 0 }],
       selectErrors: "Some error with the field",
@@ -129,6 +128,7 @@ export default {
       this.login({ username: this.username, password: this.password })
         .then(() => {
           // console.log(Log.getUser());
+
           if (!this.page) {
             if (!Log.getUser().loginPasswordChange) {
               this.$router.push("/");
@@ -140,7 +140,11 @@ export default {
           }
         })
         .catch(err => {
-          this.error = true;
+          console.log(err.status);
+          if (err.status === 401) {
+            this.errorOccurred = "ERROR";
+            this.errorMessage = err.data.message;
+          }
         });
     },
     checkUserStatus() {

src/components/user/registerAgencySection.vue

@@ -144,8 +144,6 @@
       </div>
     </div>
     <button
-      :data-target="'#myModalAgency'"
-      data-toggle="modal"
       v-if="registerAgency.user.acceptedTerms"
       v-on:click="SubmitData()"
       class="btn-solid-blue"
@@ -163,6 +161,7 @@
     >
       Cancel
     </button>
+    <button hidden :data-target="'#myModalAgency'" data-toggle="modal" ref="dataToggle"></button>
   </div>
 </template>
 
@@ -220,9 +219,10 @@ export default {
           if (Log.getUser().role !== "Super Admin") {
             this.$router.push("/user/login");
           } else {
+            this.$refs.dataToggle.click();
             this.$router.go();
           }
-        }, 2500);
+        }, 500);
       });
       //this.$router.push("/user/login");
     },

src/components/user/registerIndividual.vue

@@ -111,8 +111,6 @@
         </div>
       </div>
       <button
-        :data-target="'#myNewUserModal'"
-        data-toggle="modal"
         :disabled="isDisabled"
         v-on:click="SubmitData()"
         :class="isDisabled ? 'btn-disabled' : 'btn-solid-blue'"
@@ -130,6 +128,7 @@
       >
         Cancel
       </button>
+      <button hidden :data-target="'#myModalAgency'" data-toggle="modal" ref="dataToggle"></button>
     </div>
   </main>
 </template>
@@ -203,9 +202,10 @@ export default {
             if (Log.getUser().role !== "Super Admin") {
               this.$router.push("/user/login");
             } else {
+              this.$refs.dataToggle.click();
               this.$router.go();
             }
-          }, 2500);
+          }, 500);
         })
         .catch(err => {
           this.boolUserExists = true;

src/components/user/updateProfileInfo.vue

@@ -105,6 +105,7 @@
           <div class="validation"></div>
         </div>
       </div>
+
       <div v-if="!isAgent()" class="row mb-2">
         <div class="form-group col-md-6">
           <div class="input-group">
@@ -422,6 +423,7 @@ import DetailIndividual from "./timeshareIndividual.vue";
 import addressAutoComplete from "../shared/addressAutoComplete";
 import Log from "../../assets/Log";
 import Alert from "../shared/alert";
+import logOutVue from "./logOut.vue";
 
 export default {
   name: "UpdateInfo",
@@ -459,6 +461,9 @@ export default {
         }
       } else {
         this.individual = this.indiv;
+        this.individual.telephone = this.indiv.landlineNumber;
+        this.individual.email = this.indiv.emailAddress;
+        console.log(this.indiv);
         this.individual.user = Log.getUser();
       }
       this.getAgencies();
@@ -527,7 +532,6 @@ export default {
     sendToApi() {
       this.boolError = false;
       this.individual.emailAddress = this.individual.email;
-
       if (this.individual.telephone !== "") {
         if (this.individual.telephone !== null) {
           if (!this.validPhoneNumber(this.individual.telephone)) {
@@ -583,9 +587,30 @@ export default {
           this.saveAgent(this.individual)
             .then(() => {
               if (Log.getUser().role === "Super Admin") {
+                // console.log(this.individual);
+                // console.log(JSON.parse(localStorage.getItem("person")));
+                if (this.individual.id === JSON.parse(localStorage.getItem("person"))) {
+                  var newPerson = {
+                    id: JSON.parse(localStorage.getItem("person")).id,
+                    email: this.individual.email,
+                    fullname: this.individual.name + " " + this.individual.surname,
+                    name: this.individual.name,
+                    surname: this.individual.surname
+                  };
+                  this.$router.go();
+                  localStorage.setItem("person", JSON.stringify(newPerson));
+                }
                 this.$router.push("/status/userManagementPage");
               } else {
-                this.$router.push("/");
+                var newPerson = {
+                  id: JSON.parse(localStorage.getItem("person")).id,
+                  email: this.individual.email,
+                  fullname: this.individual.name + " " + this.individual.surname,
+                  name: this.individual.name,
+                  surname: this.individual.surname
+                };
+                localStorage.setItem("person", JSON.stringify(newPerson));
+                this.$router.go();
               }
             })
             .catch(ex => {
@@ -596,9 +621,28 @@ export default {
         } else {
           this.updateIndividual(this.individual).then(() => {
             if (Log.getUser().role === "Super Admin") {
+              if (this.individual.id === JSON.parse(localStorage.getItem("person")).id) {
+                var newPerson = {
+                  id: JSON.parse(localStorage.getItem("person")).id,
+                  email: this.individual.email,
+                  fullname: this.individual.name + " " + this.individual.surname,
+                  name: this.individual.name,
+                  surname: this.individual.surname
+                };
+                this.$router.go();
+                localStorage.setItem("person", JSON.stringify(newPerson));
+              }
               this.$router.push("/status/userManagementPage");
             } else {
-              this.$router.push("/");
+              var newPerson = {
+                id: JSON.parse(localStorage.getItem("person")).id,
+                email: this.individual.email,
+                fullname: this.individual.name + " " + this.individual.surname,
+                name: this.individual.name,
+                surname: this.individual.surname
+              };
+              localStorage.setItem("person", JSON.stringify(newPerson));
+              this.$router.go();
             }
           });
         }

src/main.js

@@ -33,8 +33,8 @@ Vue.use(VueGoogleMaps, {
 });
 Vue.config.productionTip = false;
 //axios.defaults.baseURL = "http://localhost:57260";
-axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
-//axios.defaults.baseURL = "http://training.provision-sa.com:82/";
+//axios.defaults.baseURL = "https://www.pvsl.co.za:86/";
+axios.defaults.baseURL = "http://training.provision-sa.com:82/";
 //axios.defaults.baseURL = "http://localhost:8080/";
 
 Vue.prototype.$axios = axios;

src/store/modules/user/authentication.js

@@ -66,25 +66,26 @@ export default {
       });
     },
     async login({ commit }, user) {
-      const response = await axios({
+      await axios({
         url: "/api/register/authenticate",
         data: {
           username: user.username,
           password: user.password
         },
         method: "POST"
-      });
-      if (response.status === 200) {
+      }).then((resp) => {
         log.clearValues();
-        log.setValues(response.data);
-        commit("auth_success", response.data);
+        log.setValues(resp.data);
+        commit("auth_success", resp.data);
         return Promise.resolve();
-      } else {
+      })
+      .catch((ex) => {        
         commit("auth_error");
         log.clearValues();
         commit("auth_error", "error occurred");
-        return Promise.reject();
-      }
+        return Promise.reject(ex.response);
+      })
+      
     },
     logout({ commit }) {
       return new Promise(() => {

src/store/modules/user/register.js

@@ -107,12 +107,19 @@ export default {
   getters: {},
   actions: {
     async forgotPasswordCheck({commit}, mail){
-      const response = await axios.post('api/register/forgotPassword/'+ mail)
-      if(response.status === 200){
-        return Promise.resolve()
-      }else{
-        return Promise.reject()
-      }
+      await axios.post('api/register/forgotPassword/'+ mail).then((resp) => {
+        return Promise.resolve(resp.data)
+      })
+      .catch((ex) => {
+        console.log(ex.response);
+        return Promise.reject(ex.response)
+      })
+      // if(response.status === 200){
+      //   return Promise.resolve()
+      // }else{
+      //   console.log(response.response);
+      //   return Promise.reject()
+      // }
     },
     getIndividuals({ commit }) {
       axios
@@ -155,7 +162,8 @@ export default {
           return promise.resolve()
         })
         .catch((ex) => {
-          return promise.reject(ex)
+          console.log(ex.response);
+          return promise.reject(ex.response)
           //console.error;
         });
     },

vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
     proxy: {
       "/api": {
         //target: "http://localhost:57260/",
-        //target: "http://training.provision-sa.com:82/",
-        target: "https://www.pvsl.co.za:86/",
+        target: "http://training.provision-sa.com:82/",
+        //target: "https://www.pvsl.co.za:86/",
         changeOrigin: true
       },
       "/nph-srep": {