Transaction Fee Bug?

I only want to charge a credit card transaction fee when customers pay actually have to pay by credit card. I have set up a 2% fee under “Gateways Fees and Discounts Module Options” and everything seems fine so long as they pay by credit card.

The problem is when customers want to pay in full through GIFT CARD. If a customer goes through to CHECKOUT and adds Gift Card, the original 2% fee for paying by credit card still exists so therefore the balance is the 2%.

What is even more frustrating is once the CART has somehow been marked as looking for a 2% charge, even if you empty the cart and try to add a new product and immediately apply gift card on CART page the CART will always apply 2% to the cash value of the cart. If you clear cache or start new incognito tab you get one chance to apply GIFT CARD on CART page. If customers miss that and apply on CHECKOUT they are stuck all over again.

A further glitch I see is if a customer applies GIFT CARD on CART page – then progresses to CHECKOUT page, they can remove GIFT CARD without the 2% being automatically reapplied (Unless they refresh the CHECKOUT page themselves in browser).

An example of what I’m explaining is below – we are getting a lot of customer complaints now as they had to pay 2% transaction fee to purchase the GIFT CARD, then being asked to pay same 2% fee just to redeem the GIFT CARD.

1 $192.00
Subtotal: $192.00
Booking Fee: $3.84
Payment method: Westpac PayWay API
Gift card XJWK-SMEA-NBKQ-2KCD: -$192.00
Total: $3.84 (includes $17.80 GST)

The page I need help with: [log in to see the link]