sua phan ban hang, transaction cho ban hang, sua code  order.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/orders_controller.rb