แก้ไขข้อมูล customer
Merge branch 'personal/kob2' into personal/merge_mx12

Conflicts:
	app/models/OrderModel.php
finish bill