Bug fixes on Thirty bees/Prestashop

Hi, I own a webshop, Krachtshop.nl. It runs on latest version of Thirty Bees, this is hard fork of Prestashop 1.6. Some things concerning order status and emails send depending on order status are not working correctly. I would like this solved. I try to describe the problems in detail: 1) When customer put a virtual product in cart, goes to payment screen, but cancels payment. He still receives the email with download link. This should not happen. 2) When customer put any product in cart (virtual or real), goes to payment screen, but cancels payment. He still receives an 'order confirmation' email. This should not happen, instead he should receive an 'problem with payment' email. 3) Related to above 1 and 2 issues. When customer cancels a payment, order status is set to 'awaiting bank payment', so customer gets wrong email. The order status should be set to 'Payment error' status and customer should get 'Problem with payment' email. Issue 1, 2 and 3 are probably all related to the same bug. After succesfull project completion, I have another project for you and maybe more in future. Kind regards, Patrick