Issue #2979649 by mglaman, bojanz: The "New" prefix for payment methods is confusing as an end user

Author: mglaman

modules/payment/src/Annotation/CommercePaymentMethodType.php

@@ -34,10 +34,25 @@ class CommercePaymentMethodType extends Plugin {
   /**
    * The payment method type create label.
    *
+   * Defaults to the main label.
+   *
    * @ingroup plugin_translatable
    *
    * @var \Drupal\Core\Annotation\Translation
    */
   public $create_label;
 
+  /**
+   * Constructs a new CommercePaymentMethodType object.
+   *
+   * @param array $values
+   *   The annotation values.
+   */
+  public function __construct(array $values) {
+    if (empty($values['create_label'])) {
+      $values['create_label'] = $values['label'];
+    }
+    parent::__construct($values);
+  }
+
 }

modules/payment/src/PaymentMethodTypeManager.php

@@ -39,7 +39,7 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
   public function processDefinition(&$definition, $plugin_id) {
     parent::processDefinition($definition, $plugin_id);
 
-    foreach (['id', 'label', 'create_label'] as $required_property) {
+    foreach (['id', 'label'] as $required_property) {
       if (empty($definition[$required_property])) {
         throw new PluginException(sprintf('The payment method type %s must define the %s property.', $plugin_id, $required_property));
       }

modules/payment/src/Plugin/Commerce/PaymentMethodType/CreditCard.php

@@ -12,7 +12,6 @@
  * @CommercePaymentMethodType(
  *   id = "credit_card",
  *   label = @Translation("Credit card"),
- *   create_label = @Translation("New credit card"),
  * )
  */
 class CreditCard extends PaymentMethodTypeBase {

modules/payment/src/Plugin/Commerce/PaymentMethodType/PayPal.php

@@ -10,8 +10,7 @@
  *
  * @CommercePaymentMethodType(
  *   id = "paypal",
- *   label = @Translation("PayPal account"),
- *   create_label = @Translation("New PayPal account"),
+ *   label = @Translation("PayPal"),
  * )
  */
 class PayPal extends PaymentMethodTypeBase {
@@ -23,7 +22,7 @@ public function buildLabel(PaymentMethodInterface $payment_method) {
     $args = [
       '@paypal_mail' => $payment_method->paypal_mail->value,
     ];
-    return $this->t('PayPal account (@paypal_mail)', $args);
+    return $this->t('PayPal (@paypal_mail)', $args);
   }
 
   /**

modules/payment/tests/src/FunctionalJavascript/PaymentCheckoutTest.php

@@ -199,7 +199,7 @@ public function testPaymentInformation() {
     $expected_options = [
       'Visa ending in 1111',
       'Visa ending in 9999',
-      'New credit card',
+      'Credit card',
       'Example',
     ];
     $page = $this->getSession()->getPage();
@@ -285,7 +285,7 @@ public function testCheckoutWithNewPaymentMethod() {
     $this->drupalGet($this->product->toUrl()->toString());
     $this->submitForm([], 'Add to cart');
     $this->drupalGet('checkout/1');
-    $radio_button = $this->getSession()->getPage()->findField('New credit card');
+    $radio_button = $this->getSession()->getPage()->findField('Credit card');
     $radio_button->click();
     $this->waitForAjaxToFinish();
 
@@ -330,7 +330,7 @@ public function testCheckoutWithDeclinedPaymentMethod() {
     $this->drupalGet($this->product->toUrl()->toString());
     $this->submitForm([], 'Add to cart');
     $this->drupalGet('checkout/1');
-    $radio_button = $this->getSession()->getPage()->findField('New credit card');
+    $radio_button = $this->getSession()->getPage()->findField('Credit card');
     $radio_button->click();
     $this->waitForAjaxToFinish();
 

modules/payment/tests/src/Kernel/PaymentOptionsBuilderTest.php

@@ -237,7 +237,7 @@ public function testBuildOptions() {
 
     // Add new payment method.
     $this->assertEquals('new--credit_card--onsite', $options[2]->getId());
-    $this->assertEquals('New credit card', $options[2]->getLabel());
+    $this->assertEquals('Credit card', $options[2]->getLabel());
     $this->assertEquals('onsite', $options[2]->getPaymentGatewayId());
     $this->assertNull($options[2]->getPaymentMethodId());
     $this->assertEquals('credit_card', $options[2]->getPaymentMethodTypeId());
@@ -284,13 +284,13 @@ public function testBuildOptionsWithTwoOnsiteGateways() {
     $this->assertCount(2, $options);
 
     $this->assertEquals('new--credit_card--first_onsite', $options[0]->getId());
-    $this->assertEquals('New credit card (Example)', $options[0]->getLabel());
+    $this->assertEquals('Credit card (Example)', $options[0]->getLabel());
     $this->assertEquals('first_onsite', $options[0]->getPaymentGatewayId());
     $this->assertNull($options[0]->getPaymentMethodId());
     $this->assertEquals('credit_card', $options[0]->getPaymentMethodTypeId());
 
     $this->assertEquals('new--credit_card--second_onsite', $options[1]->getId());
-    $this->assertEquals('New credit card (Test)', $options[1]->getLabel());
+    $this->assertEquals('Credit card (Test)', $options[1]->getLabel());
     $this->assertEquals('second_onsite', $options[1]->getPaymentGatewayId());
     $this->assertNull($options[1]->getPaymentMethodId());
     $this->assertEquals('credit_card', $options[1]->getPaymentMethodTypeId());

src/Annotation/CommerceCondition.php

@@ -33,6 +33,7 @@ class CommerceCondition extends Plugin {
    * The condition display label.
    *
    * Shown in the condition UI when enabling/disabling a condition.
+   * Defaults to the main label.
    *
    * @ingroup plugin_translatable
    *