Merge pull request #34 from BeycanPress/alpha

Alpha
BeycanPress · Jan 20, 2025 · 5c809ef · 5c809ef
2 parents e34391f + b099257
commit 5c809ef
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 17 deletions.
diff --git a/app/Models/AbstractTransaction.php b/app/Models/AbstractTransaction.php
@@ -210,6 +210,15 @@ public function updateStatusToFailedByHash(string $hash): bool
         return $this->updateStatusByHash($hash, Status::FAILED);
     }
 
+    /**
+     * @param string $hash
+     * @return bool
+     */
+    public function updateStatusToProcessingByHash(string $hash): bool
+    {
+        return $this->updateStatusByHash($hash, Status::PROCESSING);
+    }
+
     /**
      * @param string $text
      * @param array<mixed> $params

diff --git a/app/Pages/TransactionPage.php b/app/Pages/TransactionPage.php
@@ -235,7 +235,10 @@ public function page(): void
                 )->format('d M Y H:i');
             },
             'delete' => function ($tx) {
-                if (strtolower($tx->status) == Status::PENDING->getValue()) {
+                if (
+                    strtolower($tx->status) == Status::PENDING->getValue() ||
+                    strtolower($tx->status) == Status::PROCESSING->getValue()
+                ) {
                     return '';
                 };
                 return Helpers::view('components/delete', [

diff --git a/app/RestAPI.php b/app/RestAPI.php
@@ -203,7 +203,7 @@ public function createTransaction(): void
                 'userId' => $this->currentUserId,
                 'updatedAt' => current_time('mysql'),
                 'createdAt' => current_time('mysql'),
-                'status' => Status::PENDING->getValue(),
+                'status' => Status::PROCESSING->getValue(),
                 'hash' => $this->paymentData->getHash(),
                 'testnet' => Helpers::getTestnetStatus(),
                 'orderId' => $this->paymentData->getOrder()->getId(),
@@ -321,7 +321,8 @@ public function setReminderEmail(): void
         $this->paymentData->getModel()->update([
             'reminderEmail' => $email,
             'userId' => $this->currentUserId,
-            'updatedAt' => current_time('mysql')
+            'updatedAt' => current_time('mysql'),
+            'status' => Status::PENDING->getValue()
         ], [
             'hash' => $this->paymentData->getHash()
         ]);

diff --git a/app/Services/Verifier.php b/app/Services/Verifier.php
@@ -114,15 +114,12 @@ public static function verifyPendingTransactions(
         int $userId = 0,
         string $code = 'all'
     ): void {
-        if (0 == $userId) {
-            $params = [
-                'status' => Status::PENDING->getValue()
-            ];
-        } else {
-            $params = [
-                'status' => Status::PENDING->getValue(),
-                'userId' => $userId
-            ];
+        $params = [
+            'status' => Status::PENDING->getValue()
+        ];
+
+        if (0 != $userId) {
+            $params['userId'] = $userId;
         }
 
         if ('all' != $code) {

diff --git a/app/Types/Enums/TransactionStatus.php b/app/Types/Enums/TransactionStatus.php
@@ -11,6 +11,7 @@ enum TransactionStatus: string
     case PENDING = 'pending';
     case VERIFIED = 'verified';
     case FAILED = 'failed';
+    case PROCESSING = 'processing';
 
     /**
      * @return string

diff --git a/app/WooCommerce/Services/Checkout.php b/app/WooCommerce/Services/Checkout.php
@@ -28,7 +28,7 @@ public function init(int $orderId): void
     {
         $order = wc_get_order($orderId);
 
-        if ($order->get_status() != Status::PENDING->getValue()) {
+        if ('pending' != $order->get_status()) {
             wp_redirect($order->get_checkout_order_received_url());
             exit();
         } else {

diff --git a/app/WooCommerce/Services/Details.php b/app/WooCommerce/Services/Details.php
@@ -32,7 +32,7 @@ public function frontend(int $orderId): void
         if (CryptoPay::ID == $order->get_payment_method()) {
             $transaction = (new OrderTransaction())->getTransactionByOrderId($orderId);
 
-            if ($order->get_status() == Status::PENDING->getValue() && !$transaction) {
+            if ('pending' == $order->get_status() && !$transaction) {
                 Helpers::viewEcho('woocommerce/pending', ['payUrl' => $order->get_checkout_payment_url(true)]);
             } elseif (!is_null($transaction)) {
                 echo Helpers::getPaymentHtmlDetails($transaction);

diff --git a/cryptopay-wc-lite.php b/cryptopay-wc-lite.php
@@ -11,7 +11,7 @@
 
 /**
  * Plugin Name: CryptoPay Lite
- * Version:     2.3.8
+ * Version:     2.3.9
  * Plugin URI:  https://beycanpress.com/cryptopay/
  * Description: All In One Cryptocurrency Payments for WordPress
  * Author:      BeycanPress LLC

diff --git a/readme.txt b/readme.txt
@@ -4,8 +4,8 @@ Tags: WooCommerce, Cryptocurrency, Payment, Gateway, Bitcoin
 Requires at least: 5.0
 Tested up to: 6.7.1
 Requires PHP: 8.1
-Stable Tag: 2.3.8
-Version: 2.3.8
+Stable Tag: 2.3.9
+Version: 2.3.9
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 

diff --git a/...lechain/evm-chains/resources/erc1155.json → ...lechain/evm-chains/resources/ERC1155.json b/...lechain/evm-chains/resources/erc1155.json → ...lechain/evm-chains/resources/ERC1155.json
diff --git a/...iplechain/evm-chains/resources/erc20.json → ...iplechain/evm-chains/resources/ERC20.json b/...iplechain/evm-chains/resources/erc20.json → ...iplechain/evm-chains/resources/ERC20.json
diff --git a/...plechain/evm-chains/resources/erc721.json → ...plechain/evm-chains/resources/ERC721.json b/...plechain/evm-chains/resources/erc721.json → ...plechain/evm-chains/resources/ERC721.json