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

src/components/processFlow/makeOffer.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- eslint-disable max-len -->
   <div style="padding-left:50px; padding-right:50px; padding-bottom:50px;">
-    <div>
+    <div v-if="!isSaved">
       <br />
       <div v-if="isProperty">
         <div class="form-group row">
@@ -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.resort }}</h3>
+              <h3 class="title-d">{{ item.resort.resortName }}</h3>
             </div>
           </div>
         </div>
@@ -40,7 +40,7 @@
                 id="resort"
                 name="resortunit"
                 disabled
-                v-model="item.unit"
+                v-model="item.unitNumber"
               />
             </div>
           </div>
@@ -58,7 +58,7 @@
                 id="week"
                 name="resortWeek"
                 disabled
-                v-model="item.module"
+                v-model="item.weekNumber"
               />
             </div>
           </div>
@@ -73,7 +73,7 @@
                 <b>R</b>
               </span>
             </div>
-            <input class="form-control" type="number" v-model="item.price" disabled />
+            <input class="form-control" type="number" v-model="item.sellPrice" disabled />
           </div>
         </div>
         <div class="col-md-6">
@@ -102,92 +102,131 @@
           <textarea
             class="form-control editor form-control-lg form-control-a"
             name="description"
-            v-model="item.comments"
+            v-model="item.comment"
             :disabled="!isMakeOffer"
           ></textarea>
         </div>
       </div>
     </div>
-    <div class="container">
+    <div v-if="!isSaved" class="container">
       <button
         v-if="isMakeOffer"
         type="button"
         @click="SendOffer()"
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
-        data-dismiss="modal"
       >Send Offer</button>
       <button
-        v-if="!isMakeOffer && !isDecline"
+        v-if="!isMakeOffer && !isDecline && canEdit"
         type="submit"
         @click="Accept()"
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
-        data-dismiss="modal"
       >Accept</button>
       <button
-        v-if="!isMakeOffer && !isDecline"
+        v-if="!isMakeOffer && !isDecline && canEdit"
         type="button"
         @click="Decline()"
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
       >Decline</button>
-      <div v-if="isDecline" class="form-group row">
-        <div class="col-md-12">
-          <br />
-          <label>Decline Reason</label>
-          <textarea class="form-control editor form-control-lg form-control-a" name="description"></textarea>
-        </div>
+    </div>
+    <div v-if="isDecline || item.statusCode === 'E3'" class="form-group row">
+      <div class="col-md-12">
+        <br />
+        <label>Decline Reason</label>
+        <textarea
+          class="form-control editor form-control-lg form-control-a"
+          name="description"
+          v-model="item.declineReason"
+          :disabled="item.statusCode === 'E3'"
+        ></textarea>
+      </div>
+    </div>
+    <button
+      v-if="isDecline"
+      type="button"
+      @click="Complete()"
+      class="btn btn-b-n"
+      style="width: 150px; height:40px;"
+    >Complete</button>
+    <div v-if="isSaved">
+      <div class="form-group row">
+        <br />
+        <label>{{ message }}</label>
       </div>
       <button
-        v-if="isDecline"
+        v-if="isSaved"
         type="button"
-        @click="Complete()"
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
         data-dismiss="modal"
-      >Complete</button>
+      >OK</button>
     </div>
   </div>
 </template>
 
 <script>
+import { mapState, mapActions } from 'vuex';
+
 export default {
   name: 'MakeOffer',
   props: {
     isMakeOffer: Boolean,
     isProperty: Boolean,
+    canEdit: Boolean,
     item: Object,
+    bidId: Number,
+    updateItem: Function,
   },
   data() {
     return {
       isDecline: false,
+      isSaved: false,
+      message: '',
     };
   },
   methods: {
+    ...mapActions('bid', ['getBid', 'saveBid', 'acceptBid', 'declineBid']),
     SendOffer() {
-      // Save Offer data
+      this.getBid(0);
+      this.bidItem.id = 0;
+      this.bidItem.amount = this.item.offer;
+      this.bidItem.comment = this.item.comment;
+      if (this.isProperty) {
+        this.bidItem.propertyId = this.item.id;
+      } else {
+        this.bidItem.timeshareWeekId = this.item.id;
+      }
+      this.saveBid(this.bidItem);
+
+      this.item = [];
+      this.isSaved = true;
+      this.message = 'Offer was submitted.';
     },
     Accept() {
-      // Accept Offer
+      this.acceptBid(this.item.id);
+      this.isSaved = true;
+      this.message = 'Offer Accepted.';
     },
     Decline() {
       this.isDecline = true;
     },
     Complete() {
       this.isDecline = false;
+
+      const decline = {
+        id: this.item.id,
+        comment: this.item.declineReason,
+      };
+
+      this.declineBid(decline);
+      this.isSaved = true;
+      this.message = 'Offer Declined.';
     },
-    Close() {},
+  },
+  computed: {
+    ...mapState('bid', ['bidItem']),
   },
 };
 </script>
-
-<style scoped>
-.myWell {
-  width: 100%;
-  background-color: rgba(217, 217, 217, 0.85);
-  border-radius: 6px;
-  padding: 5px;
-  margin: 3px;
-}
-</style>

src/components/processFlow/offers.vue

@@ -20,14 +20,21 @@
           <tr>
             <th>Type</th>
             <th>Description</th>
+            <th>Status</th>
+            <th>Price</th>
+            <th>Offered Price</th>
+            <th>Offer By</th>
             <th></th>
           </tr>
         </thead>
         <tbody>
-          <tr v-for="(item, i) in items" :key="i">
-            <td v-if="item.isProperty">Property</td>
-            <td v-else>Timeshare</td>
-            <td>{{ item.uid }}</td>
+          <tr v-for="(item, i) in bidItems" :key="i">
+            <td>{{ item.type }}</td>
+            <td>{{ item.shortDescription }}</td>
+            <td>{{ item.status }}</td>
+            <td>R {{ formatPrice(item.price) }}</td>
+            <td>R {{ formatPrice(item.offer) }}</td>
+            <td>{{ item.madeBy }}</td>
             <td>
               <button
                 type="button"
@@ -46,7 +53,8 @@
                       <makeOffer
                         name="MakeOffer"
                         :isMakeOffer="false"
-                        :isProperty="item.isProperty"
+                        :isProperty="item.type === 'Property'"
+                        :canEdit="item.statusCode === 'E1'"
                         :item="item"
                       />
                     </div>
@@ -62,6 +70,7 @@
 </template>
 
 <script>
+import { mapState, mapActions } from 'vuex';
 import makeOffer from './makeOffer.vue';
 
 export default {
@@ -70,40 +79,25 @@ export default {
   data() {
     return {
       item: {},
-      items: [
-        {
-          isProperty: true,
-          uid: '1 - 2 Bedroom House',
-          id: 1,
-          shortDescription: '2 Bedroom House',
-          description: '<div><i>Property Description</i></div>',
-          price: 1000,
-          offer: 1500,
-          comments: 'Bla Bla Bla',
-        },
-        {
-          isProperty: false,
-          uid: 'NL N18 359',
-          id: 2,
-          shortDescription: '',
-          description: '',
-          price: 85000,
-          offer: 90000,
-          comments: 'I want to go....',
-          resort: 'Ngwenya Lodge',
-          unit: '359',
-          week: 'N18',
-          module: '359/N18 River View',
-        },
-      ],
     };
   },
-  //   methods: {
-  //     SetItem(data) {
-  //       this.item = data;
-  //       const element = this.$refs.modal.$el;
-  //       $(element).modal('show');
-  //     },
-  //   },
+  methods: {
+    ...mapActions('bid', ['getBids']),
+    // SetItem(data) {
+    //   this.item = data;
+    //   const element = this.$refs.modal.$el;
+    //   $(element).modal('show');
+    // },
+    formatPrice(value) {
+      const val = (value / 1).toFixed(2);
+      return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
+    },
+  },
+  computed: {
+    ...mapState('bid', ['bidItems']),
+  },
+  mounted() {
+    this.getBids();
+  },
 };
 </script>

src/components/property/propertyPage.vue

@@ -1,17 +1,22 @@
 <template>
   <!-- eslint-disable max-len -->
   <div v-if="property">
-    <section class="intro-single">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 col-lg-8">
-            <div class="title-single-box">
-              <h1 class="title-single">{{ property.shortDescription }}</h1>
-            </div>
+    <div class="container">
+      <br />
+      <br />
+      <br />
+      <br />
+      <div class="row">
+        <div class="col-md-12 col-lg-8">
+          <div class="title-box-d">
+            <h1
+              class="title-d"
+              style="text-align:left; font-size: 250%"
+            >{{ property.shortDescription }}</h1>
           </div>
         </div>
       </div>
-    </section>
+    </div>
     <!--/ Intro Single End /-->
 
     <!--/ property Single Star /-->
@@ -32,13 +37,17 @@
                 <div class="row">
                   <div class="col-sm-12">
                     <div class="title-box-d">
-                      <h3 class="title-d">Property Description</h3>
+                      <h3 class="title-d" style="text-align:left">Property Description</h3>
                     </div>
                   </div>
                 </div>
-                <div class="property-description" v-html="property.description" />
+                <div
+                  class="property-description"
+                  style="text-align:left"
+                  v-html="property.description"
+                />
                 <div v-for="display in property.displayData" :key="display.id">
-                  <div class="row section-t3">
+                  <div class="row section-t3" style="text-align:left">
                     <div class="col-sm-12">
                       <div class="title-box-d">
                         <h3 class="title-d">{{ display.groupName }}</h3>
@@ -57,21 +66,22 @@
               </div>
               <div class="col-md-5 col-lg-4">
                 <div class="property-price d-flex justify-content-center foo">
-                  <div class="card-header-c d-flex">
-                    <div class="card-box-ico">
-                      <span class="ion-money">R</span>
-                    </div>
+                  <!-- <div class="card-header-c d-flex"> -->
+                  <div style="width: 300px; height: 80px; border-style: solid; color: #60CBEB;">
+                    <!-- <span class="ion-money">R</span> -->
+
                     <div class="card-title-c align-self-center">
-                      <h5 class="title-c">{{ formatPrice(property.price) }}</h5>
+                      <h5 class="title-c">R{{ formatPrice(property.price) }}</h5>
                       <h6 v-if="property.pricePer">Per {{property.pricePer}}</h6>
                     </div>
                   </div>
+                  <!-- </div> -->
                 </div>
                 <div class="property-summary">
                   <div class="row">
                     <div class="col-sm-12">
                       <div class="title-box-d section-t4">
-                        <h3 class="title-d">Summary</h3>
+                        <h3 class="title-d" style="text-align:left">Summary</h3>
                       </div>
                     </div>
                   </div>
@@ -83,8 +93,9 @@
                       </li>
                       <li class="d-flex justify-content-between">
                         <strong>Status:</strong>
-                        <span v-if="property.isSale">Sale</span>
-                        <span v-else>Rental</span>
+                        <span
+                          v-if="property.status"
+                        >{{ property.status.code }} - {{ property.status.description }}</span>
                       </li>
                       <li class="d-flex justify-content-between">
                         <strong>Address:</strong>
@@ -126,7 +137,7 @@
                   <div class="row section-t3">
                     <div class="col-sm-12">
                       <div class="title-box-d">
-                        <h3 class="title-d">Contact Agent</h3>
+                        <h3 class="title-d" style="text-align:left">Contact Agent</h3>
                       </div>
                     </div>
                   </div>
@@ -235,10 +246,11 @@
                               </div>
                             </div>
                             <div class="col-md-12">
-                              <button type="submit" class="btn btn-a">Send Message</button>
+                              <button type="submit" class="btn btn-b-n">Send Message</button>
                             </div>
                           </div>
                         </form>
+                        <br />
                       </div>
                     </div>
                   </div>

src/components/property/propertySearchPage.vue

@@ -55,12 +55,7 @@
         </div>
       </div>
       <div>
-        <propertyCard
-          v-if="properties.length > 0"
-          name="propertyholder"
-          :properties="properties"
-          :key="propertysearch"
-        />
+        <propertyCard v-if="properties.length > 0" name="propertyholder" :properties="properties" />
         <div v-if="properties.length === 0">
           <img src="../../../public/img/no-homes.gif" />
           <br />

src/components/property/propertyeditPage.vue

@@ -22,7 +22,7 @@
       <div class="row">
         <div class="container col-md-10">
           <div class="title-box-d">
-            <h5 class="title-d">Property Overview</h5>
+            <h5 class="title-d" style="text-align:left">Property Overview</h5>
           </div>
         </div>
       </div>
@@ -276,12 +276,8 @@
               @click="SubmitData()"
               class="btn btn-b-n"
               style="width: 85px; height:40px;"
-            >
-              <!-- <span class="spinner-border" role="status" aria-hidden="true"></span>
-              <span class="sr-only">Loading...</span>-->
-              Save
-            </button>
-            <label v-if="wait">Please wait...</label>
+            >Save</button>
+            <div v-if="wait" id="preloader"></div>
           </form>
         </div>
       </div>

src/components/shared/searchTab.vue

@@ -101,7 +101,7 @@
           </div>
           {{selectedPropertyType}}
           <div class="col-md-12">
-            <button type="submit" class="btn btn-b" @click="Search">Search</button>
+            <button type="submit" class="btn btn-b-n" @click="Search">Search</button>
           </div>
         </div>
       </form>

src/components/timeshare/buy/weekListComponent.vue

@@ -1,15 +1,12 @@
 <template>
   <div>
-    <button @click="addDummyWeek" class="btn btn-primary">Add Dummy</button>
     <table class="table table-bordered">
       <thead>
         <tr>
           <th>Resort</th>
           <th>Unit Number</th>
           <th>Week Number</th>
-          <th>Module</th>
           <th>Bedrooms</th>
-          <th>Season</th>
           <th>Price</th>
           <th>Status</th>
           <th>Interested</th>
@@ -20,12 +17,37 @@
           <td>{{item.resort.resortName}}</td>
           <td>{{item.unitNumber}}</td>
           <td>{{item.weekNumber}}</td>
-          <td>{{item.module}}</td>
           <td>{{item.bedrooms}}</td>
-          <td>{{item.season}}</td>
-          <td>{{item.sellPrice}}</td>
+          <td>{{item.sellPrice | toCurrency}}</td>
           <td>{{item.status ? item.status.description : ''}}</td>
-          <td></td>
+          <td>
+            <div class="col-md-12">
+              <button
+                type="button"
+                class="btn btn-b-n"
+                data-toggle="modal"
+                data-target="#myModal"
+              >Make an Offer</button>
+              <div id="myModal" class="modal fade" role="dialog">
+                <div class="modal-dialog modal-lg">
+                  <!-- Modal content-->
+                  <div class="modal-content">
+                    <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div padding-left="20px">
+                      <makeOffer
+                        name="MakeOffer"
+                        :isMakeOffer="true"
+                        :isProperty="false"
+                        :item="item"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </td>
         </tr>
       </tbody>
     </table>
@@ -33,8 +55,12 @@
 </template>
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
+import makeOffer from '../../processFlow/makeOffer.vue';
 
 export default {
+  components: {
+    makeOffer,
+  },
   computed: {
     ...mapState('weekList', ['weeks']),
     ...mapGetters({
@@ -42,7 +68,7 @@ export default {
     }),
   },
   mounted() {
-    this.addDummyWeek();
+    this.getWeeks();
   },
   methods: {
     ...mapActions('weekList', ['getWeeks', 'addDummyWeek']),

src/components/timeshare/buy/weekListPage.vue

@@ -7,7 +7,6 @@
     <br />
     <br />
     <br />
-    {{filter}}
     <WeekListComponent />
   </div>
 </template>

src/components/timeshare/resort/resortPage.vue

@@ -1,11 +1,15 @@
 <template>
   <!-- eslint-disable max-len -->
   <section>
-    <div class="container intro-single">
+    <div class="container">
+      <br />
+      <br />
+      <br />
+      <br />
       <div class="row">
         <div class="col-md-12 col-lg-8">
-          <div class="title-single-box">
-            <h1 class="title-single" style="text-align:left;">{{resort.prName}}</h1>
+          <div class="title-box-d">
+            <h1 class="title-d" style="text-align:left; font-size: 250%">{{resort.prName}}</h1>
           </div>
           <br />
         </div>
@@ -25,7 +29,7 @@
     <div class="myMargin">
       <div class="row">
         <div class="col-md-3">
-          <h3>Filter Resort</h3>
+          <h4>Filter Resort</h4>
           <form
             id="mainForm"
             method="POST"

src/components/timeshare/resort/unitPage.vue

@@ -5,11 +5,10 @@
     <br />
     <br />
     <br />
-    <br />
     <div class="row">
       <div class="col-md-12 col-lg-8">
         <div class="title-box-d">
-          <h1 class="title-d" style="text-align:left;">{{resort.prName}}</h1>
+          <h1 class="title-d" style="text-align:left; font-size: 250%">{{resort.prName}}</h1>
         </div>
         <br />
       </div>
@@ -111,15 +110,16 @@
               </div>
               <div class="col-md-6">
                 <label for="price">Price</label>
-                <div class="property-price d-flex justify-content-center foo">
-                  <div class="card-header-c d-flex">
-                    <div class="card-box-ico">
-                      <span class="ion-money">R</span>
-                    </div>
-                    <div class="card-title-c align-self-center">
-                      <h5 class="title-c">{{ formatPrice(week.price) }}</h5>
-                    </div>
+                <div class="property-price d-flex">
+                  <!-- <div class="card-header-c d-flex"> -->
+                  <div style="width: 260px; height: 70px; border-style: solid; color: #60CBEB;">
+                    <!-- <div class="card-title-c align-self-center"> -->
+                    <a class="justify-content-center" style="color: black; font-size: 250%">
+                      <b>R{{ formatPrice(week.price) }}</b>
+                    </a>
+                    <!-- </div> -->
                   </div>
+                  <!-- </div> -->
                 </div>
               </div>
             </div>

src/components/timeshare/searchTimeshare.vue

@@ -7,29 +7,76 @@
       accept-charset="UTF-8"
       enctype="multipart/form-data"
     >
-      {{filter}}
       <div class="form-group text-left">
-        <label>Region</label>
-        <select class="form-control" name="region" id="region" v-model="filter.region">
-          <option v-for="(item, i) in regions" :key="i" :value="item">{{item.regionName}}</option>
-        </select>
+        <label>Province</label>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>P</b>
+            </span>
+          </div>
+          <select class="form-control" name="region" id="region" v-model="filter.region">
+            <option v-for="(item, i) in regions" :key="i" :value="item">{{item.regionName}}</option>
+          </select>
+          <div class="input-group-append" @click="clearFilter('region')">
+            <span class="input-group-text cursor-pointer" style="color: #60CBEB">
+              <b>X</b>
+            </span>
+          </div>
+        </div>
       </div>
       <div class="form-group text-left">
         <label>Resort Name</label>
-        <select class="form-control" name="resort" id="resort" v-model="filter.resort">
-          <option v-for="(item, i) in filteredResorts" :key="i" :value="item">{{item.resortName}}</option>
-        </select>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>RN</b>
+            </span>
+          </div>
+          <select class="form-control" name="resort" id="resort" v-model="filter.resort">
+            <option v-for="(item, i) in filteredResorts" :key="i" :value="item">{{item.resortName}}</option>
+          </select>
+          <div class="input-group-append" @click="clearFilter('resort')">
+            <span class="input-group-text cursor-pointer" style="color: #60CBEB">
+              <b>X</b>
+            </span>
+          </div>
+        </div>
       </div>
       <div class="form-group text-left">
         <label>Bedrooms</label>
-        <select class="form-control" name="bedrooms" v-model="filter.bedrooms">
-          <option v-for="(item, i) in resortBedrooms" :key="i">{{item}}</option>
-        </select>
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>Bed</b>
+            </span>
+          </div>
+          <select class="form-control" name="bedrooms" v-model="filter.bedrooms">
+            <option v-for="(item, i) in resortBedrooms" :key="i">{{item}}</option>
+          </select>
+          <div class="input-group-append" @click="clearFilter('bedrooms')">
+            <span class="input-group-text cursor-pointer" style="color: #60CBEB">
+              <b>X</b>
+            </span>
+          </div>
+        </div>
       </div>
       <hr />
       <div class="form-group text-left">
         <label>Date</label>
-        <input type="date" class="form-control" name="arrivaldate" v-model="filter.date" />
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <span class="input-group-text" style="color: #60CBEB">
+              <b>D</b>
+            </span>
+          </div>
+          <input type="date" class="form-control" name="arrivaldate" v-model="filter.date" />
+          <div class="input-group-append" @click="clearFilter('date')">
+            <span class="input-group-text cursor-pointer" style="color: #60CBEB">
+              <b>X</b>
+            </span>
+          </div>
+        </div>
       </div>
       <hr />
       <div class="form-group">
@@ -38,7 +85,9 @@
             <label>Minimum Price</label>
             <div class="input-group mb-3">
               <div class="input-group-prepend">
-                <span class="input-group-text">R</span>
+                <span class="input-group-text" style="color: #60CBEB">
+                  <b>R</b>
+                </span>
               </div>
               <input
                 class="form-control"
@@ -49,13 +98,20 @@
                 placeholder="Minimum Price"
                 v-model="filter.minPrice"
               />
+              <div class="input-group-append" @click="clearFilter('minPrice')">
+                <span class="input-group-text cursor-pointer" style="color: #60CBEB">
+                  <b>X</b>
+                </span>
+              </div>
             </div>
           </div>
           <div class="col-md-6 text-left">
             <label>Maximum Price</label>
             <div class="input-group mb-3">
               <div class="input-group-prepend">
-                <span class="input-group-text">R</span>
+                <span class="input-group-text" style="color: #60CBEB">
+                  <b>R</b>
+                </span>
               </div>
               <input
                 class="form-control"
@@ -66,11 +122,15 @@
                 placeholder="Maximum Price"
                 v-model="filter.maxPrice"
               />
+              <div class="input-group-append" @click="clearFilter('maxPrice')">
+                <span class="input-group-text cursor-pointer" style="color: #60CBEB">
+                  <b>X</b>
+                </span>
+              </div>
             </div>
           </div>
         </div>
       </div>
-      {{filter}}
     </form>
   </div>
 </template>
@@ -80,9 +140,6 @@ import { mapState, mapActions } from 'vuex';
 import _ from 'lodash';
 
 export default {
-  props: {
-    filter: undefined,
-  },
   created() {
     this.initTimeshare();
   },
@@ -108,6 +165,7 @@ export default {
   },
   methods: {
     ...mapActions('timeshare', ['initTimeshare']),
+    ...mapActions('weekList', ['clearFilter']),
   },
 };
 </script>

src/main.js

@@ -8,6 +8,16 @@ Vue.use(EvaIcons);
 
 Vue.config.productionTip = false;
 
+Vue.filter('toCurrency', (value) => {
+  if (typeof value !== 'number') {
+    return value;
+  }
+  const formatter = new Intl.NumberFormat('en-US', {
+    minimumFractionDigits: 2,
+  });
+  return `R ${formatter.format(value)}`;
+});
+
 new Vue({
   render: h => h(App),
   router,

src/store/index.js

@@ -15,6 +15,7 @@ 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 Bid from './modules/processFlow/bid';
 
 Vue.use(Vuex);
 /* eslint no-param-reassign: ["error", { "props": false }] */
@@ -35,5 +36,6 @@ export default new Vuex.Store({
     registerIndividual: Register,
     registerAgency: Register,
     weekList: WeekList,
+    bid: Bid,
   },
 });

src/store/modules/processFlow/bid.js

@@ -0,0 +1,63 @@
+import axios from 'axios';
+
+export default {
+  namespaced: true,
+  state: {
+    bidItem: {},
+    bidItems: [],
+  },
+  mutations: {
+    setBid(state, bid) {
+      state.bidItem = bid;
+    },
+    setBids(state, bid) {
+      state.bidItems = bid;
+    },
+    addToBids(state, bid) {
+      state.bidItems.push(bid);
+    },
+    updateBidList(state, bid) {
+      state.bidItems.find(item => item.id === bid.id).status = bid.status;
+      console.log(JSON.stringify(bid));
+    },
+  },
+  getters: {},
+  actions: {
+    getBid({ commit }, id) {
+      axios
+        .get(`/api/bid/${id}`)
+        .then(result => commit('addToBids', result.data))
+        .catch(console.error);
+    },
+    getBids({ commit }) {
+      axios
+        .get('/api/bid/GetBids/hjsdhj')
+        .then(result => commit('setBids', result.data))
+        .catch(console.error);
+    },
+    saveBid({ commit }, item) {
+      axios
+        .post('/api/bid', item)
+        .then(result => commit('setBid', result.data))
+        .catch(console.error);
+    },
+    updateBid({ commit }, item) {
+      axios
+        .put('/api/bid', item)
+        .then(result => commit('setBid', item))
+        .catch(console.error);
+    },
+    acceptBid({ commit }, id) {
+      axios
+        .put(`/api/bid/AcceptBid/${id}`)
+        .then(result => commit('updateBidList', result.data))
+        .catch(console.error);
+    },
+    declineBid({ commit }, item) {
+      axios
+        .put('/api/bid/DeclineBid', item)
+        .then(result => commit('updateBidList', result.data))
+        .catch(console.error);
+    },
+  },
+};

src/store/modules/timeshare/weekList.js

@@ -17,6 +17,9 @@ export default {
     },
   },
   mutations: {
+    onClearFilter(state, filter) {
+      state.filter[filter] = undefined;
+    },
     setWeeks(state, weeks) {
       state.weeks = weeks;
     },
@@ -30,13 +33,14 @@ export default {
       const {
         filter,
       } = state;
+      console.log(JSON.stringify(weekList));
       if (filter) {
         if (filter.region) {
           weekList = _.filter(weekList, x => x.region
             && x.region.regionCode === filter.region.regionCode);
         }
         if (filter.resort) {
-          weekList = _.filter(weekList, x => x.resort
+          weekList = _.filter(weekList, x => x.resort.resortCode
             && x.resort.resortCode === filter.resort.resortCode);
         }
         if (filter.bedrooms) {
@@ -72,9 +76,14 @@ export default {
     }) {
       axios
         .get('/api/timeshareweek')
-        .then(result => commit('setStatusList', result.data))
+        .then(result => commit('setWeeks', result.data))
         .catch(console.error);
     },
+    clearFilter({
+      commit,
+    }, filter) {
+      commit('onClearFilter', filter);
+    },
     addDummyWeek({
       commit,
     }) {