Add Consent Timeshare Sell and ContactUs

src/components/communication/contactUsLog.vue

@@ -62,6 +62,7 @@ export default {
         'phone',
         'message',
         'mailSource',
+        'consent',
         'error',
       ],
     }

src/components/financial/payments.vue

@@ -1,21 +1,31 @@
 <template>
-  <main id="main" style="margin-top:-20px;padding-bottom:300px">
+  <main id="main" style="margin-top: -20px; padding-bottom: 300px;">
     <div class="container">
-      <div class="row">
-        <div class="col-md-12 col-lg-8">
-          <div class="section-header">
-            <h2>Payments</h2>
+      <div class="form">
+        <div class="row">
+          <div class="col-md-12 col-lg-8">
+            <div class="section-header">
+              <h2>Payments</h2>
+            </div>
           </div>
         </div>
-      </div>
-      <div v-if="checkAccess" class="row">
-        <div class="col">
-          <listView :items="payments" :showNew="false" @onEdit="Edit" @onDelete="Delete" />
+        <div v-if="checkAccess" class="row">
+          <div class="col">
+            <listView
+              :items="payments"
+              :showNew="false"
+              @onEdit="Edit"
+              @onDelete="Delete"
+            />
+          </div>
         </div>
-      </div>
-      <div v-else class="row">
-        <div class="col">
-          <alert :text="'You don\'t have permission to view this page'" :type="'ERROR'" />
+        <div v-else class="row">
+          <div class="col">
+            <alert
+              :text="'You don\'t have permission to view this page'"
+              :type="'ERROR'"
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -24,42 +34,42 @@
 
 <script>
 /* eslint-disable */
-import { mapState, mapActions } from "vuex";
+import { mapState, mapActions } from 'vuex'
 
-import Log from "../../assets/Log";
-import alert from "../shared/alert";
-import listView from "../shared/listView.vue";
+import Log from '../../assets/Log'
+import alert from '../shared/alert'
+import listView from '../shared/listView.vue'
 
 export default {
-  name: "PaymentList",
+  name: 'PaymentList',
   components: {
     listView,
-    alert
+    alert,
   },
   data() {
     return {
-      userId: Log.getUser().Id
-    };
+      userId: Log.getUser().Id,
+    }
   },
   methods: {
-    ...mapActions("payment", ["getPayments"])
+    ...mapActions('payment', ['getPayments']),
   },
   mounted() {
-    this.getPayments();
+    this.getPayments()
   },
   computed: {
-    ...mapState("payment", ["payments"]),
+    ...mapState('payment', ['payments']),
     UserChanged() {
-      this.getProperties(Object.assign(this.user.id));
-      return this.user;
+      this.getProperties(Object.assign(this.user.id))
+      return this.user
     },
     checkAccess() {
-      if (Log.getUser().role === "Super Admin") {
-        return true;
+      if (Log.getUser().role === 'Super Admin') {
+        return true
       } else {
-        return false;
+        return false
       }
-    }
-  }
-};
+    },
+  },
+}
 </script>

src/components/processFlow/offers.vue

@@ -1,41 +1,50 @@
 <template>
-  <main id="main" style="margin-top:-20px; padding-bottom:50px">
+  <main id="main" style="margin-top: -20px; padding-bottom: 50px;">
     <div class="container">
-      <div class="row">
-        <div class="col-md-12 col-lg-8">
-          <div class="section-header">
-            <h2>Bid Offers</h2>
+      <div class="form">
+        <div class="row">
+          <div class="col-md-12 col-lg-8">
+            <div class="section-header">
+              <h2>Bid Offers</h2>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="container">
-        <listView
-          :items="bidItems"
-          :showNew="false"
-          :editable="true"
-          :deleteable="false"
-          :displayColumns="columns"
-          :displayFormats="formats"
-          :displayHeaders="columnHeaders"
-          :sortKey="'date'"
-          @onEdit="Edit"
-        />
-      </div>
-      <div :id="'myModalOffer'" class="modal fade" role="dialog" :ref="'MyModalForm'">
-        <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="false"
-                :isProperty="item.type === 'Property'"
-                :canEdit="item.statusCode === 'E1'"
-                :item="item"
-              />
+        <div class="container">
+          <listView
+            :items="bidItems"
+            :showNew="false"
+            :editable="true"
+            :deleteable="false"
+            :displayColumns="columns"
+            :displayFormats="formats"
+            :displayHeaders="columnHeaders"
+            :sortKey="'date'"
+            @onEdit="Edit"
+          />
+        </div>
+        <div
+          :id="'myModalOffer'"
+          class="modal fade"
+          role="dialog"
+          :ref="'MyModalForm'"
+        >
+          <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="false"
+                  :isProperty="item.type === 'Property'"
+                  :canEdit="item.statusCode === 'E1'"
+                  :item="item"
+                />
+              </div>
             </div>
           </div>
         </div>
@@ -45,44 +54,44 @@
 </template>
 
 <script>
-import { mapState, mapActions } from "vuex";
-import makeOffer from "./makeOffer.vue";
-import listView from "../shared/listView.vue";
-import Log from "../../assets/Log";
+import { mapState, mapActions } from 'vuex'
+import makeOffer from './makeOffer.vue'
+import listView from '../shared/listView.vue'
+import Log from '../../assets/Log'
 
 export default {
-  name: "offers",
+  name: 'offers',
   components: { makeOffer, listView },
   data() {
     return {
       item: {},
       columns: [
-        "date",
-        "type",
-        "shortDescription",
-        "status",
-        "price",
-        "offer",
-        "madeBy",
+        'date',
+        'type',
+        'shortDescription',
+        'status',
+        'price',
+        'offer',
+        'madeBy',
       ],
-      formats: ["date", "text", "text", "text", "money", "money", "text"],
-      columnHeaders: ["", "", "description", "", "", "offerPrice", "offerBy"],
-    };
+      formats: ['date', 'text', 'text', 'text', 'money', 'money', 'text'],
+      columnHeaders: ['', '', 'description', '', '', 'offerPrice', 'offerBy'],
+    }
   },
   methods: {
-    ...mapActions("bid", ["getBids"]),
+    ...mapActions('bid', ['getBids']),
     Edit(item) {
-      this.item = item;
+      this.item = item
 
-      const element = this.$refs.MyModalForm;
-      $(element).modal("show");
+      const element = this.$refs.MyModalForm
+      $(element).modal('show')
     },
   },
   computed: {
-    ...mapState("bid", ["bidItems"]),
+    ...mapState('bid', ['bidItems']),
   },
   mounted() {
-    this.getBids(Log.getUser().username);
+    this.getBids(Log.getUser().username)
   },
-};
+}
 </script>

src/components/shared/contactUsSection.vue

@@ -101,6 +101,43 @@
       </div>
 
       <div class="form-group"></div>
+      <textarea
+        class="form-control"
+        name="message"
+        rows="5"
+        data-rule="required"
+        data-msg="Please write something for us"
+        placeholder="Message"
+        v-model="message"
+        v-bind:class="{
+          'is-valid': message,
+          'is-invalid': !requiredField(message) && messageLoad,
+        }"
+        v-on:keyup="messageLoad = true"
+        v-on:blur="messageLoad = true"
+      ></textarea>
+      <div class="invalid-feedback">
+        Message is required!
+      </div>
+      <div align="left" class="custom-control custom-switch mb-2">
+        <div class="row">
+          <div align="center" class="col">
+            <label class="mr-5">
+              I wish to receive future listings and special campaigns?
+            </label>
+            <input
+              type="checkbox"
+              class="custom-control-input"
+              id="contactUscustomSwitch1"
+              :checked="consent"
+              @change="changeConsent"
+            />
+            <label class="custom-control-label" for="contactUscustomSwitch1">
+              {{ consent ? 'Yes' : 'No' }}
+            </label>
+          </div>
+        </div>
+      </div>
       <div class="text-center">
         <button class="btn-white-border" @click="sendMail()">Send</button>
       </div>
@@ -132,6 +169,7 @@ export default {
       contactemail: '',
       phone: '',
       property: '',
+      consent: true,
       message: '',
       boolSent: false,
       errorOccurred: '',
@@ -169,6 +207,7 @@ export default {
           property: this.property,
           message: this.message,
           mailSourceId: this.mailSourceId,
+          consent: this.consent,
         }
         await axios
           .post('/api/mail/0', mailObj)
@@ -200,6 +239,7 @@ export default {
         this.phone = ''
         this.property = ''
         this.message = ''
+        this.consent = true
         this.mailSource = ''
         this.nameLoad = false
         this.contactemailLoad = false
@@ -212,7 +252,7 @@ export default {
     },
     validatePage: function () {
       //console.log('validatePage')
-      if (this.name && this.contactemail && this.mailSource) {
+      if (this.name && this.contactemail && this.mailSource && this.message) {
         this.errorOccurred = ''
         this.errorMessage = ''
         this.boolValidationError = false
@@ -228,6 +268,9 @@ export default {
         return false
       }
     },
+    changeConsent() {
+      this.consent = !this.consent
+    },
     requiredField: function (tfield) {
       if (tfield) {
         return true

src/components/timeshare/sell/contentSectionNew.vue

@@ -1196,6 +1196,25 @@
                     <alert :text="errorMessage" :type="errorOccurred" />
                   </div>
                 </div>
+                <div align="left" class="custom-control custom-switch mb-2">
+                  <div class="row">
+                    <div align="center" class="col">
+                      <label class="mr-5">
+                        I wish to receive future listings and special campaigns?
+                      </label>
+                      <input
+                        type="checkbox"
+                        class="custom-control-input"
+                        id="customSwitch5"
+                        :checked="sellItem.consent"
+                        @change="changeConsent"
+                      />
+                      <label class="custom-control-label" for="customSwitch5">
+                        {{ sellItem.consent ? 'Yes' : 'No' }}
+                      </label>
+                    </div>
+                  </div>
+                </div>
                 <div class="text-center col-12" v-if="CanSave">
                   <button
                     class="btn-white-border"
@@ -1591,6 +1610,9 @@ export default {
       this.sellItem.agency = undefined
       this.sellItem.referedByAgent = !this.sellItem.referedByAgent
     },
+    changeConsent() {
+      this.sellItem.consent = !this.sellItem.consent
+    },
     changeLeviesPaidInFull() {
       this.sellItem.leviesPaidInFull = !this.sellItem.leviesPaidInFull
     },
@@ -1656,6 +1678,7 @@ export default {
         this.sellItem.mandateDate = undefined
       }
     },
+
     requiredField: function (tfield) {
       if (tfield) {
         return true

src/components/user/forgotPassword.vue

@@ -1,44 +1,46 @@
 <template>
   <main id="main" style="padding-top: 10px; padding-bottom: 50px;">
-    <div class="form">
-      <div class="row">
-        <div class="col">
-          <div class="section-header">
-            <h2>Forgot Password</h2>
+    <div class="container">
+      <div class="form">
+        <div class="row">
+          <div class="col">
+            <div class="section-header">
+              <h2>Forgot Password</h2>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="row mb-4">
-        <div class="col">
-          <alert :text="errorMessage" :type="errorOccurred" />
+        <div class="row mb-4">
+          <div class="col">
+            <alert :text="errorMessage" :type="errorOccurred" />
+          </div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-md-6">
-          <float-label label="Email" style="width: 100%;">
-            <input
-              type="email"
-              id="email"
-              name="email"
-              placeholder="Email"
-              class="form-control uniInput"
-              v-model="email"
-              v-bind:class="{
-                'is-valid': email,
-                'is-invalid': !validEmail(email) && emailLoad,
-              }"
-              v-on:keyup="emailLoad = true"
-              v-on:blur="emailLoad = true"
-              required
-              icon
-            />
-            <div class="invalid-feedback">Valid Email is required!</div>
-          </float-label>
+        <div class="row">
+          <div class="col-md-6">
+            <float-label label="Email" style="width: 100%;">
+              <input
+                type="email"
+                id="email"
+                name="email"
+                placeholder="Email"
+                class="form-control uniInput"
+                v-model="email"
+                v-bind:class="{
+                  'is-valid': email,
+                  'is-invalid': !validEmail(email) && emailLoad,
+                }"
+                v-on:keyup="emailLoad = true"
+                v-on:blur="emailLoad = true"
+                required
+                icon
+              />
+              <div class="invalid-feedback">Valid Email is required!</div>
+            </float-label>
+          </div>
         </div>
-      </div>
-      <div class="row mt-2">
-        <div class="col-md-6">
-          <button class="btn-white-border" @click="checkMail()">SEND</button>
+        <div class="row mt-2">
+          <div class="col-md-6">
+            <button class="btn-white-border" @click="checkMail()">SEND</button>
+          </div>
         </div>
       </div>
     </div>

src/store/modules/communication/template.js

@@ -1,155 +1,157 @@
 /* eslint-disable */
-import axios from 'axios';
-import { result } from 'lodash';
+import axios from 'axios'
+import { result } from 'lodash'
 
 export default {
-  namespaced: true,
-  state: {
-    list: [],
-    singleTemp: {},
-    item: {},
-    message: undefined,
-    recipients: [],
-    recipient: {},
-    contactUsLog: [],
-    enquireNowLog: []
-  },
-  mutations: {
-    setList(state, list) {
-      state.list = list;
-    },
-    setSingle(state, template){
-      state.singleTemp = template
-    },
-    setRecipients(state, recips){
-      state.recipients = recips
-    },
-    setRecipient(state, recip){
-      state.recipient = recip
-    },
-    removeRecipient(state, id){
-      var index = state.recipients.findIndex((recip) => recip.id == id)
-      state.recipients.splice(index, 1)
-    },
-    deleteTemplate(state, id){
-      var index = state.list.findIndex((template) => template.id == id)
-      state.list.splice(index, 1)
-    },
-    setContactUsLog(state, log){
-      state.contactUsLog = log
-    },
-    setEnquireNowLog(state, log){
-      console.log(log);
-      state.enquireNowLog = log
-    },
-  },
-  getters: {
-  },
-  actions: {
-    getList({
-      commit,
-    }) {
-      axios
-        .get('/api/template/getSimple')
-        .then(result => commit('setList', result.data))
-        .catch(ex => console.log(ex.response));
-    },
-    async getSingleTemplate({commit}, id){
-      await axios.get('/api/template/' + id)
-      .then(result => commit('setSingle', result.data[0]))
-      .catch(ex => console.log(ex.response))
-    },
-    addItem({
-      dispatch,
-    }, item) {
-      axios
-        .post('/api/template', item)
-        .then(() => dispatch('getList'))
-        .catch((ex) => {
-          return Promise.reject(ex.response)
-        });
-    },
-    editItem({
-      dispatch,
-    }, item) {
-      axios
-        .put(`/api/template/${item.id}`, item)
-        .then(() => dispatch('getList'))
-        .catch((ex) => {
-          return Promise.reject(ex.response)
-        });
-    },
-    async deleteMailTemplate({commit}, id){
-      await axios.delete('/api/template/'+ id)
-      .then(() => {
-        commit("deleteTemplate", id)
-      })
-      .catch((ex) => {
-        return Promise.reject(ex.response)
-      })
-    },
-    async getMailRecipients({commit}){
-      await axios.get('/api/mail/mailrecipients')
-      .then((result) => {
-        commit("setRecipients", result.data)
-      })
-      .catch((e) => {
-        console.log(e.response);
-      })
-    },
-    async getMailRecipientById({commit}, id){
-      await axios.get('/api/mail/mailrecipient/' + id)
-      .then((result) => {
-        commit("setRecipient", result.data)
-      })
-      .catch((e) => {
-        console.log(e.response);
-      })
-    },
-    async addMailRecipient({commit}, rec){
-      await axios.post('/api/mail/mailrecipient', rec)
-      .then((result) => {
-        console.log(result);
-      })
-      .catch((e) => {
-        console.log(e.response);
-      })
-    },
-    async updateMailRecipient({commit}, rec){
-      await axios.put('/api/mail/mailrecipients', rec)
-      .then((result) => {
-        console.log(result);
-      })
-      .catch((e) => {
-        console.log(e.response);
-      })
-    },
-    async deleteMailRecipient({commit}, id){
-      await axios.delete('/api/mail/mailrecipient/'+ id)
-      .then(() => {
-        commit("removeRecipient", id)
-      })
-      .catch((e) => {
-        console.log(e.response);
-      })
-    },
-    async getContactUsLog({commit}){
-      await axios.get('/api/mail/getContactLog/')
-      .then((result) => {
-        commit("setContactUsLog", result.data)
-      })
-      .catch((response) => {
-        console.log(response.response);
-      })
-    },
-    async getEnquireNowLog({commit}){
-      await axios.get('/api/mail/getEnquireLog/')
-      .then((result) => {
-        commit("setEnquireNowLog", result.data)
-      })
-      .catch((response) => {
-        console.log(response.response);
-      })
-    }
-  },
-};
+    namespaced: true,
+    state: {
+        list: [],
+        singleTemp: {},
+        item: {},
+        message: undefined,
+        recipients: [],
+        recipient: {},
+        contactUsLog: [],
+        enquireNowLog: [],
+    },
+    mutations: {
+        setList(state, list) {
+            state.list = list
+        },
+        setSingle(state, template) {
+            state.singleTemp = template
+        },
+        setRecipients(state, recips) {
+            state.recipients = recips
+        },
+        setRecipient(state, recip) {
+            state.recipient = recip
+        },
+        removeRecipient(state, id) {
+            var index = state.recipients.findIndex((recip) => recip.id == id)
+            state.recipients.splice(index, 1)
+        },
+        deleteTemplate(state, id) {
+            var index = state.list.findIndex((template) => template.id == id)
+            state.list.splice(index, 1)
+        },
+        setContactUsLog(state, log) {
+            state.contactUsLog = log
+        },
+        setEnquireNowLog(state, log) {
+            console.log(log)
+            state.enquireNowLog = log
+        },
+    },
+    getters: {},
+    actions: {
+        getList({ commit }) {
+            axios
+                .get('/api/template/getSimple')
+                .then((result) => commit('setList', result.data))
+                .catch((ex) => console.log(ex.response))
+        },
+        async getSingleTemplate({ commit }, id) {
+            await axios
+                .get('/api/template/' + id)
+                .then((result) => commit('setSingle', result.data[0]))
+                .catch((ex) => console.log(ex.response))
+        },
+        addItem({ dispatch }, item) {
+            axios
+                .post('/api/template', item)
+                .then(() => dispatch('getList'))
+                .catch((ex) => {
+                    return Promise.reject(ex.response)
+                })
+        },
+        editItem({ dispatch }, item) {
+            axios
+                .put(`/api/template/${item.id}`, item)
+                .then(() => dispatch('getList'))
+                .catch((ex) => {
+                    return Promise.reject(ex.response)
+                })
+        },
+        async deleteMailTemplate({ commit }, id) {
+            await axios
+                .delete('/api/template/' + id)
+                .then(() => {
+                    commit('deleteTemplate', id)
+                })
+                .catch((ex) => {
+                    return Promise.reject(ex.response)
+                })
+        },
+        async getMailRecipients({ commit }) {
+            await axios
+                .get('/api/mail/mailrecipients')
+                .then((result) => {
+                    commit('setRecipients', result.data)
+                })
+                .catch((e) => {
+                    console.log(e.response)
+                })
+        },
+        async getMailRecipientById({ commit }, id) {
+            await axios
+                .get('/api/mail/mailrecipient/' + id)
+                .then((result) => {
+                    commit('setRecipient', result.data)
+                })
+                .catch((e) => {
+                    console.log(e.response)
+                })
+        },
+        async addMailRecipient({ commit }, rec) {
+            await axios
+                .post('/api/mail/mailrecipient', rec)
+                .then((result) => {
+                    console.log(result)
+                })
+                .catch((e) => {
+                    console.log(e.response)
+                })
+        },
+        async updateMailRecipient({ commit }, rec) {
+            await axios
+                .put('/api/mail/mailrecipients', rec)
+                .then((result) => {
+                    console.log(result)
+                })
+                .catch((e) => {
+                    console.log(e.response)
+                })
+        },
+        async deleteMailRecipient({ commit }, id) {
+            await axios
+                .delete('/api/mail/mailrecipient/' + id)
+                .then(() => {
+                    commit('removeRecipient', id)
+                })
+                .catch((e) => {
+                    console.log(e.response)
+                })
+        },
+        async getContactUsLog({ commit }) {
+            await axios
+                .get('/api/mail/getContactLog/')
+                .then((result) => {
+                    commit('setContactUsLog', result.data)
+                })
+                .catch((response) => {
+                    console.log(response.response)
+                })
+        },
+        async getEnquireNowLog({ commit }) {
+            await axios
+                .get('/api/mail/getEnquireLog/')
+                .then((result) => {
+                    commit('setEnquireNowLog', result.data)
+                })
+                .catch((response) => {
+                    console.log(response.response)
+                })
+        },
+    },
+}

src/store/modules/timeshare/timeshare.js

@@ -53,6 +53,7 @@ export default {
             agentCommission: undefined,
             mandate: undefined,
             status: undefined,
+            consent: true,
             owner: {
                 address: {},
                 bankingDetails: {},