Timeshareweek user update

src/components/admin/status/editTimeShareAdminPage.vue

@@ -55,6 +55,21 @@
 
                     <div class="validation"></div>
                   </div>
+                  <!-- <div v-else class="input-group">
+                    <float-label label="RESORT NAME" style="width:100%" fixed>
+                      <select class="form-control uniSelect" v-model="selectedResort">
+                        <option value="Other">{{ week.otherResortName }}</option>
+                        <option
+                          v-for="(resort, r) in filteredResort"
+                          :key="r"
+                          :value="resort.resortCode"
+                          >{{ resort.resortName }}</option
+                        >
+                      </select>
+                    </float-label>
+
+                    <div class="validation"></div>
+                  </div> -->
                   <div class="validation"></div>
                 </div>
                 <div class="form-group col-md-6">
@@ -65,7 +80,7 @@
                       placeholder="NAME OF RESORT (* IF OTHER)"
                       type="text"
                       name="other"
-                      v-model="weekParam.otherResortName"
+                      v-model="week.otherResortName"
                     />
                   </float-label>
                 </div>
@@ -289,12 +304,22 @@
             <div class="section-header" style="margin-top:50px">
               <h2>Detailed Individual Information</h2>
             </div>
-
             <div class="form">
+              <div v-if="ROLE === 'Super Admin'" class="row mb-4">
+                <div class="col">
+                  <float-label label="OWNER TYPE" fixed>
+                    <select v-model="weekParam.customOwner" class="form-control uniSelect mt-3">
+                      <option v-bind:value="true">Custom Owner</option>
+                      <option v-bind:value="false">Registered User</option>
+                    </select>
+                  </float-label>
+                </div>
+              </div>
               <div v-if="ROLE === 'Super Admin'" class="row mb-4">
                 <div class="col">
                   <float-label label="SELECT OWNER" fixed>
                     <select
+                      :disabled="weekParam.customOwner"
                       v-model="weekParam.ownerId"
                       class="form-control uniSelect mt-3"
                       @change="updateCurrentUser()"
@@ -312,7 +337,7 @@
                     <input
                       type="text"
                       name="name"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       class="form-control"
                       id="name"
                       placeholder="Name"
@@ -328,7 +353,7 @@
                   <float-label>
                     <input
                       type="text"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       class="form-control"
                       name="surname"
                       id="surname"
@@ -346,7 +371,7 @@
                   <float-label>
                     <input
                       type="text"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       name="idnum"
                       class="form-control"
                       id="idnum"
@@ -363,7 +388,7 @@
                   <float-label>
                     <input
                       type="text"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       class="form-control"
                       name="company"
                       id="company"
@@ -382,13 +407,13 @@
                   <float-label>
                     <input
                       type="text"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       class="form-control"
                       name="email"
                       id="email"
                       placeholder="Email Address"
                       data-msg="Please enter your email address"
-                      v-model="week.owner.emailAddress"
+                      v-model="week.owner.email"
                     />
                   </float-label>
 
@@ -400,7 +425,7 @@
                   <float-label>
                     <input
                       type="text"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       name="cell"
                       class="form-control"
                       id="cell"
@@ -417,7 +442,7 @@
                   <float-label>
                     <input
                       type="text"
-                      disabled
+                      :disabled="!weekParam.customOwner"
                       class="form-control"
                       name="landline"
                       id="landline"
@@ -431,6 +456,9 @@
                 </div>
               </div>
             </div>
+            <div class="section-header" style="margin-top:50px">
+              <h2>Week Agent</h2>
+            </div>
             <div v-if="!boolAwaitingPayment">
               <div class="section-header">
                 <h2>Publish Timeshare Week</h2>
@@ -545,10 +573,6 @@ export default {
     Alert
   },
   async mounted() {
-    this.getStatusList();
-    this.getWeek(this.weekParam.id).then(() => {
-      this.wait = false;
-    });
     if (this.sellItem.id) {
       this.newSale();
     }
@@ -561,8 +585,8 @@ export default {
     this.getIndividual(Log.getUser().id);
     this.getBanks();
     //this.getWeek(this.weekParam.id);
-    console.log(this.regions);
-    console.log(this.weekParam.region.regionCode);
+    // console.log(this.regions);
+    // console.log(this.weekParam.region.regionCode);
     this.selectedRegion = this.weekParam.region.regionCode;
     this.selectedResort = this.weekParam.resort.resortCode;
     this.selectedBedrooms = this.weekParam.bedrooms;
@@ -581,11 +605,28 @@ export default {
         this.boolAwaitingPayment = true;
       }
     }
-    console.log(this.individuals);
+    //console.log(this.individuals);
   },
   created() {
     this.initTimeshare(this.weekId);
     this.getIndividuals();
+    this.getStatusList();
+    this.getWeek(this.weekParam.id).then(() => {
+      if (this.weekParam.customOwner) {
+        this.retrieveNonRegIndiv(this.weekParam.id).then(() => {
+          this.week.owner.name = this.getIndiv[0].name;
+          this.week.owner.surname = this.getIndiv[0].surname;
+          this.week.owner.idNumber = this.getIndiv[0].idNumber;
+          this.week.owner.companyRegNumber = this.getIndiv[0].companyRegNumber;
+          this.week.owner.email = this.getIndiv[0].emailAddress;
+          this.week.owner.cellNumber = this.getIndiv[0].cellNumber;
+          this.week.owner.telephone = this.getIndiv[0].telephoneNumber;
+          this.wait = false;
+        });
+      } else {
+        this.wait = false;
+      }
+    });
   },
   computed: {
     ...mapState("timeshare", [
@@ -602,6 +643,7 @@ export default {
       "agents",
       "getTemplate"
     ]),
+    ...mapGetters("nonRegIndividual", ["getIndiv"]),
     ...mapState("individual", ["indiv"]),
     ...mapState("authentication", ["isLoggedIn"]),
     ...mapState("myWeeks", ["items", "week"]),
@@ -640,6 +682,7 @@ export default {
   },
   methods: {
     ...mapActions("individual", ["getIndividual"]),
+    ...mapActions("nonRegIndividual", ["retrieveNonRegIndiv"]),
     ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("bank", ["getBanks"]),
@@ -653,15 +696,14 @@ export default {
     updateCurrentUser() {
       this.individuals.forEach(indiv => {
         if (this.weekParam.ownerId === indiv.id) {
-          console.log(indiv);
           this.week.owner.name = indiv.name;
           this.week.owner.surname = indiv.surname;
           this.week.owner.idNumer = indiv.idNumber;
           this.week.owner.companyRegNumber = indiv.companyRegNumber;
-          this.week.owner.emailAddress = indiv.email;
+          this.week.owner.email = indiv.emailAddress;
           this.week.owner.cellNumber = indiv.cellNumber;
           this.week.owner.landlineNumber = indiv.telephone;
-          console.log(this.week.owner);
+          //console.log(this.week.owner);
         }
       });
     },
@@ -701,7 +743,7 @@ export default {
       }
       this.weekParam.arrivalDate = new Date(this.dateParam).toISOString().substring(0, 10);
       this.weekParam.departureDate = new Date(this.depDateParam).toISOString().substring(0, 10);
-      console.log(this.pubDateParam);
+      //console.log(this.pubDateParam);
       if (this.pubDateParam) {
         this.weekParam.pulbishedDate = new Date(this.pubDateParam).toISOString().substring(0, 19);
       }
@@ -722,7 +764,7 @@ export default {
       delete this.weekParam.owner.howMarried;
       delete this.weekParam.cellNumber;
       //console.log(JSON.stringify(this.weekParam));
-      console.log(this.weekParam);
+      //console.log(this.weekParam);
       this.editSave(this.weekParam).then(() => {
         this.backToListView();
       });

src/components/admin/status/timeshareAdminList.vue

@@ -50,12 +50,13 @@
                 <th scope="col">Delete</th>
               </tr>
             </thead>
+
             <tbody>
               <tr v-for="(item, i) in DisplayItems" :key="i">
                 <td>{{ item.owner }}</td>
                 <td>{{ item.agent }}</td>
                 <td>{{ item.resort.resortName }}</td>
-                <td>{{ item.weekNumber }}</td>
+                <td>{{ item.module }}</td>
                 <td>{{ item.unitNumber }}</td>
                 <td>{{ item.bedrooms }}</td>
                 <td>{{ item.season }}</td>
@@ -174,7 +175,7 @@ export default {
         "owner",
         "agent",
         "resort",
-        "weekNumber",
+        "module",
         "unitNumber",
         "bedrooms",
         "season",

src/components/timeshare/sell/contentSection.vue

@@ -165,7 +165,7 @@
               <div class="form-group col-md-6 mt-2">
                 <float-label>
                   <input
-                    type="number"
+                    type="text"
                     class="form-control"
                     name="week"
                     id="week"
@@ -632,7 +632,7 @@
             <div class="form-row">
               <div
                 class="form-group col-md-12"
-                style="border:solid;border-width:2px; border-color:rgb(27, 117, 187); border-radius: 3px"
+                style="border:solid;border-width:2px; border-color:rgb(27, 117, 187);border-radius: 3px"
               >
                 <p style="text-align: left; margin:auto; padding:10px">
                   1. With respect to my timeshare module/week, I confirm that:

src/store/index.js

@@ -36,6 +36,7 @@ import bank from "./modules/user/bank";
 import Fees from "./modules/financial/fees";
 import TermsConditions from "./modules/misc/termsConditions";
 import Roles from './modules/user/role'
+import NonRegIndividuals from './modules/user/nonRegIndividual'
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -74,6 +75,7 @@ export default new Vuex.Store({
     fees: Fees,
     termsConditions: TermsConditions,
     bank: bank,
-    role: Roles
+    role: Roles,
+    nonRegIndividual: NonRegIndividuals
   }
 });

src/store/modules/user/nonRegIndividual.js

@@ -0,0 +1,27 @@
+/* eslint-disable */
+import axios from 'axios';
+
+export default {
+  namespaced: true,
+  state: {
+    nonRegIndiv: [],
+  },
+  mutations: {
+    getIndiv(state, indiv) {
+      state.nonRegIndiv = indiv;
+    },
+  },
+  getters: {
+    getIndiv: (state) => state.nonRegIndiv
+  },
+  actions: {
+    async retrieveNonRegIndiv({commit}, id){
+        console.log('twas here');
+        await axios.get('/api/nonRegIndividual/' + id)
+        .then((result) => {
+            commit('getIndiv', result.data)
+        })
+        .catch((e) => console.log(e))
+    }
+  },
+};