[\d]+)', (int) $request['attribute_id'], $base );
+ }
+
+ $links = array(
+ 'self' => array(
+ 'href' => rest_url( trailingslashit( $base ) . $term->term_id ),
+ ),
+ 'collection' => array(
+ 'href' => rest_url( $base ),
+ ),
+ );
+
+ if ( $term->parent ) {
+ $parent_term = get_term( (int) $term->parent, $term->taxonomy );
+ if ( $parent_term ) {
+ $links['up'] = array(
+ 'href' => rest_url( trailingslashit( $base ) . $parent_term->term_id ),
+ );
+ }
+ }
+
+ return $links;
+ }
+
+ /**
+ * Update term meta fields.
+ *
+ * @param WP_Term $term
+ * @param WP_REST_Request $request
+ * @return bool|WP_Error
+ */
+ protected function update_term_meta_fields( $term, $request ) {
+ return true;
+ }
+
+ /**
+ * Get the terms attached to a product.
+ *
+ * This is an alternative to `get_terms()` that uses `get_the_terms()`
+ * instead, which hits the object cache. There are a few things not
+ * supported, notably `include`, `exclude`. In `self::get_items()` these
+ * are instead treated as a full query.
+ *
+ * @param array $prepared_args Arguments for `get_terms()`.
+ * @return array List of term objects. (Total count in `$this->total_terms`).
+ */
+ protected function get_terms_for_product( $prepared_args ) {
+ $taxonomy = $this->get_taxonomy( $request );
+
+ $query_result = get_the_terms( $prepared_args['product'], $taxonomy );
+ if ( empty( $query_result ) ) {
+ $this->total_terms = 0;
+ return array();
+ }
+
+ // get_items() verifies that we don't have `include` set, and default.
+ // ordering is by `name`.
+ if ( ! in_array( $prepared_args['orderby'], array( 'name', 'none', 'include' ) ) ) {
+ switch ( $prepared_args['orderby'] ) {
+ case 'id' :
+ $this->sort_column = 'term_id';
+ break;
+
+ case 'slug' :
+ case 'term_group' :
+ case 'description' :
+ case 'count' :
+ $this->sort_column = $prepared_args['orderby'];
+ break;
+ }
+ usort( $query_result, array( $this, 'compare_terms' ) );
+ }
+ if ( strtolower( $prepared_args['order'] ) !== 'asc' ) {
+ $query_result = array_reverse( $query_result );
+ }
+
+ // Pagination.
+ $this->total_terms = count( $query_result );
+ $query_result = array_slice( $query_result, $prepared_args['offset'], $prepared_args['number'] );
+
+ return $query_result;
+ }
+
+ /**
+ * Comparison function for sorting terms by a column.
+ *
+ * Uses `$this->sort_column` to determine field to sort by.
+ *
+ * @param stdClass $left Term object.
+ * @param stdClass $right Term object.
+ * @return int <0 if left is higher "priority" than right, 0 if equal, >0 if right is higher "priority" than left.
+ */
+ protected function compare_terms( $left, $right ) {
+ $col = $this->sort_column;
+ $left_val = $left->$col;
+ $right_val = $right->$col;
+
+ if ( is_int( $left_val ) && is_int( $right_val ) ) {
+ return $left_val - $right_val;
+ }
+
+ return strcmp( $left_val, $right_val );
+ }
+
+ /**
+ * Get the query params for collections
+ *
+ * @return array
+ */
+ public function get_collection_params() {
+ $params = parent::get_collection_params();
+
+ if ( '' !== $this->taxonomy ) {
+ $taxonomy = get_taxonomy( $this->taxonomy );
+ } else {
+ $taxonomy = new stdClass();
+ $taxonomy->hierarchical = true;
+ }
+
+ $params['context']['default'] = 'view';
+
+ $params['exclude'] = array(
+ 'description' => __( 'Ensure result set excludes specific ids.', 'woocommerce' ),
+ 'type' => 'array',
+ 'default' => array(),
+ 'sanitize_callback' => 'wp_parse_id_list',
+ );
+ $params['include'] = array(
+ 'description' => __( 'Limit result set to specific ids.', 'woocommerce' ),
+ 'type' => 'array',
+ 'default' => array(),
+ 'sanitize_callback' => 'wp_parse_id_list',
+ );
+ if ( ! $taxonomy->hierarchical ) {
+ $params['offset'] = array(
+ 'description' => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
+ 'type' => 'integer',
+ 'sanitize_callback' => 'absint',
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+ }
+ $params['order'] = array(
+ 'description' => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_key',
+ 'default' => 'asc',
+ 'enum' => array(
+ 'asc',
+ 'desc',
+ ),
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+ $params['orderby'] = array(
+ 'description' => __( 'Sort collection by resource attribute.', 'woocommerce' ),
+ 'type' => 'string',
+ 'sanitize_callback' => 'sanitize_key',
+ 'default' => 'name',
+ 'enum' => array(
+ 'id',
+ 'include',
+ 'name',
+ 'slug',
+ 'term_group',
+ 'description',
+ 'count',
+ ),
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+ $params['hide_empty'] = array(
+ 'description' => __( 'Whether to hide resources not assigned to any products.', 'woocommerce' ),
+ 'type' => 'boolean',
+ 'default' => false,
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+ if ( $taxonomy->hierarchical ) {
+ $params['parent'] = array(
+ 'description' => __( 'Limit result set to resources assigned to a specific parent.', 'woocommerce' ),
+ 'type' => 'integer',
+ 'sanitize_callback' => 'absint',
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+ }
+ $params['product'] = array(
+ 'description' => __( 'Limit result set to resources assigned to a specific product.', 'woocommerce' ),
+ 'type' => 'integer',
+ 'default' => null,
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+ $params['slug'] = array(
+ 'description' => __( 'Limit result set to resources with a specific slug.', 'woocommerce' ),
+ 'type' => 'string',
+ 'validate_callback' => 'rest_validate_request_arg',
+ );
+
+ return $params;
+ }
+
+ /**
+ * Get taxonomy.
+ *
+ * @param WP_REST_Request $request Full details about the request.
+ * @return int|WP_Error
+ */
+ protected function get_taxonomy( $request ) {
+ // Check if taxonomy is defined.
+ // Prevents check for attribute taxonomy more than one time for each query.
+ if ( '' !== $this->taxonomy ) {
+ return $this->taxonomy;
+ }
+
+ if ( ! empty( $request['attribute_id'] ) ) {
+ $taxonomy = wc_attribute_taxonomy_name_by_id( (int) $request['attribute_id'] );
+
+ $this->taxonomy = $taxonomy;
+ }
+
+ return $this->taxonomy;
+ }
+}
diff --git a/includes/admin/class-wc-admin-notices.php b/includes/admin/class-wc-admin-notices.php
index ff154db506e..52f766ec3fe 100644
--- a/includes/admin/class-wc-admin-notices.php
+++ b/includes/admin/class-wc-admin-notices.php
@@ -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,12 +58,19 @@ 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' );
}
/**
* Show a notice.
- * @param string $name
+ * @param string $name
*/
public static function add_notice( $name ) {
$notices = array_unique( array_merge( get_option( 'woocommerce_admin_notices', array() ), array( $name ) ) );
@@ -76,6 +84,7 @@ class WC_Admin_Notices {
public static function remove_notice( $name ) {
$notices = array_diff( get_option( 'woocommerce_admin_notices', array() ), array( $name ) );
update_option( 'woocommerce_admin_notices', $notices );
+ delete_option( 'woocommerce_admin_notice_' . $name );
}
/**
@@ -117,6 +126,36 @@ class WC_Admin_Notices {
foreach ( $notices as $notice ) {
if ( ! empty( $this->core_notices[ $notice ] ) && apply_filters( 'woocommerce_show_admin_notice', true, $notice ) ) {
add_action( 'admin_notices', array( $this, $this->core_notices[ $notice ] ) );
+ } else {
+ add_action( 'admin_notices', array( $this, 'output_custom_notices' ) );
+ }
+ }
+ }
+ }
+
+ /**
+ * Add a custom notice.
+ * @param string $name
+ * @param string $notice_html
+ */
+ public static function add_custom_notice( $name, $notice_html ) {
+ self::add_notice( $name );
+ update_option( 'woocommerce_admin_notice_' . $name, wp_kses_post( $notice_html ) );
+ }
+
+ /**
+ * Output any stored custom notices.
+ */
+ public function output_custom_notices() {
+ $notices = get_option( 'woocommerce_admin_notices', array() );
+ if ( $notices ) {
+ foreach ( $notices as $notice ) {
+ if ( empty( $this->core_notices[ $notice ] ) ) {
+ $notice_html = get_option( 'woocommerce_admin_notice_' . $notice );
+
+ if ( $notice_html ) {
+ include( 'views/html-notice-custom.php' );
+ }
}
}
}
@@ -225,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();
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index fe658a3e6ae..8077288b257 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -557,56 +557,132 @@ class WC_Admin_Setup_Wizard {
exit;
}
+ /**
+ * Simple array of gateways to show in wizard.
+ * @return array
+ */
+ protected function get_wizard_payment_gateways() {
+ $gateways = array(
+ 'paypal-braintree' => array(
+ 'name' => __( 'PayPal by Braintree', 'woocommerce' ),
+ 'image' => WC()->plugin_url() . '/assets/images/paypal-braintree.png',
+ 'description' => sprintf( __( 'Safe and secure payments using credit cards or your customer\'s paypal account. %sLearn more about PayPal%s.', 'woocommerce' ), '', '' ),
+ 'class' => 'featured featured-row-last',
+ 'repo-slug' => 'woocommerce-gateway-paypal-powered-by-braintree',
+ ),
+ 'paypal-ec' => array(
+ 'name' => __( 'PayPal Express Checkout', 'woocommerce' ),
+ 'image' => WC()->plugin_url() . '/assets/images/paypal.png',
+ 'description' => sprintf( __( 'Safe and secure payments using credit cards or your customer\'s PayPal account. %sLearn more about PayPal%s.', 'woocommerce' ), '', '' ),
+ 'class' => 'featured featured-row-last',
+ 'repo-slug' => 'woocommerce-gateway-paypal-express-checkout',
+ ),
+ 'stripe' => array(
+ 'name' => __( 'Stripe', 'woocommerce' ),
+ 'image' => WC()->plugin_url() . '/assets/images/stripe.png',
+ 'description' => sprintf( __( 'A modern and robust way to accept credit card payments on your store. %sLearn more about Stripe%s.', 'woocommerce' ), '', '' ),
+ 'class' => 'featured featured-row-first',
+ 'repo-slug' => 'woocommerce-gateway-stripe',
+ ),
+ 'paypal' => array(
+ 'name' => __( 'PayPal Standard', 'woocommerce' ),
+ 'description' => __( 'Accept payments via PayPal using account balance or credit card.', 'woocommerce' ),
+ 'image' => '',
+ 'class' => '',
+ 'settings' => array(
+ 'email' => array(
+ 'label' => __( 'PayPal email address', 'woocommerce' ),
+ 'type' => 'email',
+ 'value' => get_option( 'admin_email' ),
+ 'placeholder' => __( 'PayPal email address', 'woocommerce' ),
+ ),
+ ),
+ ),
+ 'cheque' => array(
+ 'name' => __( 'Cheque Payments', 'woocommerce' ),
+ 'description' => __( 'An simple offline gateway that lets you accept Cheque payment.', 'woocommerce' ),
+ 'image' => '',
+ 'class' => '',
+ ),
+ 'bacs' => array(
+ 'name' => __( 'Bank Transfer (BACS) Payments', 'woocommerce' ),
+ 'description' => __( 'An simple offline gateway that lets you accept BACS payment.', 'woocommerce' ),
+ 'image' => '',
+ 'class' => '',
+ ),
+ 'cod' => array(
+ 'name' => __( 'Cash on Delivery', 'woocommerce' ),
+ 'description' => __( 'An simple offline gateway that lets you accept cash on delivery.', 'woocommerce' ),
+ 'image' => '',
+ 'class' => '',
+ )
+ );
+
+ $country = WC()->countries->get_base_country();
+
+ if ( 'US' === $country ) {
+ unset( $gateways['paypal-ec'] );
+ } else {
+ unset( $gateways['paypal-braintree'] );
+ }
+
+ if ( ! current_user_can( 'install_plugins' ) ) {
+ unset( $gateways['paypal-braintree'] );
+ unset( $gateways['paypal-ec'] );
+ unset( $gateways['stripe'] );
+ }
+
+ return $gateways;
+ }
+
/**
* Payments Step.
*/
public function wc_setup_payments() {
- $paypal_settings = array_filter( (array) get_option( 'woocommerce_paypal_settings', array() ) );
- $cheque_settings = array_filter( (array) get_option( 'woocommerce_cheque_settings', array() ) );
- $cod_settings = array_filter( (array) get_option( 'woocommerce_cod_settings', array() ) );
- $bacs_settings = array_filter( (array) get_option( 'woocommerce_bacs_settings', array() ) );
+ $gateways = $this->get_wizard_payment_gateways();
?>
-