Timeshare - my weeks

src/App.vue

@@ -36,6 +36,10 @@ export default {
 hr {
   background-color: #60cbeb;
 }
+.my-btn {
+  margin: 2px;
+  color: #60cbeb;
+}
 .title-img {
   width: 800px;
   height: 400px;

src/assets/Log.js

@@ -48,7 +48,10 @@ const items = {
     return localStorage.getItem('token') !== undefined && localStorage.getItem('token') !== null;
   },
   getUser() {
-    return localStorage.getItem('user');
+    return localStorage.getItem('user') ? JSON.parse(localStorage.getItem('user')) : {};
+  },
+  getPerson() {
+    return localStorage.getItem('person') ? JSON.parse(localStorage.getItem('person')) : {};
   },
 };
 export default items;

src/components/processFlow/makeOffer.vue

@@ -21,7 +21,7 @@
         <div class="form-group row">
           <div class="col-md-6 col-lg-5 section-md-t3">
             <div class="title-box-d">
-              <h3 class="title-d">{{ item ? item.resortName : '' }}</h3>
+              <h3 class="title-d">{{ item ? item.resort.resortName : '' }}</h3>
             </div>
           </div>
         </div>

src/components/shared/listView.vue

@@ -2,11 +2,9 @@
 /* eslint-disable guard-for-in */
 <template>
   <div>
-    <div class="container">
-      <div class="d-flex justify-content-between" v-if="!hideSearch">
-        <div class="p-2">
-          <input v-model="searchItem" class="form-control" placeholder="Search ..." />
-        </div>
+    <div class="d-flex justify-content-between" v-if="!hideSearch">
+      <div class="p-2">
+        <input v-model="searchItem" class="form-control" placeholder="Search ..." />
       </div>
     </div>
     <table id="table" class="table table-bordered table-hover">
@@ -15,6 +13,8 @@
           <th v-for="(column, c) in Columns" :key="c">
             <div @click="sortBy(column)">{{ column }}</div>
           </th>
+          <th v-if="editable"></th>
+          <th v-if="deleteable"></th>
         </tr>
       </thead>
       <tbody>
@@ -24,7 +24,16 @@
           class="text-left dnd-moved"
           @click="onRowClick(item)"
         >
-          <td v-for="(column, c) in Columns" :key="c">{{ item[column] }}</td>
+          <td
+            v-for="(column, c) in Columns"
+            :key="c"
+          >{{ isObject(item[column]) ? item[column].display : item[column] }}</td>
+          <td v-if="editable" class="my-width">
+            <button type="button" class="btn my-btn" @click="onEdit(item)">Edit</button>
+          </td>
+          <td v-if="deleteable" class="my-width">
+            <button type="button" class="btn my-btn" @click="onDelete(item)">Delete</button>
+          </td>
         </tr>
       </tbody>
     </table>
@@ -81,6 +90,15 @@ export default {
       default: false,
     },
     items: undefined,
+    editable: {
+      default: false,
+    },
+    deleteable: {
+      default: false,
+    },
+    columnsCount: {
+      default: 6,
+    },
   },
   data() {
     return {
@@ -94,6 +112,15 @@ export default {
     };
   },
   methods: {
+    isObject(item) {
+      return !!item && item.constructor === Object;
+    },
+    onEdit(item) {
+      this.$emit('onEdit', item);
+    },
+    onDelete(item) {
+      this.$emit('onDelete', item);
+    },
     onRowClick(item) {
       this.$emit('onRowClick', item);
     },
@@ -158,7 +185,9 @@ export default {
               !list.includes(Object.keys(item)[o])
               && !Array.isArray(Object.values(item)[o])
             ) {
-              list.push(Object.keys(item)[o]);
+              if (list.length < this.columnsCount) {
+                list.push(Object.keys(item)[o]);
+              }
             }
           }
         }
@@ -169,7 +198,7 @@ export default {
       const list = _.filter(this.items, item => Object.values(item).some(
           i => JSON.stringify(i)
               .toLowerCase()
-              .indexOf(this.searchItem) > -1,
+              .indexOf(this.searchItem.toLowerCase()) > -1,
         ),);
       return _.orderBy(list, this.sortKey, this.SortDirection);
     },
@@ -196,6 +225,12 @@ th[draggable] a {
   text-decoration: none;
   color: #333333;
 }
+.table > tbody > tr > td {
+  vertical-align: middle;
+}
+.my-width {
+  width: 20px;
+}
 .drag {
   background-color: rgba(0, 255, 0, 0.35);
   opacity: 0.25;

src/components/shared/navBar.vue

@@ -63,7 +63,7 @@
                   <a
                     v-if="isLoggedIn"
                     class="dropdown-item cursor-pointer"
-                    @click="routerGoTo('/timeshare/sell')"
+                    @click="routerGoTo('/timeshare/myWeeks')"
                   >My Timeshare Weeks</a>
                 </div>
               </div>

src/components/shared/searchTab.vue

@@ -143,7 +143,7 @@ export default {
     },
     Search() {
       if (this.selectedPropertyType === 'timeshare') {
-        this.$router.push('/timeshare/search/');
+        this.$router.push('/timesharesearch');
       } else {
         // this.$router.push('/property/search');
         this.$router.push({

src/components/timeshare/buy/buyPage.vue

@@ -120,11 +120,10 @@ export default {
     };
   },
   mounted() {
-    console.log(4);
     this.init();
   },
   computed: {
-    ...mapState('timeshareBuy', ['detailedRegion', 'resort', 'availRegion']),
+    ...mapState('region', ['detailedRegion', 'resort', 'availRegion']),
     mapUrl() {
       return `http://maps.google.com/maps?q=${this.myMap}&z=${this.myZoom}&output=embed`;
     },
@@ -133,7 +132,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions('timeshareBuy', [
+    ...mapActions('region', [
       'init',
       'getAvail',
       'getRegions',

src/components/timeshare/buy/weekListComponent.vue

@@ -62,6 +62,7 @@ import { mapState, mapActions, mapGetters } from 'vuex';
 export default {
   props: {
     resortCode: undefined,
+    userId: undefined,
   },
   components: {},
   computed: {
@@ -79,7 +80,7 @@ export default {
   },
   methods: {
     View(item) {
-      this.$router.push(`/resort/${item.resort.resortCode}/${item.id}`);
+      this.$router.push(`/resort/${item.resort.resortCode}/${item.unitNumber}`);
     },
     ...mapActions('weekList', ['getWeeks', 'applyResortFilter']),
   },

src/components/timeshare/myWeeksPage.vue

@@ -4,24 +4,39 @@
     <br />
     <br />
     <br />
-    <img
-      src="http://www.provision-sa.com:3000/Provision/UnivateProperties/src/branch/master/public/img/logos/UVProp.png"
-      height="200"
-      width="200"
-    />
-    {{getUser}}
     <br />
+    <div class="row">
+      <div class="offset-1 col-md-10">
+        <ListView :items="items" :editable="true" @onEdit="onEdit" />
+      </div>
+    </div>
   </div>
 </template>
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 import log from '../../assets/Log';
+import ListView from '../shared/listView.vue';
 
 export default {
+  components: {
+    ListView,
+  },
+  data() {
+    return {
+      user: JSON.parse(log.getUser()),
+    };
+  },
+  mounted() {
+    console.log(this.user.id);
+    this.getItems(this.user.id);
+  },
   computed: {
-    ...mapState('myWeeks', ['test']),
-    getUser() {
-      return log.getUser();
+    ...mapState('myWeeks', ['items']),
+  },
+  methods: {
+    ...mapActions('myWeeks', ['getItems']),
+    onEdit(item) {
+      this.$router.push(`/timeshare/${item.id}`);
     },
   },
 };

src/components/timeshare/resort/unitPage.vue

@@ -1,10 +1,12 @@
 <template>
   <!-- eslint-disable max-len -->
   <div class="my-container my-top">
+    <br />
+    <br />
     <div class="row">
       <div class="col-md-12 col-lg-8">
         <div class="title-box-d">
-          <h1 class="title-d my-title">{{week ? week.resortName : ''}}</h1>
+          <h1 class="title-d my-title">{{week ? week.resort.resortName : ''}}</h1>
         </div>
         <br />
       </div>
@@ -158,7 +160,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapGetters } from 'vuex';
 import makeOffer from '../../processFlow/makeOffer.vue';
 import ResortImages from './resortImage.vue';
 
@@ -170,19 +172,30 @@ export default {
   },
   props: {
     resortCode: {},
-    weekId: {},
+    unitNumber: {},
   },
   mounted() {
     this.initResort(this.resortCode);
-    this.initWeek(this.weekId);
+    if (this.resortCode) {
+      this.applyResortFilter(this.resortCode);
+    }
+    this.getWeeks();
   },
   computed: {
     ...mapState('resort', ['resort', 'description', 'images']),
-    ...mapState('week', ['week']),
+
+    ...mapGetters({
+      weekById: 'weekList/weekById',
+    }),
+    week() {
+      return this.weekById(this.resortCode, this.unitNumber);
+    },
+    // ...mapState('week', ['currentWeek']),
   },
   methods: {
+    ...mapActions('weekList', ['getWeeks', 'applyResortFilter']),
     ...mapActions('resort', ['initResort']),
-    ...mapActions('week', ['initWeek']),
+    // ...mapActions('week', ['initWeek']),
     formatPrice(value) {
       if (value) {
         const val = (value / 1).toFixed(2);

src/components/timeshare/sell/sellPage.vue

@@ -517,6 +517,11 @@ import Alert from '../../shared/alert.vue';
 
 export default {
   name: 'TimeshareToSell',
+  props: {
+    weekId: {
+      default: 0,
+    },
+  },
   components: {
     DetailIndividual,
     BankDetails,
@@ -524,7 +529,8 @@ export default {
     Alert,
   },
   created() {
-    this.initTimeshare();
+    console.log(46);
+    this.initTimeshare(this.weekId);
   },
   computed: {
     ...mapState('timeshare', [

src/router/index.js

@@ -59,208 +59,213 @@ export default new Router({
       y: 0,
     };
   },
-  routes: [
-    {
-      path: '/',
-      name: 'Home',
-      component: HomePage,
-    },
-    {
-      path: '/about/us',
-      name: 'aboutus',
-      component: AboutUs,
-    },
-    {
-      path: '/about/timeshare',
-      name: 'abouttimeshare',
-      component: AboutTimeshare,
-    },
-    {
-      path: '/communication/template',
-      name: 'template',
-      component: TemplatePage,
-    },
-    {
-      path: '/timeshare/sell',
-      name: 'TimeshareSell',
-      component: TimeshareSell,
-    },
-    {
-      path: '/timeshare/buy',
-      name: 'TimeshareBuy',
-      component: TimeshareBuy,
-    },
-    {
-      path: '/timeshare/faq',
-      name: 'TimeshareFAQ',
-      component: TimeshareFAQ,
-    },
-    {
-      path: '/timeshare/myWeeks',
-      name: 'MyWeeks',
-      component: MyWeeksPage,
-    },
-    {
-      path: '/user/login',
-      name: 'Login',
-      component: Login,
-    },
-    {
-      path: '/user/updateProfileInfo',
-      name: 'UpdateInfo',
-      component: UpdateInfo,
-    },
-    {
-      path: '/user/register',
-      name: 'PrivateIndividual',
-      component: PrivateIndividual,
-    },
-    {
-      path: '/user/registeragency',
-      name: 'Agency',
-      component: Agency,
-    },
-    {
-      path: '/property/property/:id',
-      name: 'PropertyPage',
-      component: PropertyPage,
-    },
-    {
-      path: '/property/:propertyUsageType/search',
-      name: 'PropertySearch',
-      component: PropertySearch,
-    },
-    {
-      path: '/property/search',
-      name: 'PropertySearchTab',
-      component: PropertySearch,
-    },
-    {
-      path: '/property/new/:saleType',
-      name: 'PropertyNew',
-      component: PropertyCreate,
-    },
-    {
-      path: '/property/new/:propertyUsageType/:saleType',
-      name: 'PropertyNewFromSearch',
-      component: PropertyCreate,
-    },
-    {
-      path: '/property/edit',
-      name: 'PropertyEdit',
-      component: PropertyEdit,
-    },
-    {
-      path: '/property/admin/list/:by',
-      name: 'PropertyListAdmin',
-      component: PropertyList,
-    },
-    {
-      path: '/propertyTypes/list',
-      name: 'PropertyTypeList',
-      component: PropertyTypeList,
-    },
-    {
-      path: '/propertyType/new',
-      name: 'PropertyTypeNew',
-      component: PropertyType,
-    },
-    {
-      path: '/propertyType/:id',
-      name: 'PropertyTypeEdit',
-      component: PropertyType,
-    },
-    {
-      path: '/userDefinedGroups/list',
-      name: 'UserDefinedGroupsList',
-      component: UserDefinedGroups,
-    },
-    {
-      path: '/userDefinedGroups/userDefinedGroup/:id',
-      name: 'UserDefinedGroupEdit',
-      component: UserDefinedGroup,
-    },
-    {
-      path: '/userDefinedGroups/userDefinedGroup',
-      name: 'UserDefinedGroupNew',
-      component: UserDefinedGroup,
-    },
-    {
-      path: '/status/list',
-      name: 'StatusList',
-      component: Status,
-    },
-    {
-      path: '/status/timeshareAdmin',
-      name: 'TimeshareAdmin',
-      component: timeshareAdminPage,
-    },
-    {
-      path: '/status/tenderWeekAdmin',
-      name: 'TenderWeekAdmin',
-      component: tenderWeekAdminPage,
-    },
-    {
-      path: '/status/userManagementPage',
-      name: 'userManagementPage',
-      component: userManagementPage,
-    },
-    {
-      path: '/status/agentUserManagementPage',
-      name: 'agentManagementPage',
-      component: agentManagementPage,
-    },
-    {
-      path: '/status/changeLogPage',
-      name: 'changeLogPage',
-      component: changeLogPage,
-    },
-    {
-      path: '/unitConfiguration/list',
-      name: 'UnitConfiguration',
-      component: UnitConfiguration,
-    },
-    {
-      path: '/contactus',
-      name: 'ContactUs',
-      component: ContactUs,
-    },
-    {
-      path: '/privacypolicy',
-      name: 'PrivacyPolicy',
-      component: PrivacyPolicy,
-    },
-    {
-      path: '/resort/:resortCode',
-      name: 'ResortPage',
-      component: ResortPage,
-      props: true,
-    },
-    {
-      path: '/resort/:resortCode/:weekId',
-      name: 'UnitPage',
-      component: UnitPage,
-      props: true,
-    },
-    {
-      path: '/MakeOffer',
-      name: 'MakeOffer',
-      component: MakeOffer,
-    },
-    {
-      path: '/Offers',
-      name: 'Offers',
-      component: Offer,
-    },
-    {
-      path: '/timeshare/search',
-      name: 'TimeshareSearch',
-      component: TimeshareSearch,
-    },
-    {
-      path: '/searchLog',
-      name: 'SearchLog',
-      component: searchLog,
-    },
+  routes: [{
+    path: '/',
+    name: 'Home',
+    component: HomePage,
+  },
+  {
+    path: '/about/us',
+    name: 'aboutus',
+    component: AboutUs,
+  },
+  {
+    path: '/about/timeshare',
+    name: 'abouttimeshare',
+    component: AboutTimeshare,
+  },
+  {
+    path: '/communication/template',
+    name: 'template',
+    component: TemplatePage,
+  },
+  {
+    path: '/timeshare/sell',
+    name: 'TimeshareSell',
+    component: TimeshareSell,
+  },
+  {
+    path: '/timeshare/buy',
+    name: 'TimeshareBuy',
+    component: TimeshareBuy,
+  },
+  {
+    path: '/timeshare/faq',
+    name: 'TimeshareFAQ',
+    component: TimeshareFAQ,
+  },
+  {
+    path: '/timeshare/myWeeks',
+    name: 'MyWeeks',
+    component: MyWeeksPage,
+  },
+  {
+    path: '/user/login',
+    name: 'Login',
+    component: Login,
+  },
+  {
+    path: '/user/updateProfileInfo',
+    name: 'UpdateInfo',
+    component: UpdateInfo,
+  },
+  {
+    path: '/user/register',
+    name: 'PrivateIndividual',
+    component: PrivateIndividual,
+  },
+  {
+    path: '/user/registeragency',
+    name: 'Agency',
+    component: Agency,
+  },
+  {
+    path: '/property/property/:id',
+    name: 'PropertyPage',
+    component: PropertyPage,
+  },
+  {
+    path: '/property/:propertyUsageType/search',
+    name: 'PropertySearch',
+    component: PropertySearch,
+  },
+  {
+    path: '/property/search',
+    name: 'PropertySearchTab',
+    component: PropertySearch,
+  },
+  {
+    path: '/property/new/:saleType',
+    name: 'PropertyNew',
+    component: PropertyCreate,
+  },
+  {
+    path: '/property/new/:propertyUsageType/:saleType',
+    name: 'PropertyNewFromSearch',
+    component: PropertyCreate,
+  },
+  {
+    path: '/property/edit',
+    name: 'PropertyEdit',
+    component: PropertyEdit,
+  },
+  {
+    path: '/property/admin/list/:by',
+    name: 'PropertyListAdmin',
+    component: PropertyList,
+  },
+  {
+    path: '/propertyTypes/list',
+    name: 'PropertyTypeList',
+    component: PropertyTypeList,
+  },
+  {
+    path: '/propertyType/new',
+    name: 'PropertyTypeNew',
+    component: PropertyType,
+  },
+  {
+    path: '/propertyType/:id',
+    name: 'PropertyTypeEdit',
+    component: PropertyType,
+  },
+  {
+    path: '/userDefinedGroups/list',
+    name: 'UserDefinedGroupsList',
+    component: UserDefinedGroups,
+  },
+  {
+    path: '/userDefinedGroups/userDefinedGroup/:id',
+    name: 'UserDefinedGroupEdit',
+    component: UserDefinedGroup,
+  },
+  {
+    path: '/userDefinedGroups/userDefinedGroup',
+    name: 'UserDefinedGroupNew',
+    component: UserDefinedGroup,
+  },
+  {
+    path: '/status/list',
+    name: 'StatusList',
+    component: Status,
+  },
+  {
+    path: '/status/timeshareAdmin',
+    name: 'TimeshareAdmin',
+    component: timeshareAdminPage,
+  },
+  {
+    path: '/status/tenderWeekAdmin',
+    name: 'TenderWeekAdmin',
+    component: tenderWeekAdminPage,
+  },
+  {
+    path: '/status/userManagementPage',
+    name: 'userManagementPage',
+    component: userManagementPage,
+  },
+  {
+    path: '/status/agentUserManagementPage',
+    name: 'agentManagementPage',
+    component: agentManagementPage,
+  },
+  {
+    path: '/status/changeLogPage',
+    name: 'changeLogPage',
+    component: changeLogPage,
+  },
+  {
+    path: '/unitConfiguration/list',
+    name: 'UnitConfiguration',
+    component: UnitConfiguration,
+  },
+  {
+    path: '/contactus',
+    name: 'ContactUs',
+    component: ContactUs,
+  },
+  {
+    path: '/privacypolicy',
+    name: 'PrivacyPolicy',
+    component: PrivacyPolicy,
+  },
+  {
+    path: '/resort/:resortCode',
+    name: 'ResortPage',
+    component: ResortPage,
+    props: true,
+  },
+  {
+    path: '/resort/:resortCode/:unitNumber',
+    name: 'UnitPage',
+    component: UnitPage,
+    props: true,
+  },
+  {
+    path: '/timeshare/:weekId',
+    name: 'TimeshareSell',
+    component: TimeshareSell,
+    props: true,
+  },
+  {
+    path: '/MakeOffer',
+    name: 'MakeOffer',
+    component: MakeOffer,
+  },
+  {
+    path: '/Offers',
+    name: 'Offers',
+    component: Offer,
+  },
+  {
+    path: '/timesharesearch',
+    name: 'TimeshareSearch',
+    component: TimeshareSearch,
+  },
+  {
+    path: '/searchLog',
+    name: 'SearchLog',
+    component: searchLog,
+  },
   ],
 });

src/store/index.js

@@ -5,7 +5,7 @@ import TimeshareModule from './modules/timeshare/timeshare';
 import UsersModule from './modules/users';
 import StatusModule from './modules/timeshare/status';
 import UnitConfigurationModule from './modules/timeshare/unitConfiguration';
-import TimeshareBuyModule from './modules/timeshare/buyPage';
+import RegionModule from './modules/timeshare/region';
 import SearchTabModule from './modules/searchTab';
 import ResortModule from './modules/timeshare/resort';
 import PropertyModule from './modules/property/property';
@@ -32,7 +32,7 @@ export default new Vuex.Store({
     users: UsersModule,
     status: StatusModule,
     unitConfiguration: UnitConfigurationModule,
-    timeshareBuy: TimeshareBuyModule,
+    region: RegionModule,
     searchTab: SearchTabModule,
     resort: ResortModule,
     property: PropertyModule,

src/store/modules/timeshare/myWeeks.js

@@ -1,10 +1,25 @@
+import axios from 'axios';
+
 export default {
   namespaced: true,
   state: {
     test: 'kobus',
     items: [],
   },
-  mutations: {},
+  mutations: {
+    setItems(state, list) {
+      state.items = list;
+    },
+  },
   getters: {},
-  actions: {},
+  actions: {
+    getItems({
+      commit,
+    }, id) {
+      axios.get(`/api/timeshareweek/getMyWeek/${id}`).then(r => commit('setItems', r.data)).catch(
+        console
+          .error,
+      );
+    },
+  },
 };

src/store/modules/timeshare/buyPage.js → src/store/modules/timeshare/region.js

@@ -1,8 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
 import axios from 'axios';
-import _ from 'lodash';
-import resort from './resort';
 
 export default {
   namespaced: true,
@@ -10,37 +8,45 @@ export default {
     regions: [],
     detailedRegion: [],
     availRegion: [],
-    resort: {},
+    initFlag: false,
   },
   mutations: {
-    clearAvail(state, avail) {
-      state.availRegion = [];
+    addItem(state, item) {
+      state[item.name].push(item.value);
     },
-    addAvail(state, avail) {
-      state.availRegion.push(avail);
-    },
-    setRegions(state, regions) {
-      state.regions = regions;
-    },
-    clearDetailed(state) {
-      state.detailedRegion = [];
-    },
-    addDetailed(state, detailed) {
-      state.detailedRegion.push(detailed);
-    },
-    setResort(state, resort) {
-      state.resort = resort;
+    setItem(state, item) {
+      state[item.name] = item.value;
     },
   },
   getters: {},
   actions: {
     init({
+      state,
+      commit,
+      dispatch,
+    }) {
+      if (!state.initFlag) {
+        commit('setItem', {
+          name: 'availRegion',
+          value: [],
+        });
+        dispatch('getAvail');
+        dispatch('getRegions');
+        commit('setItem', {
+          name: 'initFlag',
+          value: true,
+        });
+      }
+    },
+    forceInit({
       commit,
       dispatch,
     }) {
-      commit('clearAvail');
-      dispatch('getAvail');
-      dispatch('getRegions');
+      commit('setItem', {
+        name: 'initFlag',
+        value: false,
+      });
+      dispatch('init');
     },
     getAvail({
       commit,
@@ -75,7 +81,10 @@ export default {
             }
             newRegion.resorts.push(newResort);
           }
-          commit('addAvail', newRegion);
+          commit('addItem', {
+            name: 'availRegion',
+            value: newRegion,
+          });
         }
       }).catch(
         console
@@ -86,12 +95,18 @@ export default {
       commit,
       dispatch,
     }) {
-      commit('clearDetailed');
+      commit('setItem', {
+        name: 'detailedRegion',
+        value: [],
+      });
       axios.get(
         'https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/regions/list/ZA/',
       )
         .then((result) => {
-          commit('setRegions', result.data);
+          commit('setItem', {
+            name: 'regions',
+            value: result.data,
+          });
           if (result.data) {
             for (const i in result.data) {
               const region = result.data[i];
@@ -101,18 +116,6 @@ export default {
         })
         .catch(console.error);
     },
-    getResort({
-      commit,
-    }, resortCode) {
-      axios.get(
-        `https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/${
-          resortCode}`,
-      )
-        .then((result) => {
-          commit('setResort', result.data);
-        })
-        .catch(console.error);
-    },
     getDetailedRegion({
       commit,
     }, region) {
@@ -120,11 +123,14 @@ export default {
         axios
           .get(`https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/${
             region.regionCode}/`)
-          .then(result => commit('addDetailed', {
-            id: region.id,
-            regionCode: region.regionCode,
-            regionName: region.regionName,
-            resorts: result.data,
+          .then(result => commit('addItem', {
+            name: 'detailedRegion',
+            value: {
+              id: region.id,
+              regionCode: region.regionCode,
+              regionName: region.regionName,
+              resorts: result.data,
+            },
           }))
           .catch(console.error);
       }

src/store/modules/timeshare/timeshare.js

@@ -49,27 +49,8 @@ export default {
       mandate: undefined,
       status: undefined,
       owner: {
-        name: undefined,
-        surname: undefined,
-        idNumber: undefined,
-        companyRegNumber: undefined,
-        maritalStatus: undefined,
-        emailAddress: undefined,
-        cellNumber: undefined,
-        landlineNumber: undefined,
-        address: {
-          streetNumber: undefined,
-          streetName: undefined,
-          suburb: undefined,
-          city: undefined,
-          province: undefined,
-          postalCode: undefined,
-        },
-        bankingDetails: {
-          bank: undefined,
-          accountNumber: undefined,
-          accountHolder: undefined,
-        },
+        address: {},
+        bankingDetails: {},
       },
     },
   },
@@ -118,6 +99,9 @@ export default {
     displayResult(state) {
       state.result = 'Week has been added ^-^';
     },
+    setWeekDetail(state, week) {
+      state.sellItem = week;
+    },
   },
   getters: {
     getRegionCode(state) {
@@ -143,7 +127,7 @@ export default {
     initTimeshare({
       commit,
       dispatch,
-    }) {
+    }, timeshareId) {
       commit('setResortBedrooms', MyData.resortBedrooms);
       commit('setMaxSleep', MyData.maxBedrooms);
       commit('setBankedEntities', MyData.bankedEntities);
@@ -152,6 +136,20 @@ export default {
       dispatch('getAgencies');
       dispatch('getResorts');
       dispatch('getRegions');
+      if (timeshareId && timeshareId !== 0) {
+        dispatch('getWeekDetail', timeshareId);
+      }
+    },
+    getWeekDetail({
+      commit,
+    }, timeshareId) {
+      axios
+        .get(`api/timeshareweek/${timeshareId}`)
+        .then((result) => {
+          console.log(result.data);
+          commit('setWeekDetail', result.data);
+        })
+        .catch(console.error);
     },
     getSeasons({
       commit,

src/store/modules/timeshare/week.js

@@ -6,22 +6,21 @@ import axios from 'axios';
 export default {
   namespaced: true,
   state: {
-    week: undefined,
+    currentWeek: undefined,
   },
   mutations: {
     setWeek(state, week) {
-      if (week.length > 0) {
-        state.week = week[0];
-      }
+      state.currentWeek = week;
     },
   },
   getters: {},
   actions: {
     initWeek({
       commit,
-    }, weekId) {
-      axios.get(`/api/timeshareweek/${weekId}`).then(r => commit('setWeek', r.data)).catch(console
-        .error);
+    }, week) {
+      commit('setWeek', week);
+      // axios.get(`/api/timeshareweek/${weekId}`).then(r => commit('setWeek', r.data)).catch(console
+      //  .error);
     },
   },
 };

src/store/modules/timeshare/weekList.js

@@ -46,7 +46,6 @@ export default {
   },
   getters: {
     filteredWeeks: (state) => {
-      console.log(JSON.stringify(state.filter));
       let weekList = state.weeks;
       const {
         filter,
@@ -111,6 +110,17 @@ export default {
     getRegions(state, getters, rootState, rootGetters) {
       return rootGetters['timeshare/getRegionCode']('KK');
     },
+    weekById(state) {
+      return (resortCode, unitNumber) => {
+        const w = state.weeks.find(week => week.resort !== undefined && week.resort.resortCode
+          === resortCode && week.unitNumber === unitNumber);
+        console.log(resortCode, unitNumber);
+
+        if (w) {
+          return w;
+        }
+      };
+    },
   },
   actions: {
     applyResortFilter({