diff --git a/booking.admin.inc b/booking.admin.inc index a689ac8..e92ca3d 100644 --- a/booking.admin.inc +++ b/booking.admin.inc @@ -186,7 +186,8 @@ function booking_admin() { '#collapsible' => TRUE, //'#collapsed' => TRUE, ); - $explanation_text = t('
Register an account at stripe.com and visit the API keys page, then copy your API keys here.
'); + $explanation_text = t('Verify your country supports stripe at the stripe website.
' . + 'Register an account at stripe.com and visit the API keys page, then copy your API keys here.
'); $form['stripe']['explanation-text'] = array( '#type' => 'container', '#children' => $explanation_text, @@ -455,17 +456,6 @@ function booking_admin() { ) ); - $form['regn_options']['booking_dependant_children_text'] = array( - '#type' => 'radios', - '#title' => t('Ask whether a couple has dependant children attending?'), - '#description' => t('Select whether to ask about dependant children of married couples in the registration form'), - '#options' => array( - 0 => t('No'), - t('Yes') - ), - '#default_value' => variable_get('booking_ask_dependant_children', 0) - ); - $form['regn_options']['booking_enable_medicare'] = array( '#type' => 'radios', '#title' => t('Enable Medicare requirement?'), @@ -507,7 +497,7 @@ function booking_admin() { $form['regn_options']['booking_enable_passport'] = array( '#type' => 'radios', - '#title' => t('Enable passport information?'), + '#title' => t('Enable passport information? (DEPRECATED)'), '#description' => t('Select whether to include passport details in the booking form.'), '#options' => array( 0 => t('No'), diff --git a/booking.module b/booking.module index b270fc5..486c066 100644 --- a/booking.module +++ b/booking.module @@ -227,18 +227,6 @@ function booking_menu() { 'type' => MENU_CALLBACK, ); - /* - $items['admin/booking/createview'] = array( - 'title' => 'Booking Test mysql view creation', - 'description' => 'Booking Test mysql view creation', - 'page callback' => '_booking_node_create_mysqlview', - //'access arguments' => array('edit bookings'), - //always allow access to this page - security risk! - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - ); - */ - //pages for attendees to fill out information $items['booking'] = array( 'title' => $bookingTitle . ' Booking Form', @@ -246,21 +234,12 @@ function booking_menu() { 'access arguments' => array('access booking form'), 'type' => MENU_NORMAL_ITEM, ); - // @todo remove this after testing - /* - $items['stripetest'] = array( - 'title' => $bookingTitle . ' Stripe Test', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('booking_stripeform_form'), - 'access arguments' => array('access booking form'), - 'type' => MENU_NORMAL_ITEM, - ); - */ + $items['bookingfinal'] = array( 'title' => $bookingTitle . ' Registration Completed', 'page callback' => 'booking_payment_completed_page', 'access arguments' => array('access booking form'), - 'type' => MENU_NORMAL_ITEM, + 'type' => MENU_CALLBACK, ); $items['confirm/%'] = array( 'title' => 'Booking Payment',