Added a fix that will call updateOrderAmounts everytime user logs in
Added Conditionals to optimize
Changed not to !
Merge remote-tracking branch 'origin/hotfix-updateOrderAmountsWhenLogin'
Update Version 3.2.026
Merge branch 'master' into develop

Conflicts:
	version.txt