',
+ $form['billing_info']['expires'] = array(
+ '#type' => 'container',
+ '#attributes' => array('class' => array('field', 'expires')),
+ );
+ $form['billing_info']['expires']['title'] = array(
+ '#theme' => 'html_tag',
+ '#tag' => 'div',
+ '#value' => t('Expires'),
+ '#attributes' => array('class' => array('title')),
+ );
+ $month_op = array_flip(range(1, 12));
+ array_walk($month_op, function(&$item, $key) {
+ $number = str_pad($key, 2, '0', STR_PAD_LEFT);
+ $item = $number . ' - ' . date('F', mktime(0, 0, 0, $key, 10));
+ });
+ $form['billing_info']['expires']['month'] = array(
+ '#type' => 'select',
+ '#title' => t('MM'),
+ '#title_display' => 'invisible',
+ '#options' => $month_op,
+ '#attributes' => array(
+ 'data-recurly' => 'month',
+ ),
+ '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
);
- $form['billing']['cc_info']['year'] = array(
- '#title' => t('Year'),
- '#markup' => '
',
+
+ $year_op = range(date('Y'), date('Y') + 10);
+ $form['billing_info']['expires']['year'] = array(
+ '#type' => 'select',
+ '#title' => t('YYYY'),
+ '#title_display' => 'invisible',
+ '#options' => array_combine($year_op, $year_op),
+ '#attributes' => array(
+ 'data-recurly' => 'year',
+ ),
+ '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
'#suffix' => '
',
);
- $address_requirement = variable_get('recurlyjs_address_requirement', 'full');
- $hide_vat_number = variable_get('recurlyjs_hide_vat_number', 0);
-
- if (in_array($address_requirement, array('zipstreet', 'full'))) {
- $form['billing']['address1'] = array(
- '#type' => 'textfield',
- '#title' => t('Address Line 1'),
- '#attributes' => array(
- 'data-recurly' => 'address1',
- ),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- );
- $form['billing']['address2'] = array(
- '#type' => 'textfield',
- '#title' => t('Address Line 2'),
- '#attributes' => array(
- 'data-recurly' => 'address2',
- ),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- );
- }
-
- $form['billing']['city_state_postal'] = array(
+ $form['billing_info']['address1'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Address'),
+ '#title_display' => 'invisible',
+ '#attributes' => array(
+ 'data-recurly' => 'address1',
+ 'placeholder' => t('Address'),
+ ),
+ '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+ $form['billing_info']['address2'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Apt/Suite'),
+ '#title_display' => 'invisible',
+ '#attributes' => array(
+ 'data-recurly' => 'address2',
+ 'placeholder' => t('Apt/Suite'),
+ ),
+ '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+ $form['billing_info']['city'] = array(
+ '#type' => 'textfield',
+ '#title' => t('City'),
+ '#title_display' => 'invisible',
+ '#attributes' => array(
+ 'data-recurly' => 'city',
+ 'placeholder' => t('City'),
+ ),
+ '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+ $form['billing_info']['state_zip'] = array(
'#type' => 'container',
+ '#attributes' => array('class' => array('state_zip')),
+ );
+ $form['billing_info']['state_zip']['state'] = array(
+ '#type' => 'textfield',
+ '#title' => t('State'),
+ '#title_display' => 'invisible',
'#attributes' => array(
- 'class' => array('recurlyjs-city-state-postal-wrapper'),
+ 'data-recurly' => 'state',
+ 'placeholder' => t('State'),
),
+ '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+ $form['billing_info']['state_zip']['postal_code'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Zip/Postal'),
+ '#title_display' => 'invisible',
+ '#attributes' => array(
+ 'data-recurly' => 'postal_code',
+ 'placeholder' => t('Zip/Postal'),
+ ),
+// '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+ $form['billing_info']['country'] = array(
+ '#type' => 'select',
+ '#options' => _recurlyjs_get_countries(),
+ '#title' => t('Country'),
+ '#title_display' => 'invisible',
+ '#empty_option' => t('- Select country -'),
+ '#empty_value' => '_none',
+ '#attributes' => array(
+ 'data-recurly' => 'country',
+ ),
+// '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#prefix' => '
',
+ '#suffix' => '
',
);
- if ($address_requirement == 'full') {
- $form['billing']['city_state_postal']['city'] = array(
- '#type' => 'textfield',
- '#title' => t('City'),
- '#attributes' => array(
- 'data-recurly' => 'city',
- ),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- );
- $form['billing']['city_state_postal']['state'] = array(
- '#type' => 'textfield',
- '#title' => t('State'),
- '#attributes' => array(
- 'data-recurly' => 'state',
- ),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- );
- }
-
- if ($address_requirement != 'none') {
- $form['billing']['city_state_postal']['postal_code'] = array(
- '#type' => 'textfield',
- '#title' => t('Postal Code'),
- '#attributes' => array(
- 'data-recurly' => 'postal_code',
- ),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- );
- }
+ $vat_avaliable_countries = array('AT', 'BE', 'BG', 'CY', 'CZ', 'DK', 'EE', 'ES', 'FI', 'FR',
+ 'DE', 'GB', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT',
+ 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'HR');
- if ($address_requirement == 'full') {
- // country_get_list() requires includes/locale.inc.
- require_once DRUPAL_ROOT . '/includes/locale.inc';
- $form['billing']['country'] = array(
- '#type' => 'select',
- '#title' => t('Country'),
- '#attributes' => array(
- 'data-recurly' => 'country',
- ),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- '#options' => country_get_list(),
- '#empty_option' => t('Select country...'),
- );
+ $states_vat_options = array();
+ foreach ($vat_avaliable_countries as $code) {
+ $states_vat_options[] = array('value' => $code);
}
- if (!$hide_vat_number) {
- $form['billing']['vat_number'] = array(
- '#type' => 'textfield',
- '#title' => t('VAT Number'),
- '#attributes' => array(
- 'data-recurly' => 'vat_number',
+ $form['billing_info']['vat_number'] = array(
+ '#type' => 'textfield',
+ '#title' => t('VAT Number'),
+ '#title_display' => 'invisible',
+ '#attributes' => array(
+ 'data-recurly' => 'vat_number',
+ 'placeholder' => t('VAT Number'),
+ ),
+// '#after_build' => array('_recurlyjs_form_remove_element_name'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[data-recurly="country"]' => $states_vat_options,
),
- '#prefix' => '
',
- '#suffix' => '
',
- '#after_build' => array('_recurlyjs_form_remove_element_name'),
- );
- }
+ ),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
- $form['billing']['tax_code'] = array(
+ $form['tax_code'] = array(
'#type' => 'hidden',
- '#title' => t('digital'),
+ '#value'=> 'digital',
'#attributes' => array(
'data-recurly' => 'tax_code',
),
- '#prefix' => '
',
- '#suffix' => '
',
'#after_build' => array('_recurlyjs_form_remove_element_name'),
);
$form['recurly-token'] = array(
diff --git a/modules/recurlyjs/recurly-element.js b/modules/recurlyjs/recurly-element.js
index df9f5bd..fe9f4f9 100644
--- a/modules/recurlyjs/recurly-element.js
+++ b/modules/recurlyjs/recurly-element.js
@@ -18,8 +18,41 @@ Drupal.behaviors.recurlyJSSubscribeForm = {
Drupal.behaviors.recurlyJSUpdateBillingForm = {
attach: function (context, settings) {
$('#recurlyjs-update-billing-form').once('recurlyjs-update-billing-form', function () {
- $(this).bind('submit', Drupal.recurly.recurlyJSTokenFormSubmit);
+ $(this).on('submit', Drupal.recurly.recurlyJSTokenFormSubmit);
+ });
+ }
+};
+
+/**
+ * Set data into form.
+ */
+Drupal.behaviors.recurlyJSFormData = {
+ attach: function (context, settings) {
+ var $form = $('.recurly-form-wrapper', context);
+ var planCode = $('input[name="plan_code"]', $form).val();
+ var pricing = recurly.Pricing();
+ // Remove drupal standart form classes.
+ $('input, select', context).removeClass('form-control');
+
+ // Set plan name and price.
+ pricing.on('set.plan', function(plan) {
+ $('.plan .name', $form).text(plan.name);
+ var price = plan.price.USD;
+ $('.recurring_cost .cost, .due_now .cost', $form).text(price.symbol + price.unit_amount.toFixed(2));
+ $('.due_now .currency-symbol', $form).text(price.symbol);
+ $('.due_now .total-now', $form).text(price.unit_amount.toFixed(2));
+ var period = plan.period;
+ $('.recurring_cost .interval', $form).text(Drupal.t('every @length @interval', {
+ '@length': period.length,
+ '@interval': period.interval
+ }));
});
+ // Set plan.
+ pricing.plan(planCode, { quantity: 1 });
+ pricing.attach($('.recurly-form-wrapper form', context));
+ // Debug pricing and errors.
+ // pricing.on('change', function (price) { console.info(price); });
+ // pricing.on('error', function (e) { console.error(e); });
}
};
@@ -30,175 +63,95 @@ Drupal.recurly.recurlyJSTokenFormSubmit = function(event) {
event.preventDefault();
// Reset the errors display
- Drupal.recurly.clearErrors();
- $('.recurlyjs-form-item__error').removeClass('.recurlyjs-form-item__error');
+ $('#recurly-form-errors').html('').removeAttr( "style" );
+ $('input').removeClass('invalid');
// Disable the submit button
- $('button').attr('disabled', true);
+ $('button').prop('disabled', true);
var form = this;
- recurly.token(form, function (err, token) {
- if (err) {
- Drupal.recurly.recurlyJSFormError(err);
- }
- else {
- form.submit();
- }
- });
-};
-/**
- * Handles form errors.
- */
-Drupal.recurly.recurlyJSFormError = function(err) {
- var errorFields = {
- first_name: Drupal.t('First name'),
- last_name: Drupal.t('Last name'),
- email: Drupal.t('Email address'),
- number: Drupal.t('Credit Card number'),
- postal_code: Drupal.t('Postal Code'),
- month: Drupal.t('Expiration Month'),
- year: Drupal.t('Expiration Year')
- };
-
- $('button').attr('disabled', false);
-
- var fieldErrorsList = $.map(err.fields, function (field) {
- // Add a class to each element with an error.
- $('.recurlyjs-form-item__' + field).addClass('recurlyjs-form-item__error');
- // Append a message to the list.
- return '
'+ errorFields[field] +'';
- }).join('');
-
- // Add the error message to the form within standard Drupal message markup.
- if (typeof err.message !== 'undefined') {
- var messageMarkup = '
';
- $('#recurly-form-errors').html(messageMarkup);
+ // run PayPal payment method if the PayPal tab is active
+ if ($('#payment-method--paypal.active', form).length === 1) {
+ Drupal.recurly.recurlyJSPaypalPurchase(form);
+ return true;
}
-};
-
-Drupal.recurly.clearErrors = function() {
- $('#recurly-form-errors').html('');
-};
-/**
- * Update icon used in credit card number field when value of field changes.
- *
- * @param state
- * See https://dev.recurly.com/docs/events
- */
-Drupal.recurly.recurlyJSPaymentMethod = function(state) {
-if (state.fields.number.focus == true) {
- $('.recurlyjs-icon-card').removeClass().addClass('recurlyjs-icon-card recurlyjs-icon-card__' + state.fields.number.brand);
-}
+ if($('input[name="recurly-token"]').val()!='') {
+ form.submit();
+ } else {
+ recurly.token(form, function (err, token) {
+ if (err) {
+ Drupal.recurly.recurlyJSFormError(err);
+ }
+ else {
+ form.submit();
+ }
+ });
+ }
};
/**
- * Update order summary when pricing information changes.
- *
- * @param pricingState
- * See https://dev.recurly.com/docs/pricing
+ * Handles submission using PayPal.
*/
-Drupal.recurly.recurlyJSPricing = function(pricingState) {
- Drupal.recurly.clearErrors();
-
- var displaySubtotal = false;
- // Toggle visibility of order summary elements that may or may not be used
- // depending on the plan.
- // Toggle visiblity of setup fee.
- if (parseInt(pricingState.now.setup_fee) > 0) {
- $('.recurlyjs-setup-fee').removeClass('recurlyjs-element__hidden');
- displaySubtotal = true;
- }
- else {
- $('.recurlyjs-setup-fee').addClass('recurlyjs-element__hidden');
- }
-
- // Toggle visibility of discount.
- if (parseInt(pricingState.now.discount) > 0) {
- $('.recurlyjs-discount').removeClass('recurlyjs-element__hidden');
- displaySubtotal = true;
- }
- else {
- $('.recurlyjs-discount').addClass('recurlyjs-element__hidden');
- }
-
- // Toggle visibility of sub total. No need to display sub-total if none of the
- // above are set.
- if (displaySubtotal && parseInt(pricingState.now.subtotal) > 0) {
- $('.recurlyjs-subtotal').removeClass('recurlyjs-element__hidden');
- }
- else {
- $('.recurlyjs-subtotal').addClass('recurlyjs-element__hidden');
- }
-
- // Toggle visibility of taxes.
- if (parseInt(pricingState.now.tax) > 0) {
- $('.recurlyjs-tax').removeClass('recurlyjs-element__hidden');
- }
- else {
- $('.recurlyjs-tax').addClass('recurlyjs-element__hidden');
- }
+Drupal.recurly.recurlyJSPaypalPurchase = function(form) {
+ var opts = { description: 'Subscription using PayPal' };
+ recurly.paypal(opts, function (err, token) {
+ if (err) {
+ Drupal.recurly.recurlyJSFormError(err);
+ } else {
+ $('input[name="recurly-token"]').val(token.id);
+ $('input[name="use_paypal_method"]').val(1);
+ form.submit();
+ }
+ });
};
/**
- * Configures form for recurly hosted fields.
+ * Handles form errors.
*/
-Drupal.behaviors.recurlyJSConfigureForm = {
- attach: function (context, settings) {
- recurly.configure({
- publicKey: settings.public_key,
- style: {
- number: {
- placeholder: 'xxxx xxxx xxxx xxxx'
- },
- month: {
- placeholder: 'MM'
- },
- year: {
- placeholder: 'YYYY'
- },
- cvv: {
- placeholder: '123'
+Drupal.recurly.recurlyJSFormError = function(err) {
+ $('button').prop('disabled', false);
+
+ // Add the error class to all form elements that returned an error.
+ if (typeof err.fields !== 'undefined') {
+ $('.form-item div.error').remove();
+ $('input.invalid, select.invalid').removeClass('invalid');
+ $.each(err.fields, function (index, value) {
+ var selectors = 'input[data-recurly="' + value + '"], select[data-recurly="' + value + '"]';
+ $(selectors).addClass('invalid');
+ // Added error text for empty fields.
+ if ($(selectors).val() == '') {
+ $(selectors).after('
' + Drupal.t('Required field') + '
');
+ }
+ // Card number validation.
+ else if ('number' == value) {
+ if (!recurly.validate.cardNumber($(selectors).val())) {
+ $(selectors).after('
' + Drupal.t('Invalid card number.') + '
');
}
}
- });
-
- // Add listener for changes to credit card field's value.
- recurly.on('change', Drupal.recurly.recurlyJSPaymentMethod);
-
- // Create a new pricing module, and track change events for pricing related
- // elements on the form.
- var pricing = recurly.Pricing();
- pricing.attach($('#recurlyjs-subscribe-form'));
- pricing.on('change', Drupal.recurly.recurlyJSPricing);
- pricing.on('error', function (error) {
- // Checking for coupon validation errors.
- if (typeof error.message !== 'undefined') {
- var messageMarkup = '
' + error.message + '
';
- $('#recurly-form-errors').html(messageMarkup);
+ else if ('cvv' == value) {
+ if (!recurly.validate.cvv($(selectors).val())) {
+ $(selectors).after('
' + Drupal.t('Invalid cvv number.') + '
');
+ }
}
});
+ // Validate expiry
+ var month = $('select[data-recurly="month"]').val();
+ var year = $('select[data-recurly="year"]').val();
+ if (month != '' && year != '') {
+ if (!recurly.validate.expiry(month, year)) {
+ $('select[data-recurly="month"], select[data-recurly="year"]').after('
' + Drupal.t('Invalid expiry.') + '
');
+ }
+ }
+ }
+
+ // Add the error message to the form within standard Drupal message markup.
+ if (typeof err.message !== 'undefined') {
+ var messageMarkup = '
' + err.message + '
';
+ $('#recurly-form-errors').html(messageMarkup).css('padding-bottom', '20px');
}
};
-// VAT is only needed for EU countries.
-(function () {
- var country = $('#country');
- var vatNumber = $('#vat-number');
- var euCountries = [
- 'AT', 'BE', 'BG', 'CY', 'CZ', 'DK', 'EE', 'ES', 'FI', 'FR',
- 'DE', 'GB', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT',
- 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK', 'HR'
- ];
-
- country.bind('change init', function (event) {
- if (~euCountries.indexOf(this.value)) {
- vatNumber.show();
- } else {
- vatNumber.hide();
- }
- }).triggerHandler('init');
-})();
})(jQuery);
diff --git a/modules/recurlyjs/recurlyjs.install b/modules/recurlyjs/recurlyjs.install
index 5f55b40..bd1320f 100644
--- a/modules/recurlyjs/recurlyjs.install
+++ b/modules/recurlyjs/recurlyjs.install
@@ -32,6 +32,7 @@ function recurlyjs_uninstall() {
variable_del('recurlyjs_enable_add_ons');
variable_del('recurlyjs_enable_coupons');
variable_del('recurlyjs_hide_vat_number');
+ variable_del('recurlyjs_accept_paypal');
}
/**