Changeset 2867013

Timestamp:

02/17/2023 02:33:17 PM (3 years ago)

Author:

paybyrd

Message:

Implement improvements for webhook generation

Location:

paybyrd/trunk

Files:

• README.txt (modified) (1 diff)
• languages/paybyrd-woocommerce-en_US.po (modified) (1 diff)
• languages/paybyrd-woocommerce-pt_PT.po (modified) (1 diff)
• languages/paybyrd-woocommerce.pot (modified) (1 diff)
• paybyrd-payment.php (modified) (7 diffs)

paybyrd/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.7
 Tested up to: 5.8
-Stable tag: 2.4.0
+Stable tag: 2.5.0
 Requires PHP: 7.0
 License: GPLv2 or later

paybyrd/trunk/languages/paybyrd-woocommerce-en_US.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Paybyrd Payment Plugin 2.4.0\n"
+"Project-Id-Version: Paybyrd Payment Plugin 2.5.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

paybyrd/trunk/languages/paybyrd-woocommerce-pt_PT.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Paybyrd Payment Plugin 2.4.0\n"
+"Project-Id-Version: Paybyrd Payment Plugin 2.5.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

paybyrd/trunk/languages/paybyrd-woocommerce.pot

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Paybyrd Payment Plugin 2.4.0\n"
+"Project-Id-Version: Paybyrd Payment Plugin 2.5.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

paybyrd/trunk/paybyrd-payment.php

@@ -5 +5 @@
      * Author: Paybyrd
      * Author URI: https://www.paybyrd.com
-     * Version: 2.4.0
+     * Version: 2.5.0
      * Domain Path: /languages
      */
@@ -79 +79 @@
                     $prod_success = false;
                     $test_success = false;
+                    $prod_response = [];
+                    $test_response = [];
 
                     if ($this->api_key) {
@@ -107 +109 @@
                                 update_option('hook_user', $response['user']);
                                 update_option('hook_password', $response['password']);
+
+                                $prod_success = true;
                             }
 
-                            $prod_success = true;
+                            $prod_response = $response;
                         }
                     } else {
@@ -144 +148 @@
                                 update_option('hook_test_user', $response['user']);
                                 update_option('hook_test_password', $response['password']);
+
+                                $test_success = true;
                             }
 
-                            $test_success = true;
+                            $test_response = $response;
                         }
                     } else {
@@ -154 +160 @@
                     }
 
-                    return ['prodSuccess' => $prod_success, 'testSuccess' => $test_success];
+                    return ['prodSuccess' => $prod_success, 'testSuccess' => $test_success, 'prodResponse' => $prod_response, 'testResponse' => $test_response];
                 }
 
@@ -260 +266 @@
                                 'onclick'   => 'this.value = this.getAttribute("data-label-loading");fetch("' . get_rest_url() . 'paybyrd/v1/generate/webhook", {
                                     method: "POST"
-                                }).then(res => res.json()).then(res => {
+                                }).then(res => res.json()).then((res = {}) => {
+                                    this.style.whiteSpace = "break-spaces";
+                                    this.style.wordWrap = "break-word";
+                                    this.style.wordBreak = "break-all";
+
                                     if (!res.prodSuccess || !res.testSuccess) {
-                                        this.value = this.getAttribute("data-label-error");
-
-                                        setTimeout(() => this.value = this.getAttribute("data-label"), 1500);
+                                        const prodResponse = res.prodResponse && JSON.parse(res.prodResponse.description || "{}");
+                                        const testResponse = res.testResponse && JSON.parse(res.testResponse.description || "{}");
+
+                                        if (prodResponse.error?.message) {
+                                            this.value = prodResponse.error.message;
+                                        }
+                                        if (testResponse.error?.message) {
+                                            this.value = testResponse.error.message;
+                                        }
+
+                                        setTimeout(() => this.value = this.getAttribute("data-label"), 5000);
                                         return res;
                                     }
 
-                                    setTimeout(() => this.value = this.getAttribute("data-label"), 1500);
+                                    setTimeout(() => this.value = this.getAttribute("data-label"), 3000);
                                     this.value = this.getAttribute("data-label-success");
                                     return res;
@@ -571 +589 @@
                     }
 
-                    echo json_encode($response);
-                    exit();
+                    return $response;
                 }
             ));