diff --git a/includes/views/handlers/commerce_coupon_handler_area_cart_form.inc b/includes/views/handlers/commerce_coupon_handler_area_cart_form.inc index 579b3de..1659703 100644 --- a/includes/views/handlers/commerce_coupon_handler_area_cart_form.inc +++ b/includes/views/handlers/commerce_coupon_handler_area_cart_form.inc @@ -13,7 +13,6 @@ class commerce_coupon_handler_area_cart_form extends views_handler_area { function option_definition() { $options = parent::option_definition(); - $options['coupon_cart_form_view']['default'] = 'order_coupon_list|checkout'; $options['weight']['default'] = 99; return $options; @@ -22,32 +21,10 @@ class commerce_coupon_handler_area_cart_form extends views_handler_area { /** * Options form */ - function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); unset($form['empty']); - // Build an options array of Views available for the cart contents pane. - $options = array(); - - // Generate an option list from all user defined and module defined views. - foreach (views_get_all_views() as $view_id => $view_value) { - // Only include line item Views. - if ($view_value->base_table == 'commerce_coupon') { - foreach ($view_value->display as $display_id => $display_value) { - $options[check_plain($view_id)][$view_id . '|' . $display_id] = check_plain($display_value->display_title); - } - } - } - - $form['coupon_cart_form_view'] = array( - '#type' => 'select', - '#title' => t('Coupons Cart View'), - '#description' => t('Specify the View to render the cart summary.'), - '#options' => array('none' => t('None')) + $options, - '#default_value' => $this->options['coupon_cart_form_view'], - ); - $form['weight'] = array( '#type' => 'textfield', '#title' => t('Form item weight'), @@ -99,9 +76,7 @@ class commerce_coupon_handler_area_cart_form extends views_handler_area { '#value' => t('Add coupon'), '#name' => 'coupon_add', // Limit validation to the coupon code. - '#limit_validation_errors' => array( - array('cart_contents_form', 'cart_contents_form_view', $this->options['id'], 'coupon_code') - ), + '#limit_validation_errors' => array(array('coupon_code')), '#validate' => array('commerce_coupon_handler_area_cart_form_validate'), '#submit' => array('commerce_coupon_handler_area_cart_form_submit'), ); @@ -121,18 +96,6 @@ class commerce_coupon_handler_area_cart_form extends views_handler_area { } } $order = !empty($order_id) ? commerce_order_load($order_id) : commerce_cart_order_load($GLOBALS['user']->uid); - - // Extract the View and display keys from the cart contents pane setting. - $coupon_summary_view = $this->options['coupon_cart_form_view']; - if ($coupon_summary_view != 'none') { - list($view_id, $display_id) = explode('|', $coupon_summary_view); - if (!empty($view_id) && !empty($display_id) && views_get_view($view_id)) { - $form[$this->options['id']]['redeemed_coupons'] = array( - '#type' => 'markup', - '#markup' => commerce_embed_view($view_id, $display_id, array($order->order_id)), - ); - } - } } }