Recurring Subscription doesn't expire when CC transaction fails

On line 430 of uc_recurring.module, the conditional statement checks to see if there going to be retries for the recurring billing, however, there is no execution of uc_recurring_expire when there are no retries set.

e.g.

// check if there will be a retry
    $extension = uc_recurring_get_extension($fee->pfid, $fee->attempts);
    if ($extension) {
      $fee->data['retry_order_id'] = $order->order_id;
      uc_recurring_fee_user_save($fee);
    }

    uc_recurring_renewal_module_invoke('recurring_renewal_failed', $order, $fee);
    // @todo - replace with rules
    //ca_pull_trigger('uc_recurring_renewal_failed', $order, $fee);
    rules_invoke_event('uc_recurring_renewal_failed', $order, $fee);

    uc_order_comment_save($fee->order_id, $user->uid, t('New recurring fee failed on order <a href="@store-orders">@order_id</a>.', array('@store-orders' => url('admin/store/orders/' . $order->order_id), '@order_id' => $order->order_id)));
  }
  return FALSE;

Should be

// check if there will be a retry
    $extension = uc_recurring_get_extension($fee->pfid, $fee->attempts);
    if ($extension) {
      $fee->data['retry_order_id'] = $order->order_id;
      uc_recurring_fee_user_save($fee);
    }
    // if no retries, cancel the recurring order
    else {
       uc_recurring_expire($fee);
    }

    uc_recurring_renewal_module_invoke('recurring_renewal_failed', $order, $fee);
    // @todo - replace with rules
    //ca_pull_trigger('uc_recurring_renewal_failed', $order, $fee);
    rules_invoke_event('uc_recurring_renewal_failed', $order, $fee);

    uc_order_comment_save($fee->order_id, $user->uid, t('New recurring fee failed on order <a href="@store-orders">@order_id</a>.', array('@store-orders' => url('admin/store/orders/' . $order->order_id), '@order_id' => $order->order_id)));
  }
  return FALSE;

This should update the recurring order and properly expire it. Couldn't execute this in Rules as there isn't a rules action to update a recurring order entry. We had an issue where the recurring subscription would loop endlessly and create new orders to try and charge the customer while using uc_qbms as a payment gateway. This issue seems to be more related to uc_recurring not having the proper subscription expiration executed when a charge doesn't go through, so I thought best to implement here.

Hope this helps someone else!