I've never personally tried it but I don't see why you couldn't configure both options in access control settings for the SSID.
- WPA2-psk (pre-shared key)
- Click through splash page
That would require a password to log on to the wifi and then the user must acknowledge a consent page before being able to use the service.