Canel and return updated
Log updated
APT Settings done, Customer Email set
Conflicts resolved
Paypal amount changes
Paypal values updated
Paypal code Update
Conflicts resolved