made GA shipping total subtract shipping discount, fixes dioscouri/amritasingh-f3#331