Fixes on the ToSell Page

src/store/index.js

@@ -1,36 +1,38 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
+import Vue from "vue";
+import Vuex from "vuex";
 
-import TimeshareModule from './modules/timeshare/timeshare';
-import UsersModule from './modules/users';
-import StatusModule from './modules/timeshare/status';
-import UnitConfigurationModule from './modules/timeshare/unitConfiguration';
-import RegionModule from './modules/timeshare/region';
-import SearchTabModule from './modules/searchTab';
-import ResortModule from './modules/timeshare/resort';
-import PropertyModule from './modules/property/property';
-import WeekModule from './modules/timeshare/week';
-import PropertyAdminModule from './modules/property/propertyAdmin';
-import PropertyList from './modules/property/propertyLists';
-import PropertyTypes from './modules/property/propertyTypes';
-import Register from './modules/user/register';
-import WeekList from './modules/timeshare/weekList';
-import MyWeeks from './modules/timeshare/myWeeks';
-import Bid from './modules/processFlow/bid';
-import Authentication from './modules/user/authentication';
-import PropertySearch from './modules/property/propertySearch';
-import SearchLog from './modules/logs/searchLog';
-import Template from './modules/communication/template';
-import Info from './modules/communication/info';
-import PropertyEdit from './modules/property/propertyEdit';
-import Carousel from './modules/misc/carousel';
-import Individual from './modules/user/individual';
-import Alert from './modules/misc/alert';
-import TenderWeek from './modules/timeshare/tenderWeeks';
-import PaymentModule from './modules/financial/payment';
+import TimeshareModule from "./modules/timeshare/timeshare";
+import UsersModule from "./modules/users";
+import StatusModule from "./modules/timeshare/status";
+import UnitConfigurationModule from "./modules/timeshare/unitConfiguration";
+import RegionModule from "./modules/timeshare/region";
+import SearchTabModule from "./modules/searchTab";
+import ResortModule from "./modules/timeshare/resort";
+import PropertyModule from "./modules/property/property";
+import WeekModule from "./modules/timeshare/week";
+import PropertyAdminModule from "./modules/property/propertyAdmin";
+import PropertyList from "./modules/property/propertyLists";
+import PropertyTypes from "./modules/property/propertyTypes";
+import Register from "./modules/user/register";
+import WeekList from "./modules/timeshare/weekList";
+import MyWeeks from "./modules/timeshare/myWeeks";
+import Bid from "./modules/processFlow/bid";
+import Authentication from "./modules/user/authentication";
+import PropertySearch from "./modules/property/propertySearch";
+import SearchLog from "./modules/logs/searchLog";
+import Template from "./modules/communication/template";
+import Info from "./modules/communication/info";
+import PropertyEdit from "./modules/property/propertyEdit";
+import Carousel from "./modules/misc/carousel";
+import Individual from "./modules/user/individual";
+import Alert from "./modules/misc/alert";
+import TenderWeek from "./modules/timeshare/tenderWeeks";
+import PaymentModule from "./modules/financial/payment";
 import CampaignModule from "./modules/marketing/campaigns";
 import CampaignItemModule from "./modules/marketing/campaignItems";
 import PlaceHolderFormat from "./modules/misc/placeHolderFormat";
+import Bank from "./modules/user/bank";
+import bank from "./modules/user/bank";
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -65,6 +67,7 @@ export default new Vuex.Store({
     payment: PaymentModule,
     campaign: CampaignModule,
     campaignItem: CampaignItemModule,
-    placeHolderFormat: PlaceHolderFormat
-  },
+    placeHolderFormat: PlaceHolderFormat,
+    bank: bank
+  }
 });

src/store/modules/timeshare/timeshare.js

@@ -1,9 +1,9 @@
 /* eslint-disable guard-for-in */
 /* eslint-disable no-restricted-syntax */
-import axios from 'axios';
-import _ from 'lodash';
-import MyData from '../../../assets/myData';
-import MaritalStatus from '../../../assets/staticData/maritalStatus';
+import axios from "axios";
+import _ from "lodash";
+import MyData from "../../../assets/myData";
+import MaritalStatus from "../../../assets/staticData/maritalStatus";
 
 export default {
   namespaced: true,
@@ -50,9 +50,9 @@ export default {
       status: undefined,
       owner: {
         address: {},
-        bankingDetails: {},
-      },
-    },
+        bankingDetails: {}
+      }
+    }
   },
   mutations: {
     setUnitConfigurationList(state, list) {
@@ -97,138 +97,133 @@ export default {
       state.sellItem.resortName = resort.resortName;
     },
     displayResult(state) {
-      state.result = 'Week has been added ^-^';
+      state.result = "Week has been added ^-^";
     },
     setWeekDetail(state, week) {
       state.sellItem = week;
-    },
+    }
   },
   getters: {
     getRegionCode(state) {
-      return (value) => {
-        const reg = state.detailedRegion.find(region => region.children.some(resort => resort
-          .resortCode === value));
+      return value => {
+        const reg = state.detailedRegion.find(region =>
+          region.children.some(resort => resort.resortCode === value)
+        );
         if (reg && reg.region) {
           return reg.region.regionCode;
         }
-        return '';
+        return "";
       };
     },
     getResortName(state) {
-      return (value) => {
+      return value => {
         const res = state.resorts.find(resort => resort.resortCode === value);
         if (res) {
           return res.resortName;
         }
       };
-    },
+    }
   },
   actions: {
-    initTimeshare({
-      commit,
-      dispatch,
-    }, timeshareId) {
-      commit('setResortBedrooms', MyData.resortBedrooms);
-      commit('setMaxSleep', MyData.maxBedrooms);
-      commit('setBankedEntities', MyData.bankedEntities);
-      dispatch('getSeasons');
-      dispatch('getAgents');
-      dispatch('getAgencies');
-      dispatch('getResorts');
-      dispatch('getRegions');
+    initTimeshare({ commit, dispatch }, timeshareId) {
+      commit("setResortBedrooms", MyData.resortBedrooms);
+      commit("setMaxSleep", MyData.maxBedrooms);
+      commit("setBankedEntities", MyData.bankedEntities);
+      dispatch("getSeasons");
+      dispatch("getAgents");
+      dispatch("getAgencies");
+      dispatch("getResorts");
+      dispatch("getRegions");
       if (timeshareId && timeshareId !== 0) {
-        dispatch('getWeekDetail', timeshareId);
+        dispatch("getWeekDetail", timeshareId);
       }
     },
-    getWeekDetail({
-      commit,
-    }, timeshareId) {
+    getWeekDetail({ commit }, timeshareId) {
       axios
         .get(`api/timeshareweek/${timeshareId}`)
-        .then((result) => {
+        .then(result => {
           console.log(result.data);
-          commit('setWeekDetail', result.data);
+          commit("setWeekDetail", result.data);
         })
         .catch(console.error);
     },
-    getSeasons({
-      commit,
-    }) {
+    getSeasons({ commit }) {
       axios
-        .get('/api/season')
-        .then(result => commit('setSeason', result.data))
+        .get("/api/season")
+        .then(result => commit("setSeason", result.data))
         .catch(console.error);
     },
-    getAgencies({
-      commit,
-    }) {
+    getAgencies({ commit }) {
       axios
-        .get('/api/agency')
-        .then(result => commit('setAgency', result.data))
+        .get("/api/agency")
+        .then(result => commit("setAgency", result.data))
         .catch(console.error);
     },
-    getAgents({
-      commit,
-    }) {
+    getAgents({ commit }) {
       axios
-        .get('/api/agent')
-        .then(result => commit('setAgent', result.data))
+        .get("/api/agent")
+        .then(result => commit("setAgent", result.data))
         .catch(console.error);
     },
-    getResorts({
-      commit,
-    }) {
+    getResorts({ commit }) {
       axios
-        .get('https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list/')
-        .then(result => commit('addResort', result.data))
+        .get("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list/")
+        .then(result => commit("addResort", result.data))
         .catch(console.error);
     },
-    getRegions({
-      dispatch,
-      commit,
-    }) {
+    getRegions({ dispatch, commit }) {
       axios
-        .get('https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/regions/list/ZA')
-        .then((result) => {
-          commit('addRegion', result.data);
-          dispatch('getDetailedRegion', result.data);
+        .get("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/regions/list/ZA")
+        .then(result => {
+          commit("addRegion", result.data);
+          dispatch("getDetailedRegion", result.data);
         })
         .catch(console.error);
     },
-    getDetailedRegion({
-      commit,
-    }, data) {
+    getDetailedRegion({ commit }, data) {
       if (data) {
         for (const r in Object.keys(data)) {
           const region = data[r];
           if (region !== undefined) {
             axios
               .get(
-                `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/${
-                  region.regionCode
-                }/`,
+                `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/${region.regionCode}/`
+              )
+              .then(result =>
+                commit("addDetailedRegion", {
+                  region,
+                  children: result.data
+                })
               )
-              .then(result => commit('addDetailedRegion', {
-                region,
-                children: result.data,
-              }))
               .catch(console.error);
           }
         }
       }
     },
-    onResortChange({
-      commit,
-    }, resort) {
-      commit('changeResort', resort);
+    onResortChange({ commit }, resort) {
+      commit("changeResort", resort);
+    },
+    saveWeek({ commit }, week) {
+      return new Promise((resolve, reject) => {
+        axios
+          .post("/api/timeshareweek", week)
+          .then(result => {
+            commit("setWeekDetail", result.data);
+            resolve();
+          })
+          .catch(error => reject(new Error(error.message)));
+      });
+
+      // axios
+      //   .post('/api/timeshareweek', week)
+      //   .then(result => commit('displayResult'))
+      //   .catch(console.error);
     },
-    saveWeek({
-      commit,
-    }, week) {
+    getBlankWeek({ commit }) {
       axios
-        .post('/api/timeshareweek', week)
-        .then(result => commit('displayResult'))
+        .get("/api/timeshareweek/gettemplate")
+        .then(result => commit("setWeekDetail", result.data))
         .catch(console.error);
-    },
-  },
+    }
+  }
 };

src/store/modules/user/bank.js

@@ -0,0 +1,24 @@
+/* eslint-disable no-restricted-syntax */
+/* eslint-disable guard-for-in */
+import axios from "axios";
+
+export default {
+  namespaced: true,
+  state: {
+    banks: []
+  },
+  mutations: {
+    setBanks(state, items) {
+      state.banks = items;
+    }
+  },
+  getters: {},
+  actions: {
+    getBanks({ commit }) {
+      axios
+        .get("/api/banks")
+        .then(result => commit("setBanks", result.data))
+        .catch(error => alert(error.message));
+    }
+  }
+};

src/store/modules/user/individual.js

@@ -1,12 +1,12 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
-import axios from 'axios';
+import axios from "axios";
 
 export default {
   namespaced: true,
   state: {
     items: [],
-    indiv: undefined,
+    indiv: undefined
   },
   mutations: {
     addItem(state, item) {
@@ -14,43 +14,48 @@ export default {
     },
     setItem(state, item) {
       state[item.name] = item.value;
-    },
+    }
   },
   getters: {},
   actions: {
     getIndividual({ commit, rootGetters }, userId) {
       let id = 0;
       if (!userId || userId === 0) {
-        const rootItem = rootGetters['authentication/getUser'];
+        const rootItem = rootGetters["authentication/getUser"];
         id = rootItem ? rootItem.id : 0;
       } else id = userId;
+
+      if (!id) {
+        id = 0;
+      }
+
       axios
         .get(`/api/individual/getIndividual/${id}`)
-        .then((r) => {
+        .then(r => {
           console.log(JSON.stringify(r));
-          commit('setItem', {
-            name: 'indiv',
-            value: r.data,
+          commit("setItem", {
+            name: "indiv",
+            value: r.data
           });
         })
         .catch(console.error);
     },
     getAllIndividuals({ commit }) {
       axios
-        .get('/api/individual/getAllIndividuals')
-        .then((x) => {
-          commit('setItem', {
-            name: 'items',
-            value: x.data,
+        .get("/api/individual/getAllIndividuals")
+        .then(x => {
+          commit("setItem", {
+            name: "items",
+            value: x.data
           });
         })
         .catch(console.error);
     },
     updateIndividual({ commit }, item) {
       axios
-        .put('/api/individual', item)
-        .then(result => commit('setItem', item))
+        .put("/api/individual", item)
+        .then(result => commit("setItem", item))
         .catch(console.error);
-    },
-  },
+    }
+  }
 };