diff --git a/commerce_coupon.info.inc b/commerce_coupon.info.inc index 574219d..2bf5d7a 100644 --- a/commerce_coupon.info.inc +++ b/commerce_coupon.info.inc @@ -1,5 +1,4 @@ 'Find coupon', 'page callback' => 'commerce_coupon_find_coupon_autocomplete', @@ -298,12 +298,12 @@ function commerce_coupon_find_coupon_autocomplete($string = '') { $return = array(); $query = new EntityFieldQuery(); $results = $query - ->entityCondition('entity_type', 'commerce_coupon') - ->propertyCondition('type', 'discount_coupon') - ->propertyCondition('code', $string, 'CONTAINS') - ->propertyOrderBy('code') - ->range(0, 3) - ->execute(); + ->entityCondition('entity_type', 'commerce_coupon') + ->propertyCondition('type', 'discount_coupon') + ->propertyCondition('code', $string, 'CONTAINS') + ->propertyOrderBy('code') + ->range(0, 3) + ->execute(); if (!empty($results['commerce_coupon'])) { $coupons = commerce_coupon_load_multiple(array_keys($results['commerce_coupon'])); @@ -413,7 +413,7 @@ function commerce_coupon_apply_access_query_substitute(QueryAlterableInterface $ if (isset($new_query)) { $query = $new_query; } - } + } else { commerce_entity_access_query_alter($query, 'commerce_coupon', $coupon_alias); } @@ -533,7 +533,7 @@ function commerce_coupon_commerce_discount_rule_build($rule, $discount) { $rule->condition('commerce_coupon_discount_coupon_codes_exist_on_order', array( 'commerce_order:select' => $map[$discount->type], 'commerce_discount' => $discount->name, - ) + ) ); } } @@ -616,12 +616,12 @@ function commerce_coupon_evaluate_inline_conditions(EntityDrupalWrapper $coupon_ function commerce_coupon_code_grants_discount($code, $discount_id) { $query = new EntityFieldQuery(); $results = $query - ->entityCondition('entity_type', 'commerce_coupon') - ->propertyCondition('type', 'discount_coupon') - ->propertyCondition('code', $code) - ->propertyCondition('status', TRUE) - ->fieldCondition('commerce_discount_reference', 'target_id', $discount_id) - ->execute(); + ->entityCondition('entity_type', 'commerce_coupon') + ->propertyCondition('type', 'discount_coupon') + ->propertyCondition('code', $code) + ->propertyCondition('status', TRUE) + ->fieldCondition('commerce_discount_reference', 'target_id', $discount_id) + ->execute(); return !empty($results['commerce_coupon']); } @@ -636,9 +636,9 @@ function commerce_coupon_get_discount_properties($discount, $options, $name) { // Load coupons that reference this discount. $query = new EntityFieldQuery(); $results = $query - ->entityCondition('entity_type', 'commerce_coupon') - ->fieldCondition('commerce_discount_reference', 'target_id', $discount->discount_id) - ->execute(); + ->entityCondition('entity_type', 'commerce_coupon') + ->fieldCondition('commerce_discount_reference', 'target_id', $discount->discount_id) + ->execute(); if (isset($results['commerce_coupon'])) { return array_keys($results['commerce_coupon']); @@ -660,13 +660,13 @@ function commerce_coupon_get_discount_properties($discount, $options, $name) { // put an equivalent query together, it ends up super slow, so we use // db_select and joins here. It still is not particularly quick. $query = db_select('commerce_coupon', 'c') - ->fields('c', array('coupon_id')); + ->fields('c', array('coupon_id')); $query->join('field_data_commerce_discount_reference', 'd', 'c.coupon_id=d.entity_id'); $query - ->condition('c.status', 1) - ->condition('d.commerce_discount_reference_target_id', $discount->discount_id) - ->condition('d.deleted', 0) - ->condition('d.entity_type', 'commerce_coupon'); + ->condition('c.status', 1) + ->condition('d.commerce_discount_reference_target_id', $discount->discount_id) + ->condition('d.deleted', 0) + ->condition('d.entity_type', 'commerce_coupon'); $value = (int) $query->countQuery()->execute()->fetchField(); @@ -676,6 +676,7 @@ function commerce_coupon_get_discount_properties($discount, $options, $name) { return $value; } return 0; + } } @@ -793,7 +794,7 @@ function commerce_coupon_redeem_coupon_code($code, $order, &$error) { commerce_order_save($order_wrapper->value()); return $coupon; - } + } else { // If the coupon was not added, check the static error variable - one of // the coupon conditions may have set something specific. @@ -804,7 +805,7 @@ function commerce_coupon_redeem_coupon_code($code, $order, &$error) { $error = t('Unable to redeem coupon.'); } } - } + } else { $error = t('Your coupon code is not valid.'); } @@ -1259,10 +1260,10 @@ function commerce_coupon_load_coupon_code_discounts($code) { $query = new EntityFieldQuery(); $results = $query - ->entityCondition('entity_type', 'commerce_discount') - ->fieldCondition('commerce_coupon_reference', 'target_id', $coupon->coupon_id) - ->propertyCondition('enabled', 1) - ->execute(); + ->entityCondition('entity_type', 'commerce_discount') + ->fieldCondition('commerce_coupon_reference', 'target_id', $coupon->coupon_id) + ->propertyCondition('enabled', 1) + ->execute(); if (!empty($results['commerce_discount'])) { $discounts = entity_load('commerce_discount', array_keys($results['commerce_discount'])); @@ -1395,7 +1396,7 @@ function _commerce_coupon_free_shipping_single_discount($coupon, $exclusive = TR foreach ($coupon_wrapper->commerce_discount_reference as $discount_wrapper) { if ($discount_wrapper->commerce_discount_offer->value() && $discount_wrapper->commerce_discount_offer->type->value() == 'free_shipping') { $discount = $discount_wrapper->value(); - } + } elseif ($discount_wrapper->status->value() && $exclusive) { // If the coupon grants any other kind of enabled discount, the purpose // of this function is to return FALSE. @@ -1414,7 +1415,7 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) // Attach a UI for adding associated coupon entities. if (isset($form_state['triggering_element'])) { $trigger = end($form_state['triggering_element']['#array_parents']); - } + } else { $trigger = NULL; } @@ -1457,7 +1458,7 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) // Keep track of these so we know which to get rid of at the end. $form_state['original_coupons'] = $form_state['coupons']; } - $coupons = & $form_state['coupons']; + $coupons =& $form_state['coupons']; // Handle certain triggers. switch ($trigger) { @@ -1514,7 +1515,11 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) ); // Attach the coupon form. commerce_coupon_attach_ajax_coupon_entity_form( - $form['coupons']['coupon_form'], $form_state, $coupon, $ajax, array(array('coupons')) + $form['coupons']['coupon_form'], + $form_state, + $coupon, + $ajax, + array(array('coupons')) ); // Add responsive visibility states to the code line. @@ -1529,7 +1534,7 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) ); $form_state['edit_coupon'] = $coupon; - } + } elseif ($trigger == 'add_existing') { $form['coupons']['find_coupon_code'] = array( '#type' => 'textfield', @@ -1575,7 +1580,11 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) ); commerce_coupon_attach_ajax_coupon_entity_form( - $form['coupons']['manage_coupons'][$delta]['coupon_form'], $form_state, $coupon, $ajax, array(array('coupons', 'manage_coupons', $delta)) + $form['coupons']['manage_coupons'][$delta]['coupon_form'], + $form_state, + $coupon, + $ajax, + array(array('coupons', 'manage_coupons', $delta)) ); // Add responsive visibility states to the code line. @@ -1584,7 +1593,7 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) 'input[name="coupons[manage_coupons][' . $delta . '][coupon_form][generate]"]' => array('checked' => TRUE), ), ); - } + } else { $form['coupons']['manage_coupons'][$delta]['edit_coupon'] = array( '#type' => 'button', @@ -1604,7 +1613,7 @@ function commerce_coupon_form_commerce_discount_form_alter(&$form, &$form_state) ); } } - } + } else { // This means there are too many coupons for the management widget to // handle. Provide a summary. @@ -1673,7 +1682,7 @@ function commerce_coupon_form_attach_coupons(&$form, &$form_state) { // If no discounts remain, delete the coupon. if (empty($remove_coupon->commerce_discount_reference[$language])) { commerce_coupon_delete($original_coupon->coupon_id); - } + } else { // If we are not deleting, save the coupon since we eliminated one or // more of its discount references. @@ -1755,11 +1764,11 @@ function commerce_coupon_form_attach_coupons_validate(&$form, &$form_state) { // Determine whether it is the "add new" form or an edit form. if (isset($coupon)) { if (isset($coupon->delta)) { - $coupon_fields_form = & $form['coupons']['manage_coupons'][$coupon->delta]['coupon_form']['commerce_coupon_fields']; + $coupon_fields_form =& $form['coupons']['manage_coupons'][$coupon->delta]['coupon_form']['commerce_coupon_fields']; $coupon_values = $form_state['values']['coupons']['manage_coupons'][$coupon->delta]['coupon_form']; - } + } else { - $coupon_fields_form = & $form['coupons']['coupon_form']['commerce_coupon_fields']; + $coupon_fields_form =& $form['coupons']['coupon_form']['commerce_coupon_fields']; $coupon_values = $form_state['values']['coupons']['coupon_form']; } } @@ -1789,7 +1798,7 @@ function commerce_coupon_form_attach_coupons_validate(&$form, &$form_state) { $n++; } } - } + } else { $code = $coupon_values['code']; } @@ -1811,7 +1820,7 @@ function commerce_coupon_form_attach_coupons_validate(&$form, &$form_state) { if (isset($coupon->coupon_id)) { commerce_coupon_save($coupon); } - } + } else { $form_state['coupons'][] = $coupon; } @@ -1833,10 +1842,10 @@ function commerce_coupon_form_attach_coupons_validate(&$form, &$form_state) { $coupon = commerce_coupon_load_by_code($code, 'discount_coupon'); if (!$coupon) { form_set_error('coupons][find_coupon_code', t('Please enter a valid coupon code')); - } + } elseif (commerce_coupon_coupon_list_has_code($coupon->code, $form_state['coupons'])) { form_set_error('coupons][find_coupon_code', t('The coupon code you entered has already been added to this discount.')); - } + } else { $form_state['coupons'][] = $coupon; } @@ -2009,13 +2018,13 @@ function theme_commerce_coupon_manage_discount_coupons($variables) { $edit_button_cell, $remove_button_cell, ); - } + } else { $form = $element['coupon_form']; // Single cell row. $row = array(array( - 'data' => drupal_render($form), - 'colspan' => 3, + 'data' => drupal_render($form), + 'colspan' => 3, ), ); } @@ -2093,12 +2102,12 @@ function _commerce_coupon_install_inline_conditions_field() { $instance = array( 'field_name' => 'commerce_coupon_conditions', 'entity_type' => 'commerce_coupon', - 'settings' => array( + 'settings' => array( 'entity_type' => 'commerce_coupon', ), 'bundle' => $machine_name, 'label' => t('Conditions'), - 'widget' => array( + 'widget' => array( 'type' => 'inline_conditions', 'weight' => 10, ), @@ -2189,6 +2198,7 @@ function commerce_coupon_commerce_coupon_legacy_mapping($coupon) { 'offer field' => 'commerce_fixed_amount', 'offer type' => 'fixed_amount', ); + } } @@ -2196,7 +2206,6 @@ function commerce_coupon_commerce_coupon_legacy_mapping($coupon) { * Stub function so that coupon type modules do not crash when they disable. */ function commerce_coupon_type_disable() { - } /** diff --git a/commerce_coupon.rules_defaults.inc b/commerce_coupon.rules_defaults.inc index b95d151..d6aa314 100644 --- a/commerce_coupon.rules_defaults.inc +++ b/commerce_coupon.rules_defaults.inc @@ -1,5 +1,4 @@ event('commerce_coupon_applied_to_cart') ->action('drupal_message', array( 'message' => t('Coupon code applied.'), - )); + )); $rules['coupon_cart_sucess_message'] = $rule; @@ -48,20 +47,20 @@ function commerce_coupon_default_rules_configuration() { // Add default conditions to all coupon types. $rule - // Coupon must be active. - ->condition('data_is', array( - 'data:select' => 'commerce-coupon:status', - 'op' => '==', - 'value' => '1', - )) - // Inline conditions must pass. - ->condition('commerce_coupon_evaluate_coupon_inline_conditions_rule', array( - 'commerce_coupon:select' => 'commerce_coupon', - )) - // Permissions for "redeeem" must pass. - ->condition('commerce_coupon_current_user_may_redeem', array( - 'commerce_coupon:select' => 'commerce_coupon', - )); + // Coupon must be active. + ->condition('data_is', array( + 'data:select' => 'commerce-coupon:status', + 'op' => '==', + 'value' => '1', + )) + // Inline conditions must pass. + ->condition('commerce_coupon_evaluate_coupon_inline_conditions_rule', array( + 'commerce_coupon:select' => 'commerce_coupon', + )) + // Permissions for "redeeem" must pass. + ->condition('commerce_coupon_current_user_may_redeem', array( + 'commerce_coupon:select' => 'commerce_coupon', + )); // Allow other modules to alter the rule. drupal_alter('commerce_coupon_condition_component', $rule, $machine_name); diff --git a/commerce_coupon.test b/commerce_coupon.test index 274d18a..e37183e 100644 --- a/commerce_coupon.test +++ b/commerce_coupon.test @@ -9,7 +9,6 @@ * Base class for Commerce Discount tests */ abstract class CommerceCouponTestBase extends CommerceBaseTestCase { - /** * Don't need most of default core modules. */ @@ -147,14 +146,12 @@ abstract class CommerceCouponTestBase extends CommerceBaseTestCase { return $discount_wrapper->value(); } - } /** * Testing commerce coupon UI and functionality. */ class CommerceCouponTest extends CommerceCouponTestBase { - /** * Implementation of getInfo(). */ @@ -235,6 +232,7 @@ class CommerceCouponTest extends CommerceCouponTestBase { // Check the coupons listing. $this->assertUrl('admin/commerce/coupons', array(), 'Landing page after save is the coupons list.'); $this->assertText($values['code'], 'Label of the coupon is present.'); + } public function testCommerceCouponUICartForm() { @@ -271,6 +269,8 @@ class CommerceCouponTest extends CommerceCouponTestBase { $values = array('coupon_code' => 'HALF OFF'); $this->drupalPost(NULL, $values, t('Add coupon')); $this->assertText(t('Coupon code applied.'), 'Coupon applied message for valid code.'); + + } public function testCommerceCouponTypeAccess() { @@ -282,5 +282,4 @@ class CommerceCouponTest extends CommerceCouponTestBase { $this->drupalPost(NULL, array(), t('Save configuration')); $this->assertText(t('The configuration options have been saved.')); } - }