Changeset 3445720

Timestamp:

01/23/2026 04:33:05 PM (4 weeks ago)

Author:

digitallychee

Message:

Release 1.0.3

Location:

dl-gift-wallet/trunk

Files:

• changelog.txt (modified) (1 diff)
• dl-gift-wallet.php (modified) (5 diffs)
• readme.txt (modified) (3 diffs)

dl-gift-wallet/trunk/changelog.txt

@@ -1 +1 @@
 *** DL Gift Wallet ***
+
+2026-01-23 - version 1.0.3
+* Improved Gift Wallet order handling so gift-only orders are automatically completed after successful payment.
+* Gift credit is now applied immediately without requiring manual order completion.
+* Added safeguards to prevent gift credit from being applied more than once per order.
 
 2025-12-29 - version 1.0.2

dl-gift-wallet/trunk/dl-gift-wallet.php

@@ -3 +3 @@
  * Plugin Name: DL Gift Wallet
  * Description: Allow customers to purchase gift credit that is automatically added to a recipient’s store account as balance.
- * Version: 1.0.2
+ * Version: 1.0.3
  * Requires at least: 6.0
- * Requires PHP: 7.4
+ * Requires PHP: 8.3
  * WC requires at least: 8.0
  * WC tested up to: 10.4.3
@@ -60 +60 @@
 
     // Pro upgrade URL (Freemius etc).
-    $upgrade_url = 'https://digitallycheeplugins.com/wordpress-plugins/';
+    $upgrade_url = 'https://woocommerce.com/products/dl-gift-wallet-pro';
 
     $upgrade_link = sprintf(
@@ -96 +96 @@
         }
 
-        $install_url = esc_url('https://digitallycheeplugins.com/wordpress-plugins/');
+        $install_url = esc_url('https://digitallycheeplugins.com/wordpress-plugins/gift-wallet/');
 
         echo '<tr class="plugin-update-tr"><td colspan="3" class="plugin-update colspanchange">';
@@ -197 +197 @@
         add_action('wp_enqueue_scripts', [$this, 'enqueue_frontend_styles']);
 
+        // Autocompleting gift wallet orders
+        add_action('woocommerce_payment_complete', [$this, 'maybe_autocomplete_giftwallet_order'], 20);
     }
 
@@ -1166 +1168 @@
      * --------------------------------------------------------------------- */
 
-    public function handle_order_completed($order_id)
-    {
-        $order = wc_get_order($order_id);
-        if (!$order)
-            return;
-
-        foreach ($order->get_items() as $item) {
-            $product = $item->get_product();
-            if (!$product || !$this->is_gift_product($product)) {
+public function handle_order_completed($order_id)
+{
+    $order = wc_get_order($order_id);
+    if (!$order) {
+        return;
+    }
+
+    // Prevent double-crediting (e.g. if status changes trigger this again)
+    if ($order->get_meta('_giftwallet_credited') === 'yes') {
+        return;
+    }
+
+    $did_credit_any = false;
+
+    foreach ($order->get_items() as $item) {
+        $product = $item->get_product();
+        if (!$product || !$this->is_gift_product($product)) {
+            continue;
+        }
+
+        $recipient_email = $item->get_meta('giftwallet_recipient_email', true);
+        if (empty($recipient_email) || !is_email($recipient_email)) {
+            continue;
+        }
+
+        $from_name  = $item->get_meta('giftwallet_from_name', true);
+        $message    = $item->get_meta('giftwallet_message', true);
+        $gift_total = floatval($item->get_total());
+
+        if ($gift_total <= 0) {
+            continue;
+        }
+
+        $user = get_user_by('email', $recipient_email);
+
+        if (!$user) {
+            $username = sanitize_user(current(explode('@', $recipient_email)), true);
+            if (username_exists($username)) {
+                $username .= '_' . wp_generate_password(4, false);
+            }
+
+            $password = wp_generate_password(12, true);
+            $user_id  = wp_create_user($username, $password, $recipient_email);
+
+            if (is_wp_error($user_id)) {
+                $order->add_order_note(
+                    'Gift Wallet: Failed to create user for ' . sanitize_email($recipient_email)
+                );
                 continue;
             }
 
-            $recipient_email = $item->get_meta('giftwallet_recipient_email', true);
-            if (empty($recipient_email) || !is_email($recipient_email)) {
-                continue;
-            }
-
-            $from_name = $item->get_meta('giftwallet_from_name', true);
-            $message = $item->get_meta('giftwallet_message', true);
-            $gift_total = floatval($item->get_total());
-            if ($gift_total <= 0) {
-                continue;
-            }
-
-            $user = get_user_by('email', $recipient_email);
-            if (!$user) {
-                $username = sanitize_user(current(explode('@', $recipient_email)), true);
-                if (username_exists($username)) {
-                    $username .= '_' . wp_generate_password(4, false);
-                }
-                $password = wp_generate_password(12, true);
-                $user_id = wp_create_user($username, $password, $recipient_email);
-
-                if (is_wp_error($user_id)) {
-                    $order->add_order_note(
-    'Gift Wallet: Failed to create user for ' . sanitize_email($recipient_email)
-);
-                    continue;
-                }
-
-                wp_new_user_notification($user_id, null, 'user');
-            } else {
-                $user_id = $user->ID;
-            }
-
-            $this->add_credit($user_id, $gift_total);
-
-            $order->add_order_note(sprintf(
-    'Gift Wallet: Credited %s to %s (user ID %d).',
-    wp_strip_all_tags(wc_price($gift_total)),
-    sanitize_email($recipient_email),
-    absint($user_id)
-));
-
-            $this->send_gift_email($recipient_email, $from_name, $message, $gift_total, false);
-        }
-    }
+            // Send standard WP account email
+            wp_new_user_notification($user_id, null, 'user');
+        } else {
+            $user_id = $user->ID;
+        }
+
+        // Apply credit
+        $this->add_credit($user_id, $gift_total);
+        $did_credit_any = true;
+
+        // Log
+        $order->add_order_note(sprintf(
+            'Gift Wallet: Credited %s to %s (user ID %d).',
+            wp_strip_all_tags(wc_price($gift_total)),
+            sanitize_email($recipient_email),
+            absint($user_id)
+        ));
+
+        // Email recipient
+        $this->send_gift_email($recipient_email, $from_name, $message, $gift_total, false);
+    }
+
+    // Only mark the order as credited if we actually credited something
+    if ($did_credit_any) {
+        $order->update_meta_data('_giftwallet_credited', 'yes');
+        $order->save();
+    }
+}
+
+
+    private function order_is_all_giftwallet( WC_Order $order ): bool
+{
+    $items = $order->get_items();
+    if (empty($items)) return false;
+
+    foreach ($items as $item) {
+        $product = $item->get_product();
+        if (!$product || !$this->is_gift_product($product)) {
+            return false; // contains something else
+        }
+    }
+    return true;
+}
+
+public function maybe_autocomplete_giftwallet_order( $order_id )
+{
+    $order = wc_get_order($order_id);
+    if (!$order instanceof WC_Order) return;
+
+    // Only for orders that are *entirely* gift wallet products
+    if (!$this->order_is_all_giftwallet($order)) return;
+
+    // Don't touch terminal statuses
+    if ($order->has_status(['completed','cancelled','refunded','failed'])) return;
+
+    // Prevent repeated status updates if gateway calls payment_complete more than once
+    if ($order->get_meta('_giftwallet_autocompleted') === 'yes') return;
+
+    $order->update_meta_data('_giftwallet_autocompleted', 'yes');
+    $order->save();
+
+    // Mark completed (this will trigger your existing order_status_completed hook)
+    $order->update_status(
+        'completed',
+        __('Gift Wallet: Auto-completed after successful payment.', 'dl-gift-wallet'),
+        true
+    );
+}
 
     /* -------------------------------------------------------------------------

dl-gift-wallet/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 6.0
 Tested up to: 6.9
-Requires PHP: 7.4
-Stable tag: 1.0.2
+Requires PHP: 8.3
+Stable tag: 1.0.3
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -250 +250 @@
 
 == Changelog ==
+
+= 1.0.3 =
+* Improved Gift Wallet order handling so gift-only orders are automatically completed after successful payment.
+* Gift credit is now applied immediately without requiring manual order completion.
+* Added safeguards to prevent gift credit from being applied more than once per order.
 
 = 1.0.2 =
@@ -274 +279 @@
 = Upgrade Notice =
 
-= 1.0.2 =
-This update improves the presentation of Gift Wallet fields on product pages and includes small frontend refinements. No changes to how gift credit or checkout logic works.
+= 1.0.3 =
+Gift Wallet orders are now automatically completed after successful payment, ensuring store credit is applied instantly. This prevents gift credits from being delayed when orders remain in “Processing”.