Minor Fixes & Changes

src/components/financial/paymentOption.vue

@@ -9,7 +9,7 @@
               <option value="CC">Credit/Debit Card</option>
               <option value="EFT">EFT</option>
             </select>
-            <button class="btn-solid-blue mt-5" @click="pushToApi()">Continue</button>
+            <button class="btn-solid-blue mt-5" @click="pushToApi()">CONTINUE</button>
           </div>
         </div>
       </div>
@@ -41,12 +41,14 @@
 import { mapState, mapActions, mapGetters } from "vuex";
 import carousel from "vue-owl-carousel";
 import Log from "../../assets/Log";
+import md5 from "js-md5";
 export default {
   components: {
     carousel
   },
   props: {
-    week: {}
+    week: {},
+    indiv: {}
   },
   data() {
     return {
@@ -62,7 +64,8 @@ export default {
     ...mapActions("myWeeks", ["editSave"]),
     pushToApi() {
       if (this.selectedOption == "CC") {
-        this.paygateRedirect();
+        //this.paygateRedirect();
+        this.generatePayment(this.week.id);
       } else {
         this.week.statusId = 1033; // change this value to link with status
         if (this.week.owner.telephone === "") {
@@ -74,6 +77,55 @@ export default {
         });
       }
     },
+    generatePayment(id) {
+      var myData = [];
+      // Merchant details
+      myData["merchant_id"] = "10000100";
+      myData["merchant_key"] = "46f0cd694581a";
+      myData["return_url"] = "https://www.univateproperties.co.za/#/payments/success";
+      myData["cancel_url"] = "https://www.univateproperties.co.za/#/";
+      myData["notify_url"] = "http://www.yourdomain.co.za/notify_url";
+      // Buyer details
+      myData["name_first"] = this.indiv.name;
+      myData["name_last"] = this.indiv.surname;
+      myData["email_address"] = this.indiv.emailAddress;
+      // Transaction details
+      //myData["m_payment_id"] = "1234";
+      myData["amount"] = this.getListingFee.amount.toString();
+      myData["item_name"] = id.toString();
+      myData["signature"] = this.generateSignature(myData);
+      //console.log(paymentObj);
+      //axios.post("https://sandbox.payfast.co.za​/eng/process", paymentObj);
+      //console.log(myData);
+      var paymentObj = Object.assign({}, myData);
+      console.log(paymentObj);
+      this.$router.push({
+        name: "PayFast",
+        params: {
+          paymentObj: paymentObj
+        }
+      });
+    },
+    generateSignature(data, passPhrase = null) {
+      let pfOutput = "";
+      for (let key in data) {
+        if (data.hasOwnProperty(key)) {
+          if (data[key] !== "") {
+            pfOutput += `${key}=${encodeURIComponent(data[key].trim()).replace(/%20/g, "+")}&`;
+          }
+        }
+      }
+
+      let getString = pfOutput.slice(0, -1);
+      if (passPhrase !== null) {
+        getString += `&passphrase=${encodeURIComponent(passPhrase.trim()).replace(/%20/g, "+")}`;
+      }
+      var hash = md5.create();
+      hash.update(getString);
+      console.log(hash.hex());
+      console.log(getString);
+      return hash.toString();
+    },
     paygateRedirect() {
       var amount = this.getListingFee.amount;
       var paymentObj = {

src/components/timeshare/sell/contentSection.vue

@@ -988,6 +988,7 @@ export default {
       const rx = /^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/im;
       return rx.test(String(number));
     },
+
     submitSale() {
       this.boolError = false;
       if (this.userLoggedIn) {
@@ -1058,13 +1059,17 @@ export default {
         var fixedDate = new Date(isoDate).setHours(+4);
         var pubDate = new Date(fixedDate).toISOString();
         this.sellItem.pulbishedDate = pubDate;
+        if (this.sellItem.originalPurchasePrice === "") {
+          this.sellItem.originalPurchasePrice = 0;
+        }
         //console.log(this.sellItem.ownerObject);
         console.log(this.sellItem);
         console.log(JSON.stringify(this.sellItem));
+
         if (!this.boolError) {
           this.saveWeek(this.sellItem)
             .then(fulfilled => {
-              // this.$router.push({ name: "PaymentOption", params: { week: fulfilled } });
+              // this.$router.push({ name: "PaymentOption", params: { week: fulfilled, indiv: this.indiv } });
               this.$router.push({ name: "EFTPage", params: { week: fulfilled } });
               //this.paygateRedirect();
             })

src/components/user/updateAgentProfile.vue

@@ -252,7 +252,16 @@ export default {
           this.agent.user.role === "Managing Agent"
         ) {
           this.updateAgent(this.agent).then(() => {
-            this.$router.go(-1);
+            var newPerson = {
+              id: JSON.parse(localStorage.getItem("person")).id,
+              email: this.agent.email,
+              fullname: this.agent.name + " " + this.agent.surname,
+              name: this.agent.name,
+              surname: this.agent.surnmame
+            };
+            localStorage.setItem("person", JSON.stringify(newPerson));
+            console.log(newPerson);
+            this.$router.push("/");
           });
         } else {
           this.saveAgent(this.agent)

src/components/user/updateProfileInfo.vue

@@ -589,7 +589,7 @@ export default {
               if (Log.getUser().role === "Super Admin") {
                 // console.log(this.individual);
                 // console.log(JSON.parse(localStorage.getItem("person")));
-                if (this.individual.id === JSON.parse(localStorage.getItem("person"))) {
+                if (this.individual.id === JSON.parse(localStorage.getItem("person")).id) {
                   var newPerson = {
                     id: JSON.parse(localStorage.getItem("person")).id,
                     email: this.individual.email,
@@ -597,8 +597,8 @@ export default {
                     name: this.individual.name,
                     surname: this.individual.surname
                   };
-                  this.$router.go();
                   localStorage.setItem("person", JSON.stringify(newPerson));
+                  this.$router.go();
                 }
                 this.$router.push("/status/userManagementPage");
               } else {