diff --git a/booking.module b/booking.module index 43c192f..c5fed1f 100644 --- a/booking.module +++ b/booking.module @@ -758,9 +758,28 @@ function booking_node_info() { } /** - * Implements hook_libraries_info(). + * Implements hook_library(). */ -function bookings_libraries_info() { +function booking_library() { + $module_path = drupal_get_path('module', 'booking'); + + $items['stripe'] = array( + 'title' => t('Stripe'), + 'version' => '1.0', + 'js' => array( + 'https://js.stripe.com/v1/' => array(), + $module_path . '/booking.stripe.js' => array(), + ), + ); + + return $items; +} + +/** + * Implements hook_libraries_info(). + * @todo does this even do anything useful? + */ +function booking_libraries_info() { $libraries['stripe'] = array( 'name' => 'Stripe Payment API PHP Library', 'vendor url' => 'https://github.com/stripe/stripe-php', @@ -771,7 +790,7 @@ function bookings_libraries_info() { 'lines' => 1, ), 'files' => array('php' => array('init.php')), - 'callbacks' => array('post-load' => array('bookings_libraries_postload_callback')), + 'callbacks' => array('post-load' => array('booking_libraries_postload_callback')), ); return $libraries; } @@ -788,7 +807,7 @@ function bookings_libraries_info() { * If the $library array belongs to a certain variant, a string containing the * variant name. */ -function bookings_libraries_postload_callback($library, $version = NULL, $variant = NULL) { +function booking_libraries_postload_callback($library, $version = NULL, $variant = NULL) { if (!empty($library['loaded'])) { \Stripe\Stripe::setApiKey(_booking_get_stripe_private_key()); } diff --git a/booking.stripe.inc b/booking.stripe.inc index a3ac2b7..00a6161 100644 --- a/booking.stripe.inc +++ b/booking.stripe.inc @@ -54,9 +54,10 @@ function booking_stripeform_form($form, &$form_state) { $form['#attached'] = array( 'js' => array( array('data' => $setting, 'type' => 'setting'), + //drupal_get_path('module', 'booking') . '/booking.stripe.js', ), 'library' => array( - array('booking', 'booking.stripe'), + array('booking', 'stripe'), ), );