order_model.php changes
merge fixes for order_model.php