Deprecate Simplify in favour of feature plugin
This commit is contained in:
Mike Jolley
parent
5acb2d7661
commit
8e0e9a0cc2
|
|
@ -28,6 +28,7 @@ class WC_Admin_Notices {
|
|||
'theme_support' => 'theme_check_notice',
|
||||
'legacy_shipping' => 'legacy_shipping_notice',
|
||||
'no_shipping_methods' => 'no_shipping_methods_notice',
|
||||
'simplify_commerce' => 'simplify_commerce_notice',
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
@ -57,6 +58,13 @@ class WC_Admin_Notices {
|
|||
if ( ! current_theme_supports( 'woocommerce' ) && ! in_array( get_option( 'template' ), wc_get_core_supported_themes() ) ) {
|
||||
self::add_notice( 'theme_support' );
|
||||
}
|
||||
|
||||
$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
|
||||
|
||||
if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] ) {
|
||||
WC_Admin_Notices::add_notice( 'simplify_commerce' );
|
||||
}
|
||||
|
||||
self::add_notice( 'template_files' );
|
||||
}
|
||||
|
||||
|
|
@ -256,6 +264,19 @@ class WC_Admin_Notices {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Simplify Commerce is being removed from core.
|
||||
*/
|
||||
public function simplify_commerce_notice() {
|
||||
if ( class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) ) {
|
||||
self::remove_notice( 'simplify_commerce' );
|
||||
return;
|
||||
}
|
||||
if ( empty( $_GET['action'] ) ) {
|
||||
include( 'views/html-notice-simplify-commerce.php' );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
new WC_Admin_Notices();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
/**
|
||||
* Admin View: Notice - Simplify Commerce.
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
exit;
|
||||
}
|
||||
|
||||
$plugin_slug = 'woocommerce-gateway-simplify-commerce';
|
||||
|
||||
if ( current_user_can( 'install_plugins' ) ) {
|
||||
$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $plugin_slug ), 'install-plugin_' . $plugin_slug );
|
||||
} else {
|
||||
$url = 'http://wordpress.org/plugins/' . $plugin_slug;
|
||||
}
|
||||
?>
|
||||
<div id="message" class="updated woocommerce-message">
|
||||
<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'simplify_commerce' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
|
||||
|
||||
<p><?php _e( '<strong>The Simplify Commerce payment gateway is deprecated</strong> – Please install our new free Simplify Commerce plugin from WordPress.org. Simplify Commerce will be removed from WooCommerce core in a future update.', 'woocommerce' ); ?></p>
|
||||
|
||||
<p class="submit"><a href="<?php echo esc_url( $url ); ?>" class="wc-update-now button-primary"><?php _e( 'Install our new Simplify Commerce plugin', 'woocommerce' ); ?></a></p>
|
||||
</div>
|
||||
|
|
@ -78,17 +78,18 @@ class WC_Payment_Gateways {
|
|||
'WC_Gateway_Paypal',
|
||||
);
|
||||
|
||||
$simplify_countries = (array) apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) );
|
||||
/**
|
||||
* Simplify Commerce is @deprecated in 2.6.0. Only load when enabled.
|
||||
*/
|
||||
if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && in_array( WC()->countries->get_base_country(), apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
|
||||
$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
|
||||
|
||||
if ( in_array( WC()->countries->get_base_country(), $simplify_countries ) ) {
|
||||
if ( class_exists( 'WC_Subscriptions_Order' ) || class_exists( 'WC_Pre_Orders_Order' ) ) {
|
||||
if ( ! function_exists( 'wcs_create_renewal_order' ) ) { // Subscriptions < 2.0
|
||||
$load_gateways[] = 'WC_Addons_Gateway_Simplify_Commerce_Deprecated';
|
||||
} else {
|
||||
if ( ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] ) {
|
||||
if ( function_exists( 'wcs_create_renewal_order' ) ) {
|
||||
$load_gateways[] = 'WC_Addons_Gateway_Simplify_Commerce';
|
||||
} else {
|
||||
$load_gateways[] = 'WC_Gateway_Simplify_Commerce';
|
||||
}
|
||||
} else {
|
||||
$load_gateways[] = 'WC_Gateway_Simplify_Commerce';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,177 +0,0 @@
|
|||
<?php
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
exit; // Exit if accessed directly
|
||||
}
|
||||
|
||||
/**
|
||||
* Simplify Commerce Gateway for Subscriptions < 2.0.
|
||||
*
|
||||
* @class WC_Addons_Gateway_Simplify_Commerce_Deprecated
|
||||
* @extends WC_Addons_Gateway_Simplify_Commerce
|
||||
* @since 2.4.0
|
||||
* @version 1.0.0
|
||||
* @package WooCommerce/Classes/Payment
|
||||
* @author WooThemes
|
||||
*/
|
||||
class WC_Addons_Gateway_Simplify_Commerce_Deprecated extends WC_Addons_Gateway_Simplify_Commerce {
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct() {
|
||||
parent::__construct();
|
||||
|
||||
if ( class_exists( 'WC_Subscriptions_Order' ) ) {
|
||||
add_action( 'scheduled_subscription_payment_' . $this->id, array( $this, 'process_scheduled_subscription_payment' ), 10, 3 );
|
||||
add_filter( 'woocommerce_subscriptions_renewal_order_meta_query', array( $this, 'remove_renewal_order_meta' ), 10, 4 );
|
||||
add_action( 'woocommerce_subscriptions_changed_failing_payment_method_' . $this->id, array( $this, 'change_failing_payment_method' ), 10, 3 );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Store the customer and card IDs on the order and subscriptions in the order.
|
||||
*
|
||||
* @param int $order_id
|
||||
* @param string $customer_id
|
||||
* @return array
|
||||
*/
|
||||
protected function save_subscription_meta( $order_id, $customer_id ) {
|
||||
update_post_meta( $order_id, '_simplify_customer_id', wc_clean( $customer_id ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* process_subscription_payment function.
|
||||
*
|
||||
* @param WC_order $order
|
||||
* @param integer $amount (default: 0)
|
||||
* @uses Simplify_BadRequestException
|
||||
* @return bool|WP_Error
|
||||
*/
|
||||
public function process_subscription_payment( $order, $amount = 0 ) {
|
||||
if ( 0 == $amount ) {
|
||||
// Payment complete
|
||||
$order->payment_complete();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if ( $amount * 100 < 50 ) {
|
||||
return new WP_Error( 'simplify_error', __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' ) );
|
||||
}
|
||||
|
||||
$order_items = $order->get_items();
|
||||
$order_item = array_shift( $order_items );
|
||||
$subscription_name = sprintf( __( '%s - Subscription for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() );
|
||||
|
||||
$customer_id = get_post_meta( $order->id, '_simplify_customer_id', true );
|
||||
|
||||
if ( ! $customer_id ) {
|
||||
return new WP_Error( 'simplify_error', __( 'Customer not found', 'woocommerce' ) );
|
||||
}
|
||||
|
||||
try {
|
||||
// Charge the customer
|
||||
$payment = Simplify_Payment::createPayment( array(
|
||||
'amount' => $amount * 100, // In cents.
|
||||
'customer' => $customer_id,
|
||||
'description' => trim( substr( $subscription_name, 0, 1024 ) ),
|
||||
'currency' => strtoupper( get_woocommerce_currency() ),
|
||||
'reference' => $order->id,
|
||||
'card.addressCity' => $order->billing_city,
|
||||
'card.addressCountry' => $order->billing_country,
|
||||
'card.addressLine1' => $order->billing_address_1,
|
||||
'card.addressLine2' => $order->billing_address_2,
|
||||
'card.addressState' => $order->billing_state,
|
||||
'card.addressZip' => $order->billing_postcode
|
||||
) );
|
||||
|
||||
} catch ( Exception $e ) {
|
||||
|
||||
$error_message = $e->getMessage();
|
||||
|
||||
if ( $e instanceof Simplify_BadRequestException && $e->hasFieldErrors() && $e->getFieldErrors() ) {
|
||||
$error_message = '';
|
||||
foreach ( $e->getFieldErrors() as $error ) {
|
||||
$error_message .= ' ' . $error->getFieldName() . ': "' . $error->getMessage() . '" (' . $error->getErrorCode() . ')';
|
||||
}
|
||||
}
|
||||
|
||||
$order->add_order_note( sprintf( __( 'Simplify payment error: %s', 'woocommerce' ), $error_message ) );
|
||||
|
||||
return new WP_Error( 'simplify_payment_declined', $e->getMessage(), array( 'status' => $e->getCode() ) );
|
||||
}
|
||||
|
||||
if ( 'APPROVED' == $payment->paymentStatus ) {
|
||||
// Payment complete
|
||||
$order->payment_complete( $payment->id );
|
||||
|
||||
// Add order note
|
||||
$order->add_order_note( sprintf( __( 'Simplify payment approved (ID: %s, Auth Code: %s)', 'woocommerce' ), $payment->id, $payment->authCode ) );
|
||||
|
||||
return true;
|
||||
} else {
|
||||
$order->add_order_note( __( 'Simplify payment declined', 'woocommerce' ) );
|
||||
|
||||
return new WP_Error( 'simplify_payment_declined', __( 'Payment was declined - please try another card.', 'woocommerce' ) );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* process_scheduled_subscription_payment function.
|
||||
*
|
||||
* @param float $amount_to_charge The amount to charge.
|
||||
* @param WC_Order $order The WC_Order object of the order which the subscription was purchased in.
|
||||
* @param int $product_id The ID of the subscription product for which this payment relates.
|
||||
*/
|
||||
public function process_scheduled_subscription_payment( $amount_to_charge, $order, $product_id ) {
|
||||
$result = $this->process_subscription_payment( $order, $amount_to_charge );
|
||||
|
||||
if ( is_wp_error( $result ) ) {
|
||||
WC_Subscriptions_Manager::process_subscription_payment_failure_on_order( $order, $product_id );
|
||||
} else {
|
||||
WC_Subscriptions_Manager::process_subscription_payments_on_order( $order );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Don't transfer customer meta when creating a parent renewal order.
|
||||
*
|
||||
* @param string $order_meta_query MySQL query for pulling the metadata
|
||||
* @param int $original_order_id Post ID of the order being used to purchased the subscription being renewed
|
||||
* @param int $renewal_order_id Post ID of the order created for renewing the subscription
|
||||
* @param string $new_order_role The role the renewal order is taking, one of 'parent' or 'child'
|
||||
* @return string
|
||||
*/
|
||||
public function remove_renewal_order_meta( $order_meta_query, $original_order_id, $renewal_order_id, $new_order_role ) {
|
||||
if ( 'parent' == $new_order_role ) {
|
||||
$order_meta_query .= " AND `meta_key` NOT LIKE '_simplify_customer_id' ";
|
||||
}
|
||||
|
||||
return $order_meta_query;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if order contains subscriptions.
|
||||
*
|
||||
* @param int $order_id
|
||||
* @return bool
|
||||
*/
|
||||
protected function order_contains_subscription( $order_id ) {
|
||||
return class_exists( 'WC_Subscriptions_Order' ) && ( WC_Subscriptions_Order::order_contains_subscription( $order_id ) || WC_Subscriptions_Renewal_Order::is_renewal( $order_id ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the customer_id for a subscription after using Simplify to complete a payment to make up for.
|
||||
* an automatic renewal payment which previously failed.
|
||||
*
|
||||
* @param WC_Order $original_order The original order in which the subscription was purchased.
|
||||
* @param WC_Order $renewal_order The order which recorded the successful payment (to make up for the failed automatic payment).
|
||||
* @param string $subscription_key A subscription key of the form created by @see WC_Subscriptions_Manager::get_subscription_key()
|
||||
*/
|
||||
public function change_failing_payment_method( $original_order, $renewal_order, $subscription_key ) {
|
||||
$new_customer_id = get_post_meta( $renewal_order->id, '_simplify_customer_id', true );
|
||||
|
||||
update_post_meta( $original_order->id, '_simplify_customer_id', $new_customer_id );
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue