Fix subscription activate

cyberwombat · Mar 8, 2021 · 93c724e · 93c724e
1 parent cf9e2c0
commit 93c724e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/includes/class-wc-gateway-fastspring-handler.php b/includes/class-wc-gateway-fastspring-handler.php
@@ -106,6 +106,8 @@ public function ajax_get_receipt()
 
         $order_id = absint(WC()->session->get('current_order'));
 
+        $this->log(sprintf('Generating receipt for order %s', $order_id));
+
         $order = wc_get_order($order_id);
         $data = ['order_id' => $order->get_id()];
 
@@ -125,7 +127,7 @@ public function ajax_get_receipt()
             $order->update_meta_data('fs_order_id', $payload->id);
 
             if ($status === 'completed' && $order->payment_complete($payload->reference)) {
-                $this->log(sprintf('Marking order ID %s as complete', $order->get_id()));
+                $this->log(sprintf('Marking order ID %s as completed', $order->get_id()));
                 $order->add_order_note(sprintf(__('FastSpring payment approved (ID: %1$s)', 'woocommerce'), $order->get_id()));
             }
             // We could have a race condition where FS already called webhook so lets not assume its pending
@@ -151,15 +153,19 @@ public static function get_return_url($order = null)
     {
         if ($order) {
             $return_url = $order->get_checkout_order_received_url();
+            self::log(sprintf('Receipt URL for order set to %s', $return_url));
         } else {
             $return_url = wc_get_endpoint_url('order-received', '', wc_get_page_permalink('checkout'));
+            self::log(sprintf('Receipt URL set to %s', $return_url));
         }
 
         if (is_ssl() || get_option('woocommerce_force_ssl_checkout') == 'yes') {
             $return_url = str_replace('http:', 'https:', $return_url);
         }
 
         $filtered = apply_filters('woocommerce_get_return_url', $return_url, $order);
+
+        self::log(sprintf('Final filtered receipt URL set to %s', $filtered));
 
         return $filtered;
     }
@@ -250,7 +256,7 @@ public function handle_webhook_request($payload)
                   break;
 
                 case 'subscription.activated':
-                  $this->handle_webhook_request_subscription_acivate($payload);
+                  $this->handle_webhook_request_subscription_activate($payload);
                   break;
 
                 case 'subscription.updated':
@@ -262,7 +268,7 @@ public function handle_webhook_request($payload)
                   break;
                 }
 
-                $this->log(json_encode($payload));
+            $this->log(json_encode($payload));
             return wp_send_json_success();
         } catch (Exception $e) {
             return wp_send_json_error($e->getMessage());
@@ -378,4 +384,4 @@ public static function log($message)
     }
 }
 
-new WC_Gateway_FastSpring_Handler();
+new WC_Gateway_FastSpring_Handler();
diff --git a/readme.txt b/readme.txt
@@ -90,4 +90,7 @@ N/A
 * Support for payemnt icons, transaction URL
 
 = 1.2.4 =
-* Upgrade FastSpring JavasScript to 0.8.3
+* Upgrade FastSpring JavasScript to 0.8.3
+
+= 1.2.5 =
+* Fix typo causing subscription activate issues
diff --git a/woocommerce-gateway-fastspring.php b/woocommerce-gateway-fastspring.php
@@ -4,7 +4,7 @@
  * Description: Accept credit card, PayPal, Amazon Pay and other payments on your store using FastSpring.
  * Author: Enradia
  * Author URI: https://enradia.com/
- * Version: 1.2.4
+ * Version: 1.2.5
  * Requires at least: 4.4
  * Tested up to: 4.9.6
  * WC requires at least: 3.0