From 5c81b4f5ea3ff9a84a8b5dd2d6658281dddcf088 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Tue, 5 Oct 2021 13:27:56 +0300 Subject: [PATCH 01/34] Remove the current addons implementation --- assets/css/admin.scss | 360 --------------- includes/admin/class-wc-admin-addons.php | 435 +----------------- .../admin/views/html-admin-page-addons.php | 4 +- 3 files changed, 16 insertions(+), 783 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 47da6765b34..396a4b619fc 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -243,185 +243,6 @@ width: 124px; } - .addons-banner-block-item-icon, - .addons-column-block-item-icon { - align-items: center; - display: flex; - justify-content: center; - } - - .addons-banner-block, - .addons-wcs-banner-block { - background: #fff; - border: 1px solid #ddd; - margin: 0 0 1em 0; - padding: 2em 2em 1em; - } - - .addons-banner-block img { - height: 62px; - } - - .addons-banner-block p { - margin: 0 0 20px; - } - - .addons-banner-block-items { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-around; - margin: 0 -10px 0 -10px; - } - - .addons-banner-block-item { - border: 1px solid #e6e6e6; - border-radius: 3px; - flex: 1; - margin: 1em; - min-width: 200px; - width: 30%; - } - - .addons-banner-block-item-icon { - background: #f7f7f7; - height: 143px; - } - - .addons-banner-block-item-content { - display: flex; - flex-direction: column; - height: 184px; - justify-content: space-between; - padding: 24px; - } - - .addons-banner-block-item-content h3 { - margin-top: 0; - } - - .addons-banner-block-item-content p { - margin: 0 0 auto; - } - - .addons-wcs-banner-block { - display: flex; - align-items: center; - } - - .addons-promotion-block { - display: flex; - padding: 20px; - - .addons-img { - height: auto; - width: 200px; - } - } - - .addons-wcs-banner-block-image { - background: #f7f7f7; - border: 1px solid #e6e6e6; - margin-right: 2em; - padding: 4em; - max-width: 200px; - - .addons-img { - max-height: 86px; - max-width: 97px; - } - - &.is-full-image { - padding: 0; - background: none; - border: none; - - .addons-img { - max-height: 100%; - max-width: 100%; - } - } - } - - .addons-promotion-block-content { - display: flex; - flex-direction: column; - margin-left: 24px; - } - - .addons-promotion-block-description { - margin-bottom: 20px; - } - - .addons-promotion-block-title { - margin: 0 0 16px; - padding: 0; - } - - .addons-promotion-block-buttons { - margin-top: auto; - - .addons-button { - margin-right: 8px; - - &:last-child { - margin-right: 0; - } - } - } - - .addons-shipping-methods .addons-wcs-banner-block { - margin-left: 0; - margin-right: 0; - margin-top: 1em; - } - - .addons-wcs-banner-block-content { - display: flex; - flex-direction: column; - justify-content: space-around; - align-self: stretch; - padding: 1em 0; - - h1 { - padding-bottom: 0; - } - - p { - margin-bottom: 0; - } - - .wcs-logos-container { - display: flex; - align-items: center; - flex-direction: row; - justify-content: center; - - @media screen and (min-width: 500px) { - justify-content: left; - } - - li { - margin-right: 8px; - - &:last-child { - margin-right: 0; - } - } - } - - .wcs-service-logo { - max-width: 45px; - } - } - - .addons-column-section { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-around; - } - .addons-column { flex: 1; width: 50%; @@ -432,90 +253,6 @@ margin-right: 0; } - .addons-small-light-block, - .addons-small-dark-block, - .addons-column-block { - box-sizing: border-box; - border: 1px solid #ddd; - margin: 0 0 1em; - padding: 20px; - } - - .addons-column-block img { - max-height: 50px; - max-width: 50px; - } - - .addons-small-light-block, - .addons-column-block { - background: #fff; - } - - .addons-column-block-left { - float: left; - } - - .addons-column-block-right { - float: right; - } - - .addons-column-block-item { - border-top: 2px solid #f9f9f9; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-between; - margin: 0 -20px; - padding: 20px; - } - - .addons-column-block-item-icon { - background: #f7f7f7; - border: 1px solid #e6e6e6; - height: 100px; - margin: 0 10px 10px 0; - width: 100px; - } - - .addons-column-block-item-content { - display: flex; - flex: 1; - flex-wrap: wrap; - height: 20%; - justify-content: space-between; - min-width: 200px; - } - - .addons-column-block-item-content h2 { - float: left; - margin-top: 8px; - } - - .addons-column-block-item-content a { - float: right; - } - - .addons-column-block-item-content p { - float: left; - } - - .addons-banner-block-item, - .addons-column-block-item { - display: none; - } - - .addons-banner-block-item:nth-child(-n + 3) { - display: block; - } - - .addons-column-block-item:nth-of-type(-n + 3) { - display: flex; - } - - .addons-small-dark-block { - background-color: #54687d; - text-align: center; - } - .addons-small-dark-items { display: flex; flex-wrap: wrap; @@ -526,14 +263,6 @@ margin: 0 0 20px; } - .addons-small-dark-block h1 { - color: #fff; - } - - .addons-small-dark-block p { - color: #fafafa; - } - .addons-small-dark-item-icon img { height: 30px; } @@ -542,40 +271,6 @@ margin: 28px auto 0; } - .addons-small-light-block { - display: flex; - flex-wrap: wrap; - } - - .addons-small-light-block h1 { - margin-top: -12px; - } - - .addons-small-light-block p { - margin-top: 0; - } - - .addons-small-light-block img { - height: 225px; - margin: 0 0 0 -20px; - } - - .addons-small-light-block-content { - display: flex; - flex: 1 1 100px; - flex-direction: column; - justify-content: space-around; - } - - .addons-small-light-block-buttons { - display: flex; - justify-content: space-between; - } - - .addons-small-light-block-content a { - width: 48%; - } - .addons-button-solid { background-color: #674399; color: #fff; @@ -645,14 +340,6 @@ .addons-small-dark-item { width: 100%; } - - .addons-column-block-item-icon { - background: none; - border: none; - height: 75px; - margin: 0 10px 10px 0; - width: 75px; - } } .marketplace-content-wrapper { @@ -2954,30 +2641,6 @@ ul.wc_coupon_list_block { float: right; } } - - .wc-addons-wrap { - - .addons-promotion-block { - flex-direction: column; - padding: 24px; - - .addons-img { - height: auto; - width: 100%; - max-width: 240px; - margin: 0 auto 20px; - } - } - - .addons-promotion-block-content { - display: block; - margin-left: 0; - } - - .addons-promotion-block-title { - margin-top: 4px; - } - } } .column-customer_message .note-on { @@ -6755,29 +6418,6 @@ table.bar_chart { .woocommerce_options_panel p.form-field { padding: 5px 20px !important; } - - .addons-wcs-banner-block { - flex-direction: column; - } - - .wc-addons-wrap { - - .addons-wcs-banner-block { - padding: 40px; - } - - .addons-wcs-banner-block-image { - padding: 1em; - text-align: center; - width: 100%; - padding: 2em 0; - margin: 0; - - .addons-img { - margin: 0; - } - } - } } /** diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 82a96a401e9..2eb5d8480a8 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -20,10 +20,10 @@ class WC_Admin_Addons { /** * Get featured for the addons screen * - * @return array of objects + * @return void */ - public static function get_featured() { - $featured = get_transient( 'wc_addons_featured' ); + public static function render_featured() { + $featured = false; // get_transient( 'wc_addons_featured' ); // TODO: revert. if ( false === $featured ) { $headers = array(); $auth = WC_Helper_Options::get( 'auth' ); @@ -32,8 +32,9 @@ class WC_Admin_Addons { $headers['Authorization'] = 'Bearer ' . $auth['access_token']; } + // TODO: replace with WC.com, leave 2.0. $raw_featured = wp_safe_remote_get( - 'https://woocommerce.com/wp-json/wccom-extensions/1.0/featured', + 'https://woocommerce.test/wp-json/wccom-extensions/2.0/featured', array( 'headers' => $headers, 'user-agent' => 'WooCommerce Addons Page', @@ -49,8 +50,7 @@ class WC_Admin_Addons { } if ( is_object( $featured ) ) { - self::output_featured_sections( $featured->sections ); - return $featured; + self::output_featured( $featured ); } } @@ -206,423 +206,18 @@ class WC_Admin_Addons { } /** - * Handles the outputting of a banner block. + * Handles the outputting of featured page * - * @param object $block Banner data. + * @param array $blocks Featured page's blocks. */ - public static function output_banner_block( $block ) { - ?> -
-

title ); ?>

-

description ); ?>

-
- items as $item ) : ?> - -
-
- -
-
-

title ); ?>

-

description ); ?>

- href, - $item->button, - 'addons-button-solid', - $item->plugin - ); - ?> -
-
- - -
-
- container ) && 'column_container_start' === $block->container ) { - ?> -
- module ) { - ?> -
- -
- container ) && 'column_container_end' === $block->container ) { - ?> -
- -
-

title ); ?>

-

description ); ?>

- items as $item ) : ?> - -
-
- -
-
-

title ); ?>

- href, - $item->button, - 'addons-button-solid', - $item->plugin - ); - ?> -

description ); ?>

-
-
- - -
- - -
- -
-

title ); ?>

-

description ); ?>

-
- buttons as $button ) : ?> - href, - $button->text, - 'addons-button-solid' - ); - ?> - -
-
-
- -
-

title ); ?>

-

description ); ?>

-
- items as $item ) : ?> -
- image ) ) : ?> -
- -
- - href, - $item->button, - 'addons-button-outline-white' - ); - ?> -
- -
-
- 'woocommerce-services', - ) - ), - 'install-addon_woocommerce-services' - ); - - $defaults = array( - 'image' => WC()->plugin_url() . '/assets/images/wcs-extensions-banner-3x.jpg', - 'image_alt' => __( 'WooCommerce Shipping', 'woocommerce' ), - 'title' => __( 'Save time and money with WooCommerce Shipping', 'woocommerce' ), - 'description' => __( 'Print discounted USPS and DHL labels straight from your WooCommerce dashboard and save on shipping.', 'woocommerce' ), - 'button' => __( 'Free - Install now', 'woocommerce' ), - 'href' => $button_url, - 'logos' => array(), - ); - - switch ( $location['country'] ) { - case 'US': - $local_defaults = array( - 'logos' => array_merge( - $defaults['logos'], - array( - array( - 'link' => WC()->plugin_url() . '/assets/images/wcs-usps-logo.png', - 'alt' => 'USPS logo', - ), - array( - 'link' => WC()->plugin_url() . '/assets/images/wcs-dhlexpress-logo.png', - 'alt' => 'DHL Express logo', - ), - ) - ), - ); - break; - default: - $local_defaults = array(); - } - - $block_data = array_merge( $defaults, $local_defaults, $block ); - ?> -
-
- <?php echo esc_attr( $block_data['image_alt'] ); ?> -
-
-

-

-
    - -
  • - -
    • - -
- -
-
- 'woocommerce-payments', - ) - ), - 'install-addon_woocommerce-payments' - ); - - $defaults = array( - 'image' => WC()->plugin_url() . '/assets/images/wcpayments-icon-secure.png', - 'image_alt' => __( 'WooCommerce Payments', 'woocommerce' ), - 'title' => __( 'Payments made simple, with no monthly fees — exclusively for WooCommerce stores.', 'woocommerce' ), - 'description' => __( 'Securely accept cards in your store. See payments, track cash flow into your bank account, and stay on top of disputes – right from your dashboard.', 'woocommerce' ), - 'button' => __( 'Free - Install now', 'woocommerce' ), - 'href' => $button_url, - 'logos' => array(), - ); - - $block_data = array_merge( $defaults, $block ); - ?> -
-
- <?php echo esc_attr( $block_data['image_alt'] ); ?> -
-
-

-

- -
-
- geowhitelist ) ) { - $section_object->geowhitelist = explode( ',', $section_object->geowhitelist ); - } - - if ( ! empty( $section_object->geoblacklist ) ) { - $section_object->geoblacklist = explode( ',', $section_object->geoblacklist ); - } - - if ( ! self::show_extension( $section_object ) ) { - return; - } - - ?> -
- <?php echo esc_attr( $section['image_alt'] ); ?> -
-

-
- -
-
- -
-
-
- module ) { - case 'banner_block': - self::output_banner_block( $section ); + private static function output_featured( $blocks ) { + foreach ( $blocks as $block ) { + switch ( $block->type ) { + case 'group': + // TODO: break; - case 'column_start': - self::output_column( $section ); - break; - case 'column_end': - self::output_column( $section ); - break; - case 'column_block': - self::output_column_block( $section ); - break; - case 'small_light_block': - self::output_small_light_block( $section ); - break; - case 'small_dark_block': - self::output_small_dark_block( $section ); - break; - case 'wcs_banner_block': - self::output_wcs_banner_block( (array) $section ); - break; - case 'wcpay_banner_block': - self::output_wcpay_banner_block( (array) $section ); - break; - case 'promotion_block': - self::output_promotion_block( (array) $section ); + case 'banner': + // TODO: break; } } diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index ceaf5a380b6..cc464c2e2ec 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -76,9 +76,7 @@ $current_section_name = __( 'Browse Categories', 'woocommerce' );
- +
From 916a13b6c68f7d610b605be33e8bcdf68dd3cc6f Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 29 Sep 2021 16:23:04 +0300 Subject: [PATCH 02/34] Add stars and reviews number --- assets/css/admin.scss | 32 +++++++++++++++++++ assets/images/icons/star.svg | 13 ++++++++ .../admin/views/html-admin-page-addons.php | 24 ++++++++++---- 3 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 assets/images/icons/star.svg diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 396a4b619fc..d3169270371 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -421,7 +421,11 @@ } .product-footer { + align-items: center; border-top: 1px solid #dcdcde; + display: flex; + flex-direction: row; + justify-content: space-between; padding: 24px; .price { @@ -429,11 +433,39 @@ color: #1d2327; } + .price-suffix { + color: #646970; /* Gray 50 */ + } + + .product-reviews-block { + display: flex; + flex-direction: row; + margin-top: 4px; + + .product-rating-star { + background: url(../images/icons/star.svg) no-repeat; + background-size: contain; + height: 16px; + margin: 4px 4px 4px 0; + width: 17px; + } + + .product-reviews-count { + color: #646970; /* Gray 50 */ + font-size: 12px; + font-family: sans-serif; + line-height: 24px; + letter-spacing: -0.154px; + margin-left: 4px; + } + } + .button { background-color: #fff; border-color: #007cba; color: #007cba; float: right; + height: 22px; } } } diff --git a/assets/images/icons/star.svg b/assets/images/icons/star.svg new file mode 100644 index 00000000000..9f550f87964 --- /dev/null +++ b/assets/images/icons/star.svg @@ -0,0 +1,13 @@ + + + + diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index cc464c2e2ec..b70ccd18aab 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -125,12 +125,24 @@ $current_section_name = __( 'Browse Categories', 'woocommerce' );

excerpt ); ?>

- price ) : ?> - - - price ); ?> - - +
+
+ price ) : ?> + + + price ); ?> + + +
+ reviews_count ) : ?> +
+ +
+ + (reviews_count ); ?>) +
+ +
From 0b733d2d082904e1ba5b305964c329350bcb23b8 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 29 Sep 2021 16:47:54 +0300 Subject: [PATCH 03/34] Use icon instead of image if possible --- includes/admin/views/html-admin-page-addons.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index b70ccd18aab..ec5950969a2 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -116,12 +116,16 @@ $current_section_name = __( 'Browse Categories', 'woocommerce' ); ?>
  • - image ) ) : ?> - + image ) || ! empty( $addon->icon ) ) : ?> + + + +

    title ); ?>

     +

    excerpt ); ?>

    @@ -136,6 +140,7 @@ $current_section_name = __( 'Browse Categories', 'woocommerce' );
    reviews_count ) : ?>
    +
    From 003b29aa0c9aa558504a487b28eff8cfc84cd72c Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 29 Sep 2021 22:00:11 +0300 Subject: [PATCH 04/34] Add developed-by string --- assets/css/admin.scss | 12 ++++++++++++ .../admin/views/html-admin-page-addons.php | 18 ++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index d3169270371..99d6f7abd52 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -418,6 +418,18 @@ margin: 14px 64px 0 0; max-width: 389px; } + + .product-developed-by { + color: #50575e; /* Gray 60 */ + font-size: 12px; + font-family: sans-serif; + line-height: 20px; + margin-top: 4px; + + .product-vendor-link { + color: #50575e; /* Gray 60 */ + } + } } .product-footer { diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index ec5950969a2..62c76dedbee 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -119,13 +119,27 @@ $current_section_name = __( 'Browse Categories', 'woocommerce' ); image ) || ! empty( $addon->icon ) ) : ?> - +

    title ); ?>

     - + vendor_name ) && ! empty( $addon->vendor_url ) ) : ?> +
    + %2$s', + esc_url_raw( $addon->vendor_url ), + wp_kses_post( $addon->vendor_name ) + ) + ); + ?> +
    +

    excerpt ); ?>

    From b3756d398f54ffbcf2e61bca16e31bbc927e8388 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 29 Sep 2021 23:09:42 +0300 Subject: [PATCH 05/34] Show ratings with the use of stars --- assets/css/admin.scss | 14 +++++- .../icons/{star.svg => star-golden.svg} | 0 assets/images/icons/star-gray.svg | 13 ++++++ assets/images/icons/star-half-filled.svg | 18 ++++++++ .../admin/views/html-admin-page-addons.php | 43 +++++++++++++++++-- 5 files changed, 83 insertions(+), 5 deletions(-) rename assets/images/icons/{star.svg => star-golden.svg} (100%) create mode 100644 assets/images/icons/star-gray.svg create mode 100644 assets/images/icons/star-half-filled.svg diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 99d6f7abd52..ad34e0cc965 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -455,11 +455,23 @@ margin-top: 4px; .product-rating-star { - background: url(../images/icons/star.svg) no-repeat; + background-repeat: no-repeat; background-size: contain; height: 16px; margin: 4px 4px 4px 0; width: 17px; + + &__fill { + background-image: url(../images/icons/star-golden.svg); + } + + &__half-fill { + background-image: url(../images/icons/star-half-filled.svg); + } + + &__no-fill { + background-image: url(../images/icons/star-gray.svg); + } } .product-reviews-count { diff --git a/assets/images/icons/star.svg b/assets/images/icons/star-golden.svg similarity index 100% rename from assets/images/icons/star.svg rename to assets/images/icons/star-golden.svg diff --git a/assets/images/icons/star-gray.svg b/assets/images/icons/star-gray.svg new file mode 100644 index 00000000000..a530f2298af --- /dev/null +++ b/assets/images/icons/star-gray.svg @@ -0,0 +1,13 @@ + + + + diff --git a/assets/images/icons/star-half-filled.svg b/assets/images/icons/star-half-filled.svg new file mode 100644 index 00000000000..33b07e8ca1b --- /dev/null +++ b/assets/images/icons/star-half-filled.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index 62c76dedbee..e793617066b 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -13,6 +13,40 @@ if ( ! defined( 'ABSPATH' ) ) { $current_section_name = __( 'Browse Categories', 'woocommerce' ); +/** + * Determine which class should be used for a rating star: + * - golden + * - half-filled (50/50 golden and gray) + * - gray + * + * Consider ratings from 3.0 to 4.0 as an example + * 3.0 will produce 3 stars + * 3.1 to 3.5 will produce 3 stars and a half star + * 3.6 to 4.0 will product 4 stars + * + * @param float $rating Rating of a product. + * @param int $index Index of a star in a row. + * + * @return string CSS class to use. + */ +function wccom_get_star_class( $rating, $index ) { + if ( $rating >= $index ) { + // Rating more that current star to show. + return 'fill'; + } else if ( + abs( $index - 1 - floor( $rating ) ) < 0.0000001 && + 0 < ( $rating - floor( $rating ) ) + ) { + // For rating more than x.0 and less than x.5 or equal it will show a half star. + return 50 >= floor( ( $rating - floor( $rating ) ) * 100 ) + ? 'half-fill' + : 'fill'; + } + + // Don't show a golden star otherwise. + return 'no-fill'; +} + ?>

    @@ -152,11 +186,12 @@ $current_section_name = __( 'Browse Categories', 'woocommerce' );
    - reviews_count ) : ?> + reviews_count ) && ! empty( $addon->rating ) ) : ?> +
    - - -
    + + rating, $index ); ?> +
    (reviews_count ); ?>)
    From f0790cbf51779818dc6e90c1b419eed967047c79 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Tue, 5 Oct 2021 14:50:03 +0300 Subject: [PATCH 06/34] Address review comments --- includes/admin/views/html-admin-page-addons.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index e793617066b..2c021c4012b 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -150,10 +150,10 @@ function wccom_get_star_class( $rating, $index ) { ?>
  • - image ) || ! empty( $addon->icon ) ) : ?> + icon ) ) : ?> - - + + @@ -166,7 +166,7 @@ function wccom_get_star_class( $rating, $index ) { /* translators: %s vendor link */ esc_html__( 'Developed by %s', 'woocommerce' ), sprintf( - '%2$s', + '%2$s', esc_url_raw( $addon->vendor_url ), wp_kses_post( $addon->vendor_name ) ) From f5e36fe81f3201483a16af5b961de7946a1274de Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 6 Oct 2021 12:10:47 +0300 Subject: [PATCH 07/34] Refactor product card to use with groups --- includes/admin/class-wc-admin-addons.php | 355 +++++++++--------- .../admin/views/html-admin-page-addons.php | 67 +--- 2 files changed, 191 insertions(+), 231 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 2eb5d8480a8..9b7dd0cbf28 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -49,7 +49,7 @@ class WC_Admin_Addons { } } - if ( is_object( $featured ) ) { + if ( ! empty( $featured ) ) { self::output_featured( $featured ); } } @@ -125,86 +125,6 @@ class WC_Admin_Addons { return apply_filters( 'woocommerce_addons_sections', $addon_sections ); } - /** - * Get section for the addons screen. - * - * @param string $section_id Required section ID. - * - * @return object|bool - */ - public static function get_section( $section_id ) { - $sections = self::get_sections(); - if ( isset( $sections[ $section_id ] ) ) { - return $sections[ $section_id ]; - } - return false; - } - - /** - * Get section content for the addons screen. - * - * @param string $section_id Required section ID. - * - * @return array - */ - public static function get_section_data( $section_id ) { - $section = self::get_section( $section_id ); - $section_data = ''; - - if ( ! empty( $section->endpoint ) ) { - $section_data = get_transient( 'wc_addons_section_' . $section_id ); - if ( false === $section_data ) { - $raw_section = wp_safe_remote_get( esc_url_raw( $section->endpoint ), array( 'user-agent' => 'WooCommerce Addons Page' ) ); - - if ( ! is_wp_error( $raw_section ) ) { - $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) ); - - if ( ! empty( $section_data->products ) ) { - set_transient( 'wc_addons_section_' . $section_id, $section_data, WEEK_IN_SECONDS ); - } - } - } - } - - return apply_filters( 'woocommerce_addons_section_data', $section_data->products, $section_id ); - } - - /** - * Handles the outputting of a contextually aware Storefront link (points to child themes if Storefront is already active). - */ - public static function output_storefront_button() { - $template = get_option( 'template' ); - $stylesheet = get_option( 'stylesheet' ); - - if ( 'storefront' === $template ) { - if ( 'storefront' === $stylesheet ) { - $url = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/'; - $text = __( 'Need a fresh look? Try Storefront child themes', 'woocommerce' ); - $utm_content = 'nostorefrontchildtheme'; - } else { - $url = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/'; - $text = __( 'View more Storefront child themes', 'woocommerce' ); - $utm_content = 'hasstorefrontchildtheme'; - } - } else { - $url = 'https://woocommerce.com/storefront/'; - $text = __( 'Need a theme? Try Storefront', 'woocommerce' ); - $utm_content = 'nostorefront'; - } - - $url = add_query_arg( - array( - 'utm_source' => 'addons', - 'utm_medium' => 'product', - 'utm_campaign' => 'woocommerceplugin', - 'utm_content' => $utm_content, - ), - $url - ); - - echo '' . esc_html( $text ) . '' . "\n"; - } - /** * Handles the outputting of featured page * @@ -214,15 +134,65 @@ class WC_Admin_Addons { foreach ( $blocks as $block ) { switch ( $block->type ) { case 'group': - // TODO: + self::output_group( $block ); break; case 'banner': - // TODO: + self::output_banner( $block ); break; } } } + /** + * Render a group block including products + * + * @param mixed $block Block of the page for rendering. + * + * @return void + */ + private static function output_group( $block ) { + // TODO: Output products according to the group's capacity. + ?> +
    +

    title ); ?>

    + description ) ) : ?> +
    + description ); ?> +
    + + url ) : ?> + + + + +
    +
      + items as $item ) { + self::render_product_card( $item ); + } + ?> +
    +
    +
    + +
      + +
    + - - - - __( 'WooCommerce Services', 'woocommerce' ), - 'repo-slug' => 'woocommerce-services', - ); - - WC_Install::background_installer( $services_plugin_id, $services_plugin ); - - wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) ); - exit; - } - - /** - * Install WooCommerce Payments from the Extensions screens. - * - * @param string $section Optional. Extenstions tab. - * - * @return void - */ - public static function install_woocommerce_payments_addon( $section = '_featured' ) { - check_admin_referer( 'install-addon_woocommerce-payments' ); - - $wcpay_plugin_id = 'woocommerce-payments'; - $wcpay_plugin = array( - 'name' => __( 'WooCommerce Payments', 'woocommerce' ), - 'repo-slug' => 'woocommerce-payments', - ); - - WC_Install::background_installer( $wcpay_plugin_id, $wcpay_plugin ); - - do_action( 'woocommerce_addon_installed', $wcpay_plugin_id, $section ); - - wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) ); - exit; - } - - /** - * Should an extension be shown on the featured page. - * - * @param object $item Item data. - * @return boolean - */ - public static function show_extension( $item ) { - $location = WC()->countries->get_base_country(); - if ( isset( $item->geowhitelist ) && ! in_array( $location, $item->geowhitelist, true ) ) { - return false; - } - - if ( isset( $item->geoblacklist ) && in_array( $location, $item->geoblacklist, true ) ) { - return false; - } - - if ( is_plugin_active( $item->plugin ) ) { - return false; - } - - return true; - } - /** * We're displaying page=wc-addons and page=wc-addons§ion=helper as two separate pages. * When we're on those pages, add body classes to distinguishe them. @@ -406,4 +288,135 @@ class WC_Admin_Addons { return " $admin_body_class woocommerce-page-wc-marketplace "; } + + /** + * Map data from different endpoints to a universal format + * + * Search and featured products has a slightly different products' field names. + * Mapping converts different data structures into a universal one for further processing. + * + * @param mixed $data Product Card Data. + * + * @return object Converted data. + */ + public static function map_product_card_data( $data ) { + $mapped = (object) null; + + $type = $data->type ?? null; + + // Icon. + $mapped->icon = $data->icon ?? null; + // URL. + $mapped->url = $data->link ?? null; + if ( empty( $mapped->url ) ) { + $mapped->url = $data->url ?? null; + } + // Title. + $mapped->title = $data->title ?? null; + // Vendor Name. + $mapped->vendor_name = $data->vendor_name ?? null; + if ( empty( $mapped->vendor_name ) ) { + $mapped->vendor_name = $data->vendorName ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + } + // Vendor URL. + $mapped->vendor_url = $data->vendor_url ?? null; + if ( empty( $mapped->vendor_url ) ) { + $mapped->vendor_url = $data->vendorUrl ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + } + // Description. + $mapped->description = $data->excerpt ?? null; + if ( empty( $mapped->description ) ) { + $mapped->description = $data->description ?? null; + } + $has_currency_symbol = ! empty( $data->currencySymbol ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + + // Is Free. + if ( $has_currency_symbol ) { + $mapped->is_free = 0 === $data->price; + } else { + $mapped->is_free = '$0.00' === $data->price; + } + // Price. + if ( $has_currency_symbol ) { + // TODO: Ensure that this currency trick is good enough. + $mapped->price = wc_price( $data->price, array( 'currency' => 'USD' ) ); + } else { + $mapped->price = $data->price; + } + // Rating. + $mapped->rating = $data->rating ?? null; + // Reviews Count. + $mapped->reviews_count = $data->reviews_count ?? null; + + return $mapped; + } + + /** + * Render a product card + * + * There's difference in data structure (e.g. field names) between endpoints such as search and + * featured. Inner mapping helps to use universal field names for further work. + * + * @param mixed $data Product data. + */ + public static function render_product_card( $data ) { + $mapped = self::map_product_card_data( $data ); + $product_url = self::add_in_app_purchase_url_params( $mapped->url ); + ?> +
  • +
    + icon ) ) : ?> + + + + + + +

    title ); ?>

    +     + vendor_name ) && ! empty( $mapped->vendor_url ) ) : ?> +
    + %2$s', + esc_url_raw( $mapped->vendor_url ), + wp_kses_post( $mapped->vendor_name ) + ) + ); + ?> +
    + +

    description ); ?>

    +
    +
    +
    +
    + is_free ) : ?> + + + price ); ?> + + +
    + reviews_count ) && ! empty( $mapped->rating ) ) : ?> + +
    + + rating, $index ); ?> +
    + + (reviews_count ); ?>) +
    + +
    + + + +
    +
    • + -
    - -
    + + + -
    - -
    + + +
      @@ -148,60 +148,7 @@ function wccom_get_star_class( $rating, $index ) { } } ?> -
    • -
      - icon ) ) : ?> - - - - - - -

      title ); ?>

      -       - vendor_name ) && ! empty( $addon->vendor_url ) ) : ?> -
      - %2$s', - esc_url_raw( $addon->vendor_url ), - wp_kses_post( $addon->vendor_name ) - ) - ); - ?> -
      - -

      excerpt ); ?>

      -
      -
      -
      -
      - price ) : ?> - - - price ); ?> - - -
      - reviews_count ) && ! empty( $addon->rating ) ) : ?> - -
      - - rating, $index ); ?> -
      - - (reviews_count ); ?>) -
      - -
      - - - -
      -
      • +
    From f1cf6286281f87602f902aac5bac146a7e5332f6 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 6 Oct 2021 17:38:01 +0300 Subject: [PATCH 08/34] Handle product-like banners --- assets/css/admin.scss | 5 +++++ includes/admin/class-wc-admin-addons.php | 25 +++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index ad34e0cc965..1fb1a9b6187 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -357,6 +357,11 @@ max-width: 1032px; overflow: hidden; + // TODO: check on different screen sizes + .product.addons-product-banner { + max-width: calc(100% - 2px); + } + li { background: #fff; border: 1px solid #dcdcde; diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 9b7dd0cbf28..26d9d8e08de 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -132,7 +132,8 @@ class WC_Admin_Addons { */ private static function output_featured( $blocks ) { foreach ( $blocks as $block ) { - switch ( $block->type ) { + $block_type = $block->type ?? null; + switch ( $block_type ) { case 'group': self::output_group( $block ); break; @@ -188,7 +189,7 @@ class WC_Admin_Addons { private static function output_banner( $block ) { ?>
      - + type ); ?>
    rating = $data->rating ?? null; + if ( null === $mapped->rating ) { + $mapped->rating = $data->averageRating ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + } // Reviews Count. $mapped->reviews_count = $data->reviews_count ?? null; + if ( null === $mapped->reviews_count ) { + $mapped->reviewsCount = $data->reviewsCount ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + } return $mapped; } @@ -357,13 +364,21 @@ class WC_Admin_Addons { * There's difference in data structure (e.g. field names) between endpoints such as search and * featured. Inner mapping helps to use universal field names for further work. * - * @param mixed $data Product data. + * @param mixed $data Product data. + * @param string $block_type Block type that's different from the default product card, e.g. a banner. + * + * @return void */ - public static function render_product_card( $data ) { + public static function render_product_card( $data, $block_type = null ) { $mapped = self::map_product_card_data( $data ); $product_url = self::add_in_app_purchase_url_params( $mapped->url ); + $class_names = array( 'product' ); + // Specify a class name according to $block_type (if it's specified). + if ( null !== $block_type ) { + $class_names[] = 'addons-product-' . $block_type; + } ?> -
  • +
  • icon ) ) : ?> From a80058ca6960f833771758b5a4d38c2cf8514bef Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 6 Oct 2021 19:31:20 +0300 Subject: [PATCH 09/34] Render buttons based banner --- assets/css/admin.scss | 47 ++++++++++++++++++++++++ includes/admin/class-wc-admin-addons.php | 41 +++++++++++++++++++-- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 1fb1a9b6187..35f40b100f2 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -418,12 +418,21 @@ margin: 0 !important; } + .addons-buttons-banner-details h2 { + color: #1d2327; // Gray / Gray 90 + } + p { color: #2c3338; margin: 14px 64px 0 0; max-width: 389px; } + .addons-buttons-banner-details p { + font-size: 14px; + max-width: none; + } + .product-developed-by { color: #50575e; /* Gray 60 */ font-size: 12px; @@ -498,6 +507,44 @@ } } } + + .addons-buttons-banner { + display: flex; + flex-direction: row; + + .addons-buttons-banner-image { + background-repeat: no-repeat; + background-size: cover; + height: 190px; + margin: 24px; + width: 200px; + } + + .addons-buttons-banner-details-container { + padding-left: 0; + width: calc(100% - 198px - 24px - 24px); + } + + .addons-buttons-banner-details-container { + display: flex; + flex-direction: column; + justify-content: space-between; + } + + .button.addons-buttons-banner-button, + .button.addons-buttons-banner-button:hover { + background: #fff; + border: 1.5px solid #624594; + color: #624594; + padding: 4px 12px; + margin-right: 16px; + + &.addons-buttons-banner-button-primary { + background-color: #624594; + color: #fff; + } + } + } } .storefront { diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 26d9d8e08de..efd7cd5b1f2 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -187,11 +187,46 @@ class WC_Admin_Addons { * @return void */ private static function output_banner( $block ) { - ?> + if ( empty( $block->buttons ) ) { + // Render a product-like banner. + ?>
      - type ); ?> + type ); ?>
    - +
      +
    • +
      +
      +
      +

      title ); ?>

      +

      description, array() ); ?>

      +
      +
      + buttons as $button ) { + $button_classes = array( 'button', 'addons-buttons-banner-button' ); + $type = $button->type ?? null; + if ( 'primary' === $type ) { + $button_classes[] = 'addons-buttons-banner-button-primary'; + } + ?> + + title ); ?> + + +
      +
      +
      • +
    + Date: Thu, 7 Oct 2021 14:06:47 +0300 Subject: [PATCH 10/34] Output products according to the group's capacity --- assets/css/admin.scss | 4 ++++ includes/admin/class-wc-admin-addons.php | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 35f40b100f2..79e18a1ce56 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -362,6 +362,10 @@ max-width: calc(100% - 2px); } + &.addons-products-three-column li.product { + max-width: calc(33.33% - 12px); + } + li { background: #fff; border: 1px solid #dcdcde; diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index efd7cd5b1f2..7de07203a87 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -152,7 +152,9 @@ class WC_Admin_Addons { * @return void */ private static function output_group( $block ) { - // TODO: Output products according to the group's capacity. + $capacity = $block->capacity ?? 3; + $product_list_classes = 3 === $capacity ? 'three-column' : 'two-column'; + $product_list_classes = 'products addons-products-' . $product_list_classes; ?>

    title ); ?>

    @@ -167,7 +169,7 @@ class WC_Admin_Addons {
    -
      +
        items as $item ) { self::render_product_card( $item ); From 2b0f3d1182007c7304d897cd4e9e74161d947acc Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 14:28:59 +0300 Subject: [PATCH 11/34] Fix showing rating/reviews number --- includes/admin/class-wc-admin-addons.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 7de07203a87..8d51ecf61bc 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -389,7 +389,7 @@ class WC_Admin_Addons { // Reviews Count. $mapped->reviews_count = $data->reviews_count ?? null; if ( null === $mapped->reviews_count ) { - $mapped->reviewsCount = $data->reviewsCount ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + $mapped->reviews_count = $data->reviewsCount ?? null; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase } return $mapped; From 038ca86abbe78a65829819c9ed93013515b498d4 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 15:27:28 +0300 Subject: [PATCH 12/34] Fix product-related banner's image position --- assets/css/admin.scss | 17 +++++++- includes/admin/class-wc-admin-addons.php | 53 ++++++++++++++---------- 2 files changed, 47 insertions(+), 23 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 79e18a1ce56..f722344674f 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -358,7 +358,8 @@ overflow: hidden; // TODO: check on different screen sizes - .product.addons-product-banner { + .product.addons-product-banner, + .product.addons-buttons-banner { max-width: calc(100% - 2px); } @@ -392,11 +393,14 @@ } .product-details { + align-items: start; + display: flex; + flex-direction: row; + justify-content: space-between; padding: 24px; .product-img-wrap { display: block; - float: right; margin-left: 24px; img { @@ -408,6 +412,15 @@ } } + &.addon-product-banner-details { + align-items: center; + + .product-img-wrap img { + max-width: 150px; + max-height: 150px; + } + } + h2, h3 { color: #007cba; diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 8d51ecf61bc..5261c8f66a9 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -200,7 +200,7 @@ class WC_Admin_Addons { // Render a banner with buttons. ?>
          -
        • +
        • @@ -344,6 +344,10 @@ class WC_Admin_Addons { // Icon. $mapped->icon = $data->icon ?? null; + if ( null === $mapped->icon && 'banner' === $type ) { + // For product-related banners icon is a product's image. + $mapped->icon = $data->image ?? null; + } // URL. $mapped->url = $data->link ?? null; if ( empty( $mapped->url ) ) { @@ -414,34 +418,41 @@ class WC_Admin_Addons { if ( null !== $block_type ) { $class_names[] = 'addons-product-' . $block_type; } + + $product_details_classes = 'product-details'; + if ( 'banner' === $block_type ) { + $product_details_classes .= ' addon-product-banner-details'; + } ?>
        • -
          +
          +
          + +

          title ); ?>

          +           + vendor_name ) && ! empty( $mapped->vendor_url ) ) : ?> +
          + %2$s', + esc_url_raw( $mapped->vendor_url ), + wp_kses_post( $mapped->vendor_name ) + ) + ); + ?> +
          + +

          description ); ?>

          +
          icon ) ) : ?> - -

          title ); ?>

          -           - vendor_name ) && ! empty( $mapped->vendor_url ) ) : ?> -
          - %2$s', - esc_url_raw( $mapped->vendor_url ), - wp_kses_post( $mapped->vendor_name ) - ) - ); - ?> -
          - -

          description ); ?>

          From 7e428cfbbffbf37c3270f6d053071d071d81b2cc Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 15:34:29 +0300 Subject: [PATCH 13/34] Apply product group's capacity --- includes/admin/class-wc-admin-addons.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 5261c8f66a9..153cfe0a2c9 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -171,7 +171,8 @@ class WC_Admin_Addons {
            items as $item ) { + $products = array_slice( $block->items, 0, $capacity ); + foreach ( $products as $item ) { self::render_product_card( $item ); } ?> From 61cb829726f26785d8c2d93a4e4bf74cda6e67e9 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 18:27:32 +0300 Subject: [PATCH 14/34] Fix icon/image/paragraph of the product card --- assets/css/admin.scss | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index f722344674f..419eb3c8309 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -393,15 +393,16 @@ } .product-details { - align-items: start; - display: flex; - flex-direction: row; - justify-content: space-between; padding: 24px; + position: relative; + /* Display an image (product's icon) top right */ .product-img-wrap { display: block; margin-left: 24px; + position: absolute; + right: 24px; + top: 24px; img { border-radius: 3px; @@ -412,12 +413,20 @@ } } + /* Align aproduct-related banner image vertically centered */ &.addon-product-banner-details { align-items: center; + display: flex; + flex-direction: row; + justify-content: space-between; - .product-img-wrap img { - max-width: 150px; - max-height: 150px; + .product-img-wrap { + position: unset; + + img { + max-width: 150px; + max-height: 150px; + } } } @@ -433,6 +442,8 @@ font-weight: 400; line-height: 28px; margin: 0 !important; + // Don't cover a product icon + max-width: calc(100% - 48px - 24px); } .addons-buttons-banner-details h2 { @@ -442,7 +453,7 @@ p { color: #2c3338; margin: 14px 64px 0 0; - max-width: 389px; + width: 100%; } .addons-buttons-banner-details p { From 2f1835feec70bf0a5de6ff1255a74d5997f7eb9c Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 22:19:57 +0300 Subject: [PATCH 15/34] Adjust group's title+description+see more block --- assets/css/admin.scss | 75 ++++++++++++++++++------ includes/admin/class-wc-admin-addons.php | 16 ++--- 2 files changed, 67 insertions(+), 24 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 419eb3c8309..eec7921ef88 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -194,14 +194,6 @@ } } - h1.search-form-title { - clear: left; - font-size: 20px; - line-height: 1.2; - margin: 48px 0 16px; - padding: 0; - } - .update-plugins .update-count { background-color: #d54e21; border-radius: 10px; @@ -215,6 +207,26 @@ vertical-align: text-top; } + /** + * Marketplace related variables + */ + $font-sf-pro-text: + helveticaneue-light, + "Helvetica Neue Light", + "Helvetica Neue", + sans-serif; + + $font-sf-pro-display: sans-serif; + + h1.search-form-title { + clear: left; + font-size: 20px; + font-family: $font-sf-pro-display; + line-height: 1.2; + margin: 48px 0 16px; + padding: 0; + } + .addons-featured { margin: 0; } @@ -343,15 +355,39 @@ } .marketplace-content-wrapper { + font-family: $font-sf-pro-text; margin: 0 auto; max-width: 1032px; width: 100%; } + .addon-product-group-title { + font-family: $font-sf-pro-display; + letter-spacing: 0.38px; + } + + .addon-product-group-description-container { + align-items: center; + display: flex; + flex-direction: row; + font-size: 14px; + justify-content: space-between; + line-height: 20px; + + .addon-product-group-see-more, + .addon-product-group-see-more:visited { + color: #007cba; /* Primary / Blue */ + display: block; + font-size: 13px; + text-decoration: none; + } + } + .products { display: flex; flex-flow: row; flex-wrap: wrap; + font-weight: normal; justify-content: space-between; margin: 0; max-width: 1032px; @@ -363,8 +399,14 @@ max-width: calc(100% - 2px); } + // Adjust heading titles font for three-column product groups &.addons-products-three-column li.product { max-width: calc(33.33% - 12px); + + h2, + h3 { + font-size: 16px; + } } li { @@ -433,17 +475,13 @@ h2, h3 { color: #007cba; - font-family: - HelveticaNeue-Light, - "Helvetica Neue Light", - "Helvetica Neue", - sans-serif; font-size: 20px; font-weight: 400; + letter-spacing: -0.32px; line-height: 28px; margin: 0 !important; // Don't cover a product icon - max-width: calc(100% - 48px - 24px); + max-width: calc(100% - 48px); } .addons-buttons-banner-details h2 { @@ -452,6 +490,8 @@ p { color: #2c3338; + font-size: 14px; + line-height: 20px; margin: 14px 64px 0 0; width: 100%; } @@ -464,7 +504,6 @@ .product-developed-by { color: #50575e; /* Gray 60 */ font-size: 12px; - font-family: sans-serif; line-height: 20px; margin-top: 4px; @@ -519,7 +558,6 @@ .product-reviews-count { color: #646970; /* Gray 50 */ font-size: 12px; - font-family: sans-serif; line-height: 24px; letter-spacing: -0.154px; margin-left: 4px; @@ -531,7 +569,10 @@ border-color: #007cba; color: #007cba; float: right; - height: 22px; + font-size: 13px; + height: 36px; + line-height: 30px; + padding: 2px 14px; } } } diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 153cfe0a2c9..6607bb1a6cb 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -157,17 +157,19 @@ class WC_Admin_Addons { $product_list_classes = 'products addons-products-' . $product_list_classes; ?>
            -

            title ); ?>

            - description ) ) : ?> -
            +

            title ); ?>

            +
            + description ) ) : ?> +
            description ); ?>
            - - url ) : ?> - + + url ) : ?> + - + +
              Date: Thu, 7 Oct 2021 23:02:01 +0300 Subject: [PATCH 16/34] Use 3-column groups for screens more than 960px --- assets/css/admin.scss | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index eec7921ef88..6b2b8edbd08 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -393,19 +393,20 @@ max-width: 1032px; overflow: hidden; - // TODO: check on different screen sizes .product.addons-product-banner, .product.addons-buttons-banner { max-width: calc(100% - 2px); } - // Adjust heading titles font for three-column product groups - &.addons-products-three-column li.product { - max-width: calc(33.33% - 12px); + @media screen and (min-width: 960px) { + // Adjust heading titles font for three-column product groups + &.addons-products-three-column li.product { + max-width: calc(33.33% - 12px); - h2, - h3 { - font-size: 16px; + h2, + h3 { + font-size: 16px; + } } } From 9271855161c84a42c61ca0d35639f6b495776983 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 23:02:59 +0300 Subject: [PATCH 17/34] Use currency code from WCCOM instead of symbol --- includes/admin/class-wc-admin-addons.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 6607bb1a6cb..5e68ec1556d 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -373,18 +373,17 @@ class WC_Admin_Addons { if ( empty( $mapped->description ) ) { $mapped->description = $data->description ?? null; } - $has_currency_symbol = ! empty( $data->currencySymbol ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + $has_currency = ! empty( $data->currency ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase // Is Free. - if ( $has_currency_symbol ) { + if ( $has_currency ) { $mapped->is_free = 0 === $data->price; } else { $mapped->is_free = '$0.00' === $data->price; } // Price. - if ( $has_currency_symbol ) { - // TODO: Ensure that this currency trick is good enough. - $mapped->price = wc_price( $data->price, array( 'currency' => 'USD' ) ); + if ( $has_currency ) { + $mapped->price = wc_price( $data->price, array( 'currency' => $data->currency ) ); } else { $mapped->price = $data->price; } From a09becd8f839c03f14fe4c2281b872492e5a8609 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 7 Oct 2021 23:04:22 +0300 Subject: [PATCH 18/34] Revert debug code --- includes/admin/class-wc-admin-addons.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 5e68ec1556d..ebc70726daf 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -23,7 +23,7 @@ class WC_Admin_Addons { * @return void */ public static function render_featured() { - $featured = false; // get_transient( 'wc_addons_featured' ); // TODO: revert. + $featured = get_transient( 'wc_addons_featured' ); if ( false === $featured ) { $headers = array(); $auth = WC_Helper_Options::get( 'auth' ); @@ -32,9 +32,9 @@ class WC_Admin_Addons { $headers['Authorization'] = 'Bearer ' . $auth['access_token']; } - // TODO: replace with WC.com, leave 2.0. + // Important: WCCOM Extensions API v2.0 is used. $raw_featured = wp_safe_remote_get( - 'https://woocommerce.test/wp-json/wccom-extensions/2.0/featured', + 'https://woocommerce.com/wp-json/wccom-extensions/2.0/featured', array( 'headers' => $headers, 'user-agent' => 'WooCommerce Addons Page', From cc0b78f8ecf878ebc74a20a49c5e29045432050e Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 13 Oct 2021 17:23:37 +0300 Subject: [PATCH 19/34] Test: clean up before running tests --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec0263a68c8..a849b40d518 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,9 @@ jobs: composer dump-autoload fi + - name: Clean up + run: rm -rf /tmp/wordpress-tests-lib + - name: Init DB and WP run: ./tests/bin/install.sh woo_test root root 127.0.0.1 ${{ matrix.wp }} From 618eca7c6ad76a93bb61972c0bdb55eddff03317 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Wed, 13 Oct 2021 17:38:56 +0300 Subject: [PATCH 20/34] Try remove vendor folder from cache --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a849b40d518..c25a8e57155 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,9 +50,8 @@ jobs: - name: Get cached composer directories uses: actions/cache@v2 with: - path: | + path: | # temporary remove ./vendor folder ./packages - ./vendor key: ${{ runner.os }}-${{ hashFiles('./composer.lock') }} - name: Setup and install composer From f6225ba8e15ca2dadc03bd200ba66b515d52e649 Mon Sep 17 00:00:00 2001 From: And Finally Date: Wed, 13 Oct 2021 17:37:37 +0100 Subject: [PATCH 21/34] Update includes/admin/class-wc-admin-addons.php Returning country in request to featured 2.0 endpoint. --- includes/admin/class-wc-admin-addons.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index ebc70726daf..56651a31f17 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -32,6 +32,12 @@ class WC_Admin_Addons { $headers['Authorization'] = 'Bearer ' . $auth['access_token']; } + $parameter_string = ''; + $country = WC()->countries->get_base_country(); + if ( ! empty( $country ) ) { + $parameter_string = '?' . http_build_query( array( 'country' => $country ) ); + } + // Important: WCCOM Extensions API v2.0 is used. $raw_featured = wp_safe_remote_get( 'https://woocommerce.com/wp-json/wccom-extensions/2.0/featured', From d21faf4854e801fb2505292b1f9f4ed5c5b1e459 Mon Sep 17 00:00:00 2001 From: And Finally Date: Wed, 13 Oct 2021 17:37:59 +0100 Subject: [PATCH 22/34] Update includes/admin/class-wc-admin-addons.php Adding `$parameter_string` to end of URL for featured endpoint. --- includes/admin/class-wc-admin-addons.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 56651a31f17..67d10bf6053 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -40,7 +40,7 @@ class WC_Admin_Addons { // Important: WCCOM Extensions API v2.0 is used. $raw_featured = wp_safe_remote_get( - 'https://woocommerce.com/wp-json/wccom-extensions/2.0/featured', + 'https://woocommerce.com/wp-json/wccom-extensions/2.0/featured' . $parameter_string, array( 'headers' => $headers, 'user-agent' => 'WooCommerce Addons Page', From 2fd16822c7ce01324fe1256f90e4d173663d724b Mon Sep 17 00:00:00 2001 From: And Finally Date: Wed, 13 Oct 2021 17:46:17 +0100 Subject: [PATCH 23/34] Updated content-hash to try and fix phpunit failure. https://github.com/woocommerce/woocommerce/pull/30840\#issuecomment-942422984. --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index f24a0432462..0c587f69820 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1a8d9b536eba5d14612c538b56803186", + "content-hash": "f694e88349087e677d5ae262107235de", "packages": [ { "name": "automattic/jetpack-autoloader", From e12efaacde2545dc3e0c698bb16fde48cd5b2c32 Mon Sep 17 00:00:00 2001 From: And Finally Date: Wed, 13 Oct 2021 18:27:17 +0100 Subject: [PATCH 24/34] Reverting changes to CircleCi config in 618eca7c6ad76a93bb61972c0bdb55eddff03317 and cc0b78f8ecf878ebc74a20a49c5e29045432050e. These were attempts to unstick PHPUnit tests. --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c25a8e57155..ec0263a68c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,8 +50,9 @@ jobs: - name: Get cached composer directories uses: actions/cache@v2 with: - path: | # temporary remove ./vendor folder + path: | ./packages + ./vendor key: ${{ runner.os }}-${{ hashFiles('./composer.lock') }} - name: Setup and install composer @@ -69,9 +70,6 @@ jobs: composer dump-autoload fi - - name: Clean up - run: rm -rf /tmp/wordpress-tests-lib - - name: Init DB and WP run: ./tests/bin/install.sh woo_test root root 127.0.0.1 ${{ matrix.wp }} From 26affe1e8a6552f4d44c7641777f9f3ff1b4d39f Mon Sep 17 00:00:00 2001 From: And Finally Date: Wed, 13 Oct 2021 18:39:57 +0100 Subject: [PATCH 25/34] Added condition to prevent showing `Sorry, could not find anything` message on featured page. This should only be shown when a search term has been submitted. --- includes/admin/views/html-admin-page-addons.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index 61a44acde0c..0c755c9c1c4 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -99,7 +99,7 @@ function wccom_get_star_class( $rating, $index ) {
              - +

              From c66d6f6095905e692bab2952fdc66f64e29dce31 Mon Sep 17 00:00:00 2001 From: And Finally Date: Wed, 13 Oct 2021 18:56:38 +0100 Subject: [PATCH 26/34] Restored `output_search_promotion_block` and some of the CSS for `.addons-wcs-banner-block`. --- assets/css/admin.scss | 30 +++++++++++++++++++++++ includes/admin/class-wc-admin-addons.php | 31 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 6b2b8edbd08..a439f15aa4d 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -255,6 +255,13 @@ width: 124px; } + .addons-wcs-banner-block { + background: #fff; + border: 1px solid #ddd; + margin: 0 0 1em 0; + padding: 2em 2em 1em; + } + .addons-column { flex: 1; width: 50%; @@ -6596,6 +6603,29 @@ table.bar_chart { .woocommerce_options_panel p.form-field { padding: 5px 20px !important; } + + .addons-wcs-banner-block { + flex-direction: column; + } + + .wc-addons-wrap { + + .addons-wcs-banner-block { + padding: 40px; + } + + .addons-wcs-banner-block-image { + padding: 1em; + text-align: center; + width: 100%; + padding: 2em 0; + margin: 0; + + .addons-img { + margin: 0; + } + } + } } /** diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index c29a2817de1..d0873cfa563 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -469,6 +469,37 @@ class WC_Admin_Addons { return $formatted_promotions; } + /** + * Output the HTML for the promotion block. + * + * @param array $promotion Array of promotion block data. + * @return void + */ + public static function output_search_promotion_block( array $promotion ) { + ?> +
              +
              + <?php echo esc_attr( $promotion['image_alt'] ); ?> +
              +
              +

              +

              + +
              +
              + Date: Wed, 13 Oct 2021 19:07:36 +0100 Subject: [PATCH 27/34] Restored more styles for `.addons-wcs-banner-block` used for WCPay and WCShip banners. Restored `install_woocommerce_services_addon` and `install_woocommerce_payments_addon` methods, needed to install plugins from WCPay and WCShip banners. --- assets/css/admin.scss | 71 ++++++++++++++++++++++++ includes/admin/class-wc-admin-addons.php | 42 ++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index a439f15aa4d..f7cd7e4c09c 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -256,12 +256,83 @@ } .addons-wcs-banner-block { + align-items: center; background: #fff; border: 1px solid #ddd; + display: flex; margin: 0 0 1em 0; padding: 2em 2em 1em; } + .addons-wcs-banner-block-image { + background: #f7f7f7; + border: 1px solid #e6e6e6; + margin-right: 2em; + padding: 4em; + max-width: 200px; + + .addons-img { + max-height: 86px; + max-width: 97px; + } + + &.is-full-image { + padding: 0; + background: none; + border: none; + + .addons-img { + max-height: 100%; + max-width: 100%; + } + } + } + + .addons-shipping-methods .addons-wcs-banner-block { + margin-left: 0; + margin-right: 0; + margin-top: 1em; + } + + .addons-wcs-banner-block-content { + display: flex; + flex-direction: column; + justify-content: space-around; + align-self: stretch; + padding: 1em 0; + + h1 { + padding-bottom: 0; + } + + p { + margin-bottom: 0; + } + + .wcs-logos-container { + display: flex; + align-items: center; + flex-direction: row; + justify-content: center; + + @media screen and (min-width: 500px) { + justify-content: left; + } + + li { + margin-right: 8px; + + &:last-child { + margin-right: 0; + } + } + } + + .wcs-service-logo { + max-width: 45px; + } + } + .addons-column { flex: 1; width: 50%; diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index d0873cfa563..fcae95e7295 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -384,6 +384,48 @@ class WC_Admin_Addons { include_once dirname( __FILE__ ) . '/views/html-admin-page-addons.php'; } + /** + * Install WooCommerce Services from Extensions screens. + */ + public static function install_woocommerce_services_addon() { + check_admin_referer( 'install-addon_woocommerce-services' ); + + $services_plugin_id = 'woocommerce-services'; + $services_plugin = array( + 'name' => __( 'WooCommerce Services', 'woocommerce' ), + 'repo-slug' => 'woocommerce-services', + ); + + WC_Install::background_installer( $services_plugin_id, $services_plugin ); + + wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) ); + exit; + } + + /** + * Install WooCommerce Payments from the Extensions screens. + * + * @param string $section Optional. Extenstions tab. + * + * @return void + */ + public static function install_woocommerce_payments_addon( $section = '_featured' ) { + check_admin_referer( 'install-addon_woocommerce-payments' ); + + $wcpay_plugin_id = 'woocommerce-payments'; + $wcpay_plugin = array( + 'name' => __( 'WooCommerce Payments', 'woocommerce' ), + 'repo-slug' => 'woocommerce-payments', + ); + + WC_Install::background_installer( $wcpay_plugin_id, $wcpay_plugin ); + + do_action( 'woocommerce_addon_installed', $wcpay_plugin_id, $section ); + + wp_safe_redirect( remove_query_arg( array( 'install-addon', '_wpnonce' ) ) ); + exit; + } + /** * We're displaying page=wc-addons and page=wc-addons§ion=helper as two separate pages. * When we're on those pages, add body classes to distinguishe them. From f54d7b0991520208fa826f1147e29d6fa04e27f5 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 14 Oct 2021 11:44:58 +0300 Subject: [PATCH 28/34] Apply PHPCS suggestions --- includes/admin/class-wc-admin-addons.php | 6 +++--- includes/admin/views/html-admin-page-addons.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index fcae95e7295..683b151f300 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -34,7 +34,7 @@ class WC_Admin_Addons { } $parameter_string = ''; - $country = WC()->countries->get_base_country(); + $country = WC()->countries->get_base_country(); if ( ! empty( $country ) ) { $parameter_string = '?' . http_build_query( array( 'country' => $country ) ); } @@ -159,7 +159,7 @@ class WC_Admin_Addons { * @return void */ private static function output_group( $block ) { - $capacity = $block->capacity ?? 3; + $capacity = $block->capacity ?? 3; $product_list_classes = 3 === $capacity ? 'three-column' : 'two-column'; $product_list_classes = 'products addons-products-' . $product_list_classes; ?> @@ -223,7 +223,7 @@ class WC_Admin_Addons { buttons as $button ) { $button_classes = array( 'button', 'addons-buttons-banner-button' ); - $type = $button->type ?? null; + $type = $button->type ?? null; if ( 'primary' === $type ) { $button_classes[] = 'addons-buttons-banner-button-primary'; } diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index 0c755c9c1c4..b0a4b088124 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -36,7 +36,7 @@ function wccom_get_star_class( $rating, $index ) { if ( $rating >= $index ) { // Rating more that current star to show. return 'fill'; - } else if ( + } elseif ( abs( $index - 1 - floor( $rating ) ) < 0.0000001 && 0 < ( $rating - floor( $rating ) ) ) { @@ -99,7 +99,7 @@ function wccom_get_star_class( $rating, $index ) {
              - +

              From 85fa25ad929ae9c85598c907c263856637cced7d Mon Sep 17 00:00:00 2001 From: And Finally Date: Thu, 14 Oct 2021 10:27:06 +0100 Subject: [PATCH 29/34] Restored and annotated deprecated functions for backwards compatibility. --- includes/admin/class-wc-admin-addons.php | 587 +++++++++++++++++++++-- 1 file changed, 556 insertions(+), 31 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 683b151f300..3c1cfa4903f 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -132,6 +132,562 @@ class WC_Admin_Addons { return apply_filters( 'woocommerce_addons_sections', $addon_sections ); } + /** + * Get section for the addons screen. + * + * @param string $section_id Required section ID. + * + * @return object|bool + */ + public static function get_section( $section_id ) { + $sections = self::get_sections(); + if ( isset( $sections[ $section_id ] ) ) { + return $sections[ $section_id ]; + } + return false; + } + + + /** + * Get section content for the addons screen. + * + * @deprecated 5.9.0 No longer used in In-App Marketplace + * + * @param string $section_id Required section ID. + * + * @return array + */ + public static function get_section_data( $section_id ) { + $section = self::get_section( $section_id ); + $section_data = ''; + + if ( ! empty( $section->endpoint ) ) { + $section_data = get_transient( 'wc_addons_section_' . $section_id ); + if ( false === $section_data ) { + $raw_section = wp_safe_remote_get( esc_url_raw( $section->endpoint ), array( 'user-agent' => 'WooCommerce Addons Page' ) ); + + if ( ! is_wp_error( $raw_section ) ) { + $section_data = json_decode( wp_remote_retrieve_body( $raw_section ) ); + + if ( ! empty( $section_data->products ) ) { + set_transient( 'wc_addons_section_' . $section_id, $section_data, WEEK_IN_SECONDS ); + } + } + } + } + + return apply_filters( 'woocommerce_addons_section_data', $section_data->products, $section_id ); + } + + /** + * Handles the outputting of a contextually aware Storefront link (points to child themes if Storefront is already active). + * + * @deprecated 5.9.0 No longer used in In-App Marketplace + * + */ + public static function output_storefront_button() { + $template = get_option( 'template' ); + $stylesheet = get_option( 'stylesheet' ); + + if ( 'storefront' === $template ) { + if ( 'storefront' === $stylesheet ) { + $url = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/'; + $text = __( 'Need a fresh look? Try Storefront child themes', 'woocommerce' ); + $utm_content = 'nostorefrontchildtheme'; + } else { + $url = 'https://woocommerce.com/product-category/themes/storefront-child-theme-themes/'; + $text = __( 'View more Storefront child themes', 'woocommerce' ); + $utm_content = 'hasstorefrontchildtheme'; + } + } else { + $url = 'https://woocommerce.com/storefront/'; + $text = __( 'Need a theme? Try Storefront', 'woocommerce' ); + $utm_content = 'nostorefront'; + } + + $url = add_query_arg( + array( + 'utm_source' => 'addons', + 'utm_medium' => 'product', + 'utm_campaign' => 'woocommerceplugin', + 'utm_content' => $utm_content, + ), + $url + ); + + echo '' . esc_html( $text ) . '' . "\n"; + } + + /** + * Handles the outputting of a banner block. + * + * @deprecated 5.9.0 No longer used in In-App Marketplace + * + * @param object $block Banner data. + */ + public static function output_banner_block( $block ) { + ?> +
              +

              title ); ?>

              +

              description ); ?>

              +
              + items as $item ) : ?> + +
              +
              + +
              +
              +

              title ); ?>

              +

              description ); ?>

              + href, + $item->button, + 'addons-button-solid', + $item->plugin + ); + ?> +
              +
              + + +
              +
              + container ) && 'column_container_start' === $block->container ) { + ?> +
              + module ) { + ?> +
              + +
              + container ) && 'column_container_end' === $block->container ) { + ?> +
              + +
              +

              title ); ?>

              +

              description ); ?>

              + items as $item ) : ?> + +
              +
              + +
              +
              +

              title ); ?>

              + href, + $item->button, + 'addons-button-solid', + $item->plugin + ); + ?> +

              description ); ?>

              +
              +
              + + +
              + + +
              + +
              +

              title ); ?>

              +

              description ); ?>

              +
              + buttons as $button ) : ?> + href, + $button->text, + 'addons-button-solid' + ); + ?> + +
              +
              +
              + +
              +

              title ); ?>

              +

              description ); ?>

              +
              + items as $item ) : ?> +
              + image ) ) : ?> +
              + +
              + + href, + $item->button, + 'addons-button-outline-white' + ); + ?> +
              + +
              +
              + 'woocommerce-services', + ) + ), + 'install-addon_woocommerce-services' + ); + + $defaults = array( + 'image' => WC()->plugin_url() . '/assets/images/wcs-extensions-banner-3x.jpg', + 'image_alt' => __( 'WooCommerce Shipping', 'woocommerce' ), + 'title' => __( 'Save time and money with WooCommerce Shipping', 'woocommerce' ), + 'description' => __( 'Print discounted USPS and DHL labels straight from your WooCommerce dashboard and save on shipping.', 'woocommerce' ), + 'button' => __( 'Free - Install now', 'woocommerce' ), + 'href' => $button_url, + 'logos' => array(), + ); + + switch ( $location['country'] ) { + case 'US': + $local_defaults = array( + 'logos' => array_merge( + $defaults['logos'], + array( + array( + 'link' => WC()->plugin_url() . '/assets/images/wcs-usps-logo.png', + 'alt' => 'USPS logo', + ), + array( + 'link' => WC()->plugin_url() . '/assets/images/wcs-dhlexpress-logo.png', + 'alt' => 'DHL Express logo', + ), + ) + ), + ); + break; + default: + $local_defaults = array(); + } + + $block_data = array_merge( $defaults, $local_defaults, $block ); + ?> +
              +
              + <?php echo esc_attr( $block_data['image_alt'] ); ?> +
              +
              +

              +

              +
                + +
              • + +
                • + +
              + +
              +
              + 'woocommerce-payments', + ) + ), + 'install-addon_woocommerce-payments' + ); + + $defaults = array( + 'image' => WC()->plugin_url() . '/assets/images/wcpayments-icon-secure.png', + 'image_alt' => __( 'WooCommerce Payments', 'woocommerce' ), + 'title' => __( 'Payments made simple, with no monthly fees — exclusively for WooCommerce stores.', 'woocommerce' ), + 'description' => __( 'Securely accept cards in your store. See payments, track cash flow into your bank account, and stay on top of disputes – right from your dashboard.', 'woocommerce' ), + 'button' => __( 'Free - Install now', 'woocommerce' ), + 'href' => $button_url, + 'logos' => array(), + ); + + $block_data = array_merge( $defaults, $block ); + ?> +
              +
              + <?php echo esc_attr( $block_data['image_alt'] ); ?> +
              +
              +

              +

              + +
              +
              + +
              +
              + <?php echo esc_attr( $promotion['image_alt'] ); ?> +
              +
              +

              +

              + +
              +
              + geowhitelist ) ) { + $section_object->geowhitelist = explode( ',', $section_object->geowhitelist ); + } + + if ( ! empty( $section_object->geoblacklist ) ) { + $section_object->geoblacklist = explode( ',', $section_object->geoblacklist ); + } + + if ( ! self::show_extension( $section_object ) ) { + return; + } + + ?> +
              + <?php echo esc_attr( $section['image_alt'] ); ?> +
              +

              +
              + +
              +
              + +
              +
              +
              + module ) { + case 'banner_block': + self::output_banner_block( $section ); + break; + case 'column_start': + self::output_column( $section ); + break; + case 'column_end': + self::output_column( $section ); + break; + case 'column_block': + self::output_column_block( $section ); + break; + case 'small_light_block': + self::output_small_light_block( $section ); + break; + case 'small_dark_block': + self::output_small_dark_block( $section ); + break; + case 'wcs_banner_block': + self::output_wcs_banner_block( (array) $section ); + break; + case 'wcpay_banner_block': + self::output_wcpay_banner_block( (array) $section ); + break; + case 'promotion_block': + self::output_promotion_block( (array) $section ); + break; + } + } + } + /** * Handles the outputting of featured page * @@ -511,37 +1067,6 @@ class WC_Admin_Addons { return $formatted_promotions; } - /** - * Output the HTML for the promotion block. - * - * @param array $promotion Array of promotion block data. - * @return void - */ - public static function output_search_promotion_block( array $promotion ) { - ?> -
              -
              - <?php echo esc_attr( $promotion['image_alt'] ); ?> -
              -
              -

              -

              - -
              -
              - Date: Thu, 14 Oct 2021 10:43:51 +0100 Subject: [PATCH 30/34] Addressing feedback. Using cheaper escaping methods. --- includes/admin/class-wc-admin-addons.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 3c1cfa4903f..592b7f1dafe 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -1114,7 +1114,7 @@ class WC_Admin_Addons { // Is Free. if ( $has_currency ) { - $mapped->is_free = 0 === $data->price; + $mapped->is_free = 0 === (int) $data->price; } else { $mapped->is_free = '$0.00' === $data->price; } @@ -1178,7 +1178,7 @@ class WC_Admin_Addons { sprintf( '%2$s', esc_url_raw( $mapped->vendor_url ), - wp_kses_post( $mapped->vendor_name ) + esc_html( $mapped->vendor_name ) ) ); ?> @@ -1199,7 +1199,7 @@ class WC_Admin_Addons { is_free ) : ?> - price ); ?> + price ); ?>
              @@ -1210,7 +1210,7 @@ class WC_Admin_Addons { rating, $index ); ?>
              - (reviews_count ); ?>) + (reviews_count; ?>)
              From 124dc35e42b93020496f86f7e6dcf679860637c0 Mon Sep 17 00:00:00 2001 From: And Finally Date: Thu, 14 Oct 2021 10:56:22 +0100 Subject: [PATCH 31/34] Correcting escaping of `$mapped->price`, using `wp_kses`. --- includes/admin/class-wc-admin-addons.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 592b7f1dafe..3a38ccc1632 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -183,7 +183,6 @@ class WC_Admin_Addons { * Handles the outputting of a contextually aware Storefront link (points to child themes if Storefront is already active). * * @deprecated 5.9.0 No longer used in In-App Marketplace - * */ public static function output_storefront_button() { $template = get_option( 'template' ); @@ -1199,7 +1198,19 @@ class WC_Admin_Addons { is_free ) : ?> - price ); ?> + + price, + array( + 'span' => array( + 'class' => array(), + ), + 'bdi' => array(), + ) + ); + ?> +
              From c337da21f10aad90f25225987fdb62a05d5e24cb Mon Sep 17 00:00:00 2001 From: And Finally Date: Thu, 14 Oct 2021 12:34:06 +0100 Subject: [PATCH 32/34] Added bottom margin of paragraph in `.addons-buttons-banner-details`, to improve rendering of promotional banner on featured page. --- assets/css/admin.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index f7cd7e4c09c..0d20493c653 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -577,6 +577,7 @@ .addons-buttons-banner-details p { font-size: 14px; + margin-bottom: 14px; max-width: none; } From 05d774cdb593ff1f7c147c2e103fcb1e59b4acb0 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 14 Oct 2021 23:10:45 +0300 Subject: [PATCH 33/34] Fix after merge with trunk --- includes/admin/class-wc-admin-addons.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index 4fa7fc65d89..fbb8724db55 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -1252,7 +1252,7 @@ class WC_Admin_Addons {
              - rating, $index ); ?> + rating, $index ); ?>
              (reviews_count; ?>) From 7cbdd71af636cba5e43e75e4e69dea5038e89844 Mon Sep 17 00:00:00 2001 From: Timur Gogolev Date: Thu, 14 Oct 2021 23:13:35 +0300 Subject: [PATCH 34/34] Revert get_featured method --- includes/admin/class-wc-admin-addons.php | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/includes/admin/class-wc-admin-addons.php b/includes/admin/class-wc-admin-addons.php index fbb8724db55..6747fbabe92 100644 --- a/includes/admin/class-wc-admin-addons.php +++ b/includes/admin/class-wc-admin-addons.php @@ -21,6 +21,45 @@ class WC_Admin_Addons { /** * Get featured for the addons screen * + * @deprecated 5.9.0 No longer used in In-App Marketplace + * + * @return array of objects + */ + public static function get_featured() { + $featured = get_transient( 'wc_addons_featured' ); + if ( false === $featured ) { + $headers = array(); + $auth = WC_Helper_Options::get( 'auth' ); + + if ( ! empty( $auth['access_token'] ) ) { + $headers['Authorization'] = 'Bearer ' . $auth['access_token']; + } + + $raw_featured = wp_safe_remote_get( + 'https://woocommerce.com/wp-json/wccom-extensions/1.0/featured', + array( + 'headers' => $headers, + 'user-agent' => 'WooCommerce Addons Page', + ) + ); + + if ( ! is_wp_error( $raw_featured ) ) { + $featured = json_decode( wp_remote_retrieve_body( $raw_featured ) ); + if ( $featured ) { + set_transient( 'wc_addons_featured', $featured, DAY_IN_SECONDS ); + } + } + } + + if ( is_object( $featured ) ) { + self::output_featured_sections( $featured->sections ); + return $featured; + } + } + + /** + * Render featured products and banners using WCCOM's the Featured 2.0 Endpoint + * * @return void */ public static function render_featured() {