Skip to content
This repository has been archived by the owner on Jun 7, 2022. It is now read-only.

Add changelog and enable promotion in core and plugin configs #7666

Merged
merged 9 commits into from Sep 27, 2021
Merged

Add changelog and enable promotion in core and plugin configs #7666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
547a2bb
Add changelog and enable promotion in core and plugin configs
louwie17 Sep 15, 2021
36639a2
Add PR number
louwie17 Sep 15, 2021
3069421
Make variation name a constant
louwie17 Sep 23, 2021
982a46a
Clone spec as we are overwriting the is_visible prop
louwie17 Sep 24, 2021
b613cad
Fix unit tests and support array and object
louwie17 Sep 24, 2021
9d43ed3
Revert explat variation name
louwie17 Sep 24, 2021
a47f04a
Update changelog entry
louwie17 Sep 27, 2021
115862e
Update changelog once more
louwie17 Sep 27, 2021
0aacbdf
Make sure the recommendations show up if marketplace suggestions is n…
louwie17 Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelogs/update-7319_enable_wc_pay_experiment
View file
Open in desktop
@@ -0,0 +1,4 @@
Significance: minor
Type: Enhancement

Add experiment for promoting WooCommerce Payments in payment methods table. #7666
2 changes: 1 addition & 1 deletion client/settings-recommendations/recommendations-eligibility-wrapper.tsx
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ const RecommendationsEligibilityWrapper: React.FC = ( { children } ) => {
SHOW_MARKETPLACE_SUGGESTION_OPTION,
] );
const canShowMarketplaceSuggestions =
getOption( SHOW_MARKETPLACE_SUGGESTION_OPTION ) === 'yes';
getOption( SHOW_MARKETPLACE_SUGGESTION_OPTION ) !== 'no';

return hasFinishedResolving && canShowMarketplaceSuggestions;
} );
Expand Down
2 changes: 1 addition & 1 deletion config/core.json
View file
Open in desktop
Expand Up @@ -18,6 +18,6 @@
"store-alerts": true,
"tasks": false,
"transient-notices": true,
"wc-pay-promotion": false
"wc-pay-promotion": true
}
}
2 changes: 1 addition & 1 deletion config/plugin.json
View file
Open in desktop
Expand Up @@ -18,6 +18,6 @@
"store-alerts": true,
"tasks": false,
"transient-notices": true,
"wc-pay-promotion": false
"wc-pay-promotion": true
}
}
6 changes: 3 additions & 3 deletions src/Features/PaymentGatewaySuggestions/EvaluateSuggestion.php
View file
Open in desktop
Expand Up @@ -16,12 +16,12 @@ class EvaluateSuggestion {
/**
* Evaluates the spec and returns the suggestion.
*
* @param array $spec The suggestion to evaluate.
* @return array The evaluated suggestion.
* @param object|array $spec The suggestion to evaluate.
* @return object The evaluated suggestion.
*/
public static function evaluate( $spec ) {
$rule_evaluator = new RuleEvaluator();
$suggestion = (object) $spec;
$suggestion = is_array( $spec ) ? (object) $spec : clone $spec;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember if this works in PHP or not, but can we clone and coerce to an object at the same time?

Suggested change
$suggestion = is_array( $spec ) ? (object) $spec : clone $spec;
$suggestion = clone (object) $spec;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah we could do that, this would technically cause a array to be cloned twice (in essence), creating a new object out of it first and then cloning that new object.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good point. Let's leave it as is.


if ( isset( $suggestion->is_visible ) ) {
$is_visible = $rule_evaluator->evaluate( $suggestion->is_visible );
Expand Down
5 changes: 3 additions & 2 deletions src/Features/WcPayPromotion/Init.php
View file
Open in desktop
Expand Up @@ -15,7 +15,8 @@
* WC Pay Promotion engine.
*/
class Init {
const SPECS_TRANSIENT_NAME = 'woocommerce_admin_payment_method_promotion_specs';
const SPECS_TRANSIENT_NAME = 'woocommerce_admin_payment_method_promotion_specs';
const EXPLAT_VARIATION_PREFIX = 'woocommerce_wc_pay_promotion_payment_methods_table_';

/**
* Constructor.
Expand Down Expand Up @@ -113,7 +114,7 @@ public static function should_register_pre_install_wc_pay_promoted_gateway() {
$allow_tracking
);

$variation_name = $abtest->get_variation( 'woocommerce_wc_pay_promotion_payment_methods_table_' . $wc_pay_spec->additional_info->experiment_version );
$variation_name = $abtest->get_variation( self::EXPLAT_VARIATION_PREFIX . $wc_pay_spec->additional_info->experiment_version );

if ( 'treatment' === $variation_name ) {
return true;
Expand Down
6 changes: 3 additions & 3 deletions tests/features/payment-gateway-suggestions/evaluate-suggestion.php
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ public function test_no_rules() {
$suggestion = array(
'id' => 'mock-gateway',
);
$evaluated = EvaluateSuggestion::evaluate( $suggestion );
$evaluated = EvaluateSuggestion::evaluate( (object) $suggestion );
$this->assertEquals( (object) $suggestion, $evaluated );
}

Expand All @@ -49,7 +49,7 @@ public function test_is_not_visible() {
'operation' => '=',
),
);
$evaluated = EvaluateSuggestion::evaluate( $suggestion );
$evaluated = EvaluateSuggestion::evaluate( (object) $suggestion );
$this->assertFalse( $evaluated->is_visible );
}

Expand All @@ -68,7 +68,7 @@ public function test_is_visible() {
),
);
update_option( self::MOCK_OPTION, 'a' );
$evaluated = EvaluateSuggestion::evaluate( $suggestion );
$evaluated = EvaluateSuggestion::evaluate( (object) $suggestion );
$this->assertTrue( $evaluated->is_visible );
}
}