Code improvements

CRM/CiviDiscount/DiscountCalculator.php

@@ -182,10 +182,8 @@ function setEntityDiscounts() {
       }
       if ($this->checkDiscountsByEntity($discount, $this->entity, $this->entity_id, 'filters')) {
         $this->entity_discounts[$discount_id] = $discount;
-        /* Added by BOT
-        * To decide if discount text box should be displayed, no need to loop through all discount codes 
-        */ 
-        if( empty( $this->code ) ) {
+        // Added by BOT To decide if discount text box should be displayed, no need to loop through all discount codes 
+        if (empty($this->code)) {
           break;
         }
       }

cividiscount.php

@@ -166,6 +166,8 @@ function cividiscount_civicrm_buildForm($fname, &$form) {
       $addDiscountField = $discountCalculator->isShowDiscountCodeField();
     }
     elseif ($fname == 'CRM_Contribute_Form_Contribution_Main') {
+      CRM_Core_Resources::singleton()
+        ->addScriptFile('org.civicrm.module.cividiscount', 'js/main.js');
       $ids = _cividiscount_get_discounted_membership_ids();
       if(!empty($form->_membershipBlock['membership_types'])){
         $memtypes = explode(',', $form->_membershipBlock['membership_types']);

js/main.js

@@ -0,0 +1,32 @@
+CRM.$(function($) {
+  if ($('#discountcode').length > 0) {
+    skipPaymentMethod();
+    function showHidePayment(flag) {
+      $('.payment_options-group, div.payment_processor-section, #payment_information').toggle(!flag);
+      if (flag) {
+        // also unset selected payment methods
+        $('input[name="payment_processor"]').prop('checked', false);
+      }
+    }
+
+    function skipPaymentMethod() {
+      var flag = false;
+      $('.price-set-option-content input').each( function(){
+        currentTotal = $(this).attr('data-amount').replace(/[^\/\d]/g,'');
+        if( $(this).is(':checked') && currentTotal == 0 ) {
+            flag = true;
+        }
+      });
+      $('.price-set-option-content input').change( function () {
+        if ($(this).attr('data-amount').replace(/[^\/\d]/g,'') == 0 ) {
+          flag = true;
+        } else {
+          flag = false;
+        }
+        showHidePayment(flag);
+      });
+      showHidePayment(flag);
+    }
+  }
+});
+