Commit 53808ee7 authored by Bojan Živanović's avatar Bojan Živanović
Browse files

Issue #2849594 part II: ShippingInformation's "Recalculate shipping" is not... 

Issue #2849594 part II: ShippingInformation's "Recalculate shipping" is not compatible with PaymentInformation
parent cdb44325

src/Plugin/Commerce/CheckoutPane/ShippingInformation.php

+7 −2
Changes for src/Plugin/Commerce/CheckoutPane/ShippingInformation.php: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -186,10 +186,11 @@ class ShippingInformation extends CheckoutPaneBase implements ContainerFactoryPl 
    $available_countries = [];

    foreach ($store->get('shipping_countries') as $country_item) {

      $available_countries[] = $country_item->value;

    };

    }



    // Prepare the form for ajax.

    $pane_form['#wrapper_id'] = Html::getUniqueId('shipping-information-wrapper');

    // Not using Html::getUniqueId() on the wrapper ID to avoid #2675688.

    $pane_form['#wrapper_id'] = 'shipping-information-wrapper';

    $pane_form['#prefix'] = '<div id="' . $pane_form['#wrapper_id'] . '">';

    $pane_form['#suffix'] = '</div>';
@@ -207,6 +208,10 @@ class ShippingInformation extends CheckoutPaneBase implements ContainerFactoryPl 
        'callback' => [get_class($this), 'ajaxRefresh'],

        'wrapper' => $pane_form['#wrapper_id'],

      ],

      // The calculation process only needs a valid shipping profile.

      '#limit_validation_errors' => [

        array_merge($pane_form['#parents'], ['shipping_profile']),

      ],

    ];

    $pane_form['removed_shipments'] = [

      '#type' => 'value',

tests/modules/commerce_shipping_test/config/install/commerce_checkout.commerce_checkout_flow.shipping_test.yml

deleted100644 → 0
+0 −40
Changes for tests/modules/commerce_shipping_test/config/install/commerce_checkout.commerce_checkout_flow.shipping_test.yml: 0 added lines, 40 removed lines.
Original line number Diff line number Diff line 
langcode: en

status: true

dependencies:

  module:

    - commerce_payment

    - commerce_shipping

id: shipping_test

label: 'Shipping Test'

plugin: multistep_default

configuration:

  display_checkout_progress: true

  order_summary_view: commerce_checkout_order_summary

  panes:

    completion_message:

      message: 'Your order number is %order_number. You can view your order on your account page when logged in.'

      step: complete

      weight: 4

    contact_information:

      double_entry: false

      step: order_information

      weight: 1

    login:

      allow_guest_checkout: true

      allow_registration: false

      step: login

      weight: 0

    review:

      step: review

      weight: 3

    payment_information:

      step: _disabled

      weight: 5

    payment_process:

      capture: true

      step: _disabled

      weight: 6

    shipping_information:

      require_shipping_profile: true

      step: order_information

      weight: 2

tests/src/FunctionalJavascript/CheckoutPaneTest.php

+62 −5
Changes for tests/src/FunctionalJavascript/CheckoutPaneTest.php: 62 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ namespace Drupal\Tests\commerce_shipping\FunctionalJavascript; 
use Drupal\commerce_checkout\Entity\CheckoutFlow;

use Drupal\commerce_order\Entity\Order;

use Drupal\commerce_order\Entity\OrderType;

use Drupal\commerce_payment\Entity\PaymentGateway;

use Drupal\commerce_price\Price;

use Drupal\commerce_product\Entity\ProductVariationType;

use Drupal\Core\Entity\Entity\EntityFormDisplay;

use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;

use Drupal\Tests\commerce\FunctionalJavascript\JavascriptTestTrait;
@@ -37,6 +39,8 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
   * {@inheritdoc}

   */

  public static $modules = [

    'commerce_payment',

    'commerce_payment_example',

    'commerce_shipping_test',

  ];
@@ -59,12 +63,24 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
    $this->store->shipping_countries = ['US', 'FR', 'DE'];

    $this->store->save();



    /** @var \Drupal\commerce_payment\Entity\PaymentGateway $gateway */

    $gateway = PaymentGateway::create([

      'id' => 'example_onsite',

      'label' => 'Example',

      'plugin' => 'example_onsite',

    ]);

    $gateway->getPlugin()->setConfiguration([

      'api_key' => '2342fewfsfs',

      'payment_method_types' => ['credit_card'],

    ]);

    $gateway->save();



    $product_variation_type = ProductVariationType::load('default');

    $product_variation_type->setTraits(['purchasable_entity_shippable']);

    $product_variation_type->save();



    $order_type = OrderType::load('default');

    $order_type->setThirdPartySetting('commerce_checkout', 'checkout_flow', 'shipping_test');

    $order_type->setThirdPartySetting('commerce_checkout', 'checkout_flow', 'shipping');

    $order_type->setThirdPartySetting('commerce_shipping', 'shipment_type', 'default');

    $order_type->save();
@@ -157,6 +173,14 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
        ],

      ],

    ]);



    // Workaround for #2822211.

    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $customer_form_display */

    $customer_form_display = EntityFormDisplay::load('profile.customer.default');

    $address_component = $customer_form_display->getComponent('address');

    $address_component['settings']['default_country'] = 'US';

    $customer_form_display->setComponent('address', $address_component);

    $customer_form_display->save();

  }



  /**
@@ -199,7 +223,18 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
    $this->assertNotNull($first_radio_button);

    $this->assertNotNull($second_radio_button);

    $this->assertTrue($first_radio_button->getAttribute('checked'));

    $this->submitForm([], 'Continue to review');

    $this->submitForm([

      'payment_information[add_payment_method][payment_details][number]' => '4111111111111111',

      'payment_information[add_payment_method][payment_details][expiration][month]' => '02',

      'payment_information[add_payment_method][payment_details][expiration][year]' => '2020',

      'payment_information[add_payment_method][payment_details][security_code]' => '123',

      'payment_information[add_payment_method][billing_information][address][0][address][given_name]' => 'Johnny',

      'payment_information[add_payment_method][billing_information][address][0][address][family_name]' => 'Appleseed',

      'payment_information[add_payment_method][billing_information][address][0][address][address_line1]' => '123 New York Drive',

      'payment_information[add_payment_method][billing_information][address][0][address][locality]' => 'New York City',

      'payment_information[add_payment_method][billing_information][address][0][address][administrative_area]' => 'NY',

      'payment_information[add_payment_method][billing_information][address][0][address][postal_code]' => '10001',

    ], 'Continue to review');



    // Confirm that the review is rendered correctly.

    $this->assertSession()->pageTextContains('Shipping information');
@@ -269,7 +304,18 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
      $this->assertSession()->elementTextContains('xpath', $selector, 'Standard shipping: $9.99');

      $this->assertSession()->elementTextContains('xpath', $selector, 'Overnight shipping: $19.99');

    }

    $this->submitForm([], 'Continue to review');

    $this->submitForm([

      'payment_information[add_payment_method][payment_details][number]' => '4111111111111111',

      'payment_information[add_payment_method][payment_details][expiration][month]' => '02',

      'payment_information[add_payment_method][payment_details][expiration][year]' => '2020',

      'payment_information[add_payment_method][payment_details][security_code]' => '123',

      'payment_information[add_payment_method][billing_information][address][0][address][given_name]' => 'Johnny',

      'payment_information[add_payment_method][billing_information][address][0][address][family_name]' => 'Appleseed',

      'payment_information[add_payment_method][billing_information][address][0][address][address_line1]' => '123 New York Drive',

      'payment_information[add_payment_method][billing_information][address][0][address][locality]' => 'New York City',

      'payment_information[add_payment_method][billing_information][address][0][address][administrative_area]' => 'NY',

      'payment_information[add_payment_method][billing_information][address][0][address][postal_code]' => '10001',

    ], 'Continue to review');



    // Confirm that the review is rendered correctly.

    $this->assertSession()->pageTextContains('Shipping information');
@@ -318,7 +364,7 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
   * Tests checkout when the shipping profile is not required for showing costs.

   */

  public function testNoRequiredShippingProfile() {

    $checkout_flow = CheckoutFlow::load('shipping_test');

    $checkout_flow = CheckoutFlow::load('shipping');

    $checkout_flow_configuration = $checkout_flow->get('configuration');

    $checkout_flow_configuration['panes']['shipping_information']['require_shipping_profile'] = FALSE;

    $checkout_flow->set('configuration', $checkout_flow_configuration);
@@ -354,7 +400,18 @@ class CheckoutPaneTest extends CommerceBrowserTestBase { 
    foreach ($address as $property => $value) {

      $page->fillField($address_prefix . '[' . $property . ']', $value);

    }

    $this->submitForm([], 'Continue to review');

    $this->submitForm([

      'payment_information[add_payment_method][payment_details][number]' => '4111111111111111',

      'payment_information[add_payment_method][payment_details][expiration][month]' => '02',

      'payment_information[add_payment_method][payment_details][expiration][year]' => '2020',

      'payment_information[add_payment_method][payment_details][security_code]' => '123',

      'payment_information[add_payment_method][billing_information][address][0][address][given_name]' => 'Johnny',

      'payment_information[add_payment_method][billing_information][address][0][address][family_name]' => 'Appleseed',

      'payment_information[add_payment_method][billing_information][address][0][address][address_line1]' => '123 New York Drive',

      'payment_information[add_payment_method][billing_information][address][0][address][locality]' => 'New York City',

      'payment_information[add_payment_method][billing_information][address][0][address][administrative_area]' => 'NY',

      'payment_information[add_payment_method][billing_information][address][0][address][postal_code]' => '10001',

    ], 'Continue to review');



    // Confirm that the review is rendered correctly.

    $this->assertSession()->pageTextContains('Shipping information');