Payfast Fix

src/components/financial/paymentOption.vue

@@ -59,6 +59,9 @@ export default {
   computed: {
     ...mapGetters("fees", ["getListingFee"])
   },
+  created() {
+    console.log(this.week);
+  },
   methods: {
     ...mapActions("payment", ["addPayment"]),
     ...mapActions("myWeeks", ["editSave"]),
@@ -79,6 +82,11 @@ export default {
     },
     generatePayment(id) {
       var myData = [];
+      var date =
+        "From: " +
+        this.week.arrivalDate.substring(0, 10) +
+        " To " +
+        this.week.departureDate.substring(0, 10);
       // Merchant details
       myData["merchant_id"] = "10000100";
       myData["merchant_key"] = "46f0cd694581a";
@@ -92,12 +100,16 @@ export default {
       // Transaction details
       //myData["m_payment_id"] = "1234";
       myData["amount"] = this.getListingFee.amount.toString();
-      myData["item_name"] = id.toString();
+      myData["item_name"] = "Uni-Vate Week Sale. Reference: #" + id.toString();
+      myData["item_description"] = this.week.resortName;
+      myData["custom_str1"] = date;
+
       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("Twas here");
       console.log(paymentObj);
       this.$router.push({
         name: "PayFast",
@@ -125,28 +137,28 @@ export default {
       console.log(hash.hex());
       console.log(getString);
       return hash.toString();
-    },
-    paygateRedirect() {
-      var amount = this.getListingFee.amount;
-      var paymentObj = {
-        timeshareWeekId: this.week.id, // this.sellItem.Id,
-        propertyId: 0,
-        creatydById: Log.getUser().id, //Log.getUser().id,
-        amount: amount,
-        paymentStatus: "",
-        paymentToken: ""
-      };
-
-      this.addPayment(paymentObj).then(res => {
-        this.$router.push({
-          name: "PaymentGateway",
-          params: {
-            paymentReqId: res.PAY_REQUEST_ID,
-            checksum: res.CHECKSUM
-          }
-        });
-      });
     }
+    // paygateRedirect() {
+    //   var amount = this.getListingFee.amount;
+    //   var paymentObj = {
+    //     timeshareWeekId: this.week.id, // this.sellItem.Id,
+    //     propertyId: 0,
+    //     creatydById: Log.getUser().id, //Log.getUser().id,
+    //     amount: amount,
+    //     paymentStatus: "",
+    //     paymentToken: ""
+    //   };
+
+    //   this.addPayment(paymentObj).then(res => {
+    //     this.$router.push({
+    //       name: "PaymentGateway",
+    //       params: {
+    //         paymentReqId: res.PAY_REQUEST_ID,
+    //         checksum: res.CHECKSUM
+    //       }
+    //     });
+    //   });
+    // }
   }
 };
 </script>

src/components/timeshare/sell/contentSectionNew.vue

@@ -870,6 +870,7 @@ import addressAutoComplete from "../../shared/addressAutoComplete";
 import Alert from "../../shared/alert.vue";
 import Log from "../../../assets/Log";
 import _ from "lodash";
+import md5 from "js-md5";
 
 export default {
   name: "TimeshareToSell",
@@ -1000,6 +1001,57 @@ export default {
       var pubDate = new Date(fixedDate).toISOString();
       return pubDate;
     },
+    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"] =
+        "Uni-Vate Week sale. Resort: " + this.sellItem.resort + " Referemce: #" + 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("Twas here");
+      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();
+    },
     submitSale() {
       this.boolError = false;
       if (this.userLoggedIn) {
@@ -1087,9 +1139,13 @@ export default {
         if (!this.boolError) {
           this.saveWeek(this.sellItem)
             .then(fulfilled => {
-              // this.$router.push({ name: "PaymentOption", params: { week: fulfilled, indiv: this.indiv } });
+              // this.$router.push({
+              //   name: "PaymentOption",
+              //   params: { week: fulfilled, indiv: this.indiv }
+              // });
               this.$router.push({ name: "EFTPage", params: { week: fulfilled } });
               //this.paygateRedirect();
+              //this.generatePayment(fulfilled.id);
             })
             .catch(ex => {
               this.errorOccurred = "ERRORHTML";