diff --git a/payment/uc_2checkout/src/Controller/CheckoutController.php b/payment/uc_2checkout/src/Controller/CheckoutController.php index 9e3bc00..9bd2268 100644 --- a/payment/uc_2checkout/src/Controller/CheckoutController.php +++ b/payment/uc_2checkout/src/Controller/CheckoutController.php @@ -83,12 +83,6 @@ class CheckoutController extends ControllerBase { $build = uc_cart_complete_sale($order, $cart_config->get('new_customer_login')); - $page = $cart_config->get('checkout_complete_page'); - - if (!empty($page)) { - drupal_goto($page); - } - return $build; } } diff --git a/uc_cart/config/install/uc_cart.settings.yml b/uc_cart/config/install/uc_cart.settings.yml index ca6492d..fbac94f 100644 --- a/uc_cart/config/install/uc_cart.settings.yml +++ b/uc_cart/config/install/uc_cart.settings.yml @@ -31,7 +31,6 @@ email_validation: false default_same_address: false checkout_anonymous: true -checkout_complete_page: '' checkout_enabled: true delivery_not_shippable: true diff --git a/uc_cart/config/schema/uc_cart.schema.yml b/uc_cart/config/schema/uc_cart.schema.yml index 26bc7b0..8c04f3e 100644 --- a/uc_cart/config/schema/uc_cart.schema.yml +++ b/uc_cart/config/schema/uc_cart.schema.yml @@ -121,9 +121,6 @@ uc_cart.settings: checkout_anonymous: type: boolean label: '' - checkout_complete_page: - type: uri - label: '' checkout_enabled: type: boolean label: '' diff --git a/uc_cart/src/Controller/CheckoutController.php b/uc_cart/src/Controller/CheckoutController.php index b7d28c0..2f7c1fe 100644 --- a/uc_cart/src/Controller/CheckoutController.php +++ b/uc_cart/src/Controller/CheckoutController.php @@ -237,11 +237,6 @@ class CheckoutController extends ControllerBase implements ContainerInjectionInt // Add a comment to let sales team know this came in through the site. uc_order_comment_save($order->id(), 0, $this->t('Order created through website.'), 'admin'); - $page = $cart_config->get('checkout_complete_page'); - if (!empty($page)) { - return new RedirectResponse(Url::fromUri('internal:/' . $page)); - } - return $build; } diff --git a/uc_cart/src/Form/CheckoutSettingsForm.php b/uc_cart/src/Form/CheckoutSettingsForm.php index c65c073..7833319 100644 --- a/uc_cart/src/Form/CheckoutSettingsForm.php +++ b/uc_cart/src/Form/CheckoutSettingsForm.php @@ -229,14 +229,6 @@ class CheckoutSettingsForm extends ConfigFormBase { '#title' => t('Completion messages'), '#group' => 'checkout-settings', ); - $form['completion_messages']['uc_cart_checkout_complete_page'] = array( - '#type' => 'textfield', - '#title' => t('Alternate checkout completion page'), - '#description' => t('Leave blank to use the default completion page (recommended).'), - '#default_value' => $cart_config->get('checkout_complete_page'), - '#field_prefix' => \Drupal::url('', [], ['absolute' => TRUE]), - '#size' => 16, - ); $form['completion_messages']['uc_msg_order_logged_in'] = array( '#type' => 'textarea', '#title' => t('Logged in users'), @@ -304,7 +296,6 @@ class CheckoutSettingsForm extends ConfigFormBase { ->set('new_customer_status_active', $form_state->getValue('uc_new_customer_status_active')) ->set('default_same_address', $form_state->getValue('uc_cart_default_same_address')) ->set('delivery_not_shippable', $form_state->getValue('uc_cart_delivery_not_shippable')) - ->set('checkout_complete_page', $form_state->getValue('uc_cart_checkout_complete_page')) ->set('panes', $form_state->getValue('panes')) ->save(); diff --git a/uc_cart/uc_cart.install b/uc_cart/uc_cart.install index fe460a7..81ce85e 100644 --- a/uc_cart/uc_cart.install +++ b/uc_cart/uc_cart.install @@ -84,7 +84,6 @@ function uc_cart_update_8000() { 'uc_cart_auth_unit' => 'auth_unit', 'uc_cart_breadcrumb_text' => 'breadcrumb_text', 'uc_cart_breadcrumb_url' => 'breadcrumb_url', - 'uc_cart_checkout_complete_page' => 'checkout_complete_page', 'uc_cart_default_same_address' => 'default_same_address', 'uc_cart_delivery_not_shippable' => 'delivery_not_shippable', 'uc_cart_email_validation' => 'email_validation', diff --git a/uc_googleanalytics/uc_googleanalytics.module b/uc_googleanalytics/uc_googleanalytics.module index ffd61f8..fed456e 100644 --- a/uc_googleanalytics/uc_googleanalytics.module +++ b/uc_googleanalytics/uc_googleanalytics.module @@ -73,13 +73,6 @@ function uc_googleanalytics_display() { return TRUE; } - // Or if the URL is the custom completion page. - $completion_page = \Drupal::config('uc_cart.settings')->get('checkout_complete_page'); - - if (!empty($completion_page) && $completion_page == drupal_get_path_alias(current_path())) { - return TRUE; - } - // Or if another module says this is the page through hook_ucga_display(). foreach (\Drupal::moduleHandler()->invokeAll('ucga_display') as $result) { if ($result === TRUE) {