Payfast signature update

src/components/timeshare/sell/contentSectionPF.vue

@@ -976,6 +976,35 @@ export default {
       this.weekId = 0;
       this.getBlankWeek();
     },
+    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) {
@@ -997,33 +1026,6 @@ export default {
       return hash.toString();
     },
     submitSale() {
-      var myData = [];
-      // Merchant details
-      myData["merchant_id"] = "10000100";
-      myData["merchant_key"] = "46f0cd694581a";
-      myData["return_url"] = "http://www.yourdomain.co.za/return_url";
-      myData["cancel_url"] = "http://www.yourdomain.co.za/cancel_url";
-      myData["notify_url"] = "http://www.yourdomain.co.za/notify_url";
-      // Buyer details
-      myData["name_first"] = "First Name";
-      myData["name_last"] = "Last Name";
-      myData["email_address"] = "test@test.com";
-      // Transaction details
-      //myData["m_payment_id"] = "1234";
-      myData["amount"] = "10.00";
-      myData["item_name"] = "Order#123";
-      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
-        }
-      });
       if (this.userLoggedIn) {
         this.sellItem.ownerObject = this.indiv;
         this.sellItem.weekStatus = "For Sale";
@@ -1033,16 +1035,14 @@ export default {
             this.sellItem.statusId = status.id;
           }
         });
-        // this.saveWeek(this.sellItem)
-        //   .then(fulfilled => {
-        //     console.log(fulfilled);
-        //     // this.$router.push({ name: "PaymentOption", params: { week: fulfilled } });
-        //     this.$router.push({ name: "EFTPage", params: { week: fulfilled } });
-        //     //this.paygateRedirect();
-        //   })
-        //   .catch(ex => {
-        //     this.profileEmailError = true;
-        //   });
+        this.saveWeek(this.sellItem)
+          .then(fulfilled => {
+            console.log(fulfilled);
+            this.generatePayment(fulfilled.id);
+          })
+          .catch(ex => {
+            this.profileEmailError = true;
+          });
       } else {
         this.$router.push("/user/login");
       }