diff --git a/includes/commerce_discount.admin.inc b/includes/commerce_discount.admin.inc index 8942243..93c18dd 100644 --- a/includes/commerce_discount.admin.inc +++ b/includes/commerce_discount.admin.inc @@ -220,10 +220,10 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_ '#parents' => array('commerce_discount_fields'), ); - // Vertical tabs container + // Vertical tabs container. $form['commerce_discount_fields']['additional_settings'] = array( - '#type' => 'vertical_tabs', - '#weight' => 99, + '#type' => 'vertical_tabs', + '#weight' => 99, ); field_attach_form('commerce_discount', $commerce_discount, $form['commerce_discount_fields'], $form_state); @@ -263,7 +263,7 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_ ), ); - // Add compatibility fields to the vertical tabs container + // Add compatibility fields to the vertical tabs container. $form['commerce_discount_fields']['commerce_discount_compatibility'] = array( '#type' => 'fieldset', '#title' => t('Compatibility with other discounts'), @@ -322,11 +322,12 @@ function commerce_discount_fields_ajax_callback($form, &$form_state) { * Form API validation callback for the type form. */ function commerce_discount_form_validate($form, &$form_state) { - // return vertical tab field values back to their expected location in the form_state - $form_state['values']['commerce_discount_fields']['commerce_compatibility_strategy'] = $form_state['values']['commerce_discount_fields']['commerce_discount_compatibility']['commerce_compatibility_strategy']; + // Return vertical tab field values back to their expected location in + // the form_state. + $form_state['values']['commerce_discount_fields']['commerce_compatibility_strategy'] = $form_state['values']['commerce_discount_fields']['commerce_discount_compatibility']['commerce_compatibility_strategy']; $form_state['values']['commerce_discount_fields']['commerce_compatibility_selection'] = $form_state['values']['commerce_discount_fields']['commerce_discount_compatibility']['commerce_compatibility_selection']; unset($form_state['values']['commerce_discount_fields']['commerce_discount_compatibility']['commerce_compatibility_strategy'], $form_state['values']['commerce_discount_fields']['commerce_discount_compatibility']['commerce_compatibility_selection']); - + field_attach_form_validate('commerce_discount', $form_state['commerce_discount'], $form['commerce_discount_fields'], $form_state); if (!empty($form_state['values']['name'])) { diff --git a/modules/commerce_discount_usage/commerce_discount_usage.module b/modules/commerce_discount_usage/commerce_discount_usage.module index 223c5d6..a8c66c4 100644 --- a/modules/commerce_discount_usage/commerce_discount_usage.module +++ b/modules/commerce_discount_usage/commerce_discount_usage.module @@ -215,7 +215,8 @@ function commerce_discount_usage_views_api() { * Implements hook_form_FORM_ID_alter(). */ function commerce_discount_usage_form_commerce_discount_form_alter(&$form, $form_state) { - // Move usage fields into a single "additional_settings" vertical tab fieldset + // Move usage fields into a single "additional_settings" + // vertical tab fieldset. $form['commerce_discount_fields']['commerce_discount_usage'] = array( '#type' => 'fieldset', '#title' => t('Maximum usage'), @@ -224,17 +225,19 @@ function commerce_discount_usage_form_commerce_discount_form_alter(&$form, $form $form['commerce_discount_fields']['commerce_discount_usage']['discount_usage_per_person'] = $form['commerce_discount_fields']['discount_usage_per_person']; $form['commerce_discount_fields']['commerce_discount_usage']['discount_usage_limit'] = $form['commerce_discount_fields']['discount_usage_limit']; unset($form['commerce_discount_fields']['discount_usage_per_person'], $form['commerce_discount_fields']['discount_usage_limit']); - - // add our validation hook which will return submitted values to their expected location in the form_state + + // Add our validation hook which will return submitted values to their + // expected location in the form_state. $form['#validate'][] = '_commerce_discount_usage_commerce_discount_form_validate'; } /** - * Form validate function that repairs the submitted form_state from our vertical tabs alterations + * Form validate function that repairs the submitted form_state from our + * vertical tabs alterations. */ function _commerce_discount_usage_commerce_discount_form_validate(&$form, &$form_state) { - // move form values back to their original location + // Move form values back to their original location. $form_state['values']['commerce_discount_fields']['discount_usage_per_person'] = $form_state['values']['commerce_discount_fields']['commerce_discount_usage']['discount_usage_per_person']; $form_state['values']['commerce_discount_fields']['discount_usage_limit'] = $form_state['values']['commerce_discount_fields']['commerce_discount_usage']['discount_usage_limit']; unset($form_state['values']['commerce_discount_fields']['commerce_discount_usage']['discount_usage_per_person'],$form_state['values']['commerce_discount_fields']['commerce_discount_usage']['discount_usage_limit']); -} \ No newline at end of file +}