matt/uc_stripe
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Merge branch '7.x-3.x-dev' into add-metadata-endracing-7.x-3.1

Browse Source
This commit is contained in:
mattbk
2019-10-04 21:14:15 -05:00
committed by GitHub
parent e17d91d6e3 01a5a1b15f
commit bea988bc4c
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uc_stripe.info
View File

@ -5,4 +5,4 @@ dependencies[] = uc_credit
dependencies[] = libraries dependencies[] = libraries
package = Ubercart - payment package = Ubercart - payment
core = 7.x core = 7.x
php = 5.3 php = 5.3

27
uc_stripe.install
View File

@ -96,7 +96,7 @@ function uc_stripe_install() {
* Implements hook_uninstall(). * Implements hook_uninstall().
*/ */
function uc_stripe_uninstall() { function uc_stripe_uninstall() {
variable_del('uc_stripe_authenticaiton_required_email'); variable_del('uc_stripe_authentication_required_email');
} }
/** /**
@ -123,8 +123,8 @@ function uc_stripe_schema() {
), ),
'completed' => array( 'completed' => array(
'description' => 'Competion status of this pending order', 'description' => 'Competion status of this pending order',
'type' => 'int', 'type' => 'int',
'not null' => TRUE 'not null' => TRUE
), ),
'hash' => array ( 'hash' => array (
'description' => 'The unqiue has of order and payment id', 'description' => 'The unqiue has of order and payment id',
@ -234,8 +234,7 @@ function _uc_stripe_move_customer_id(&$sandbox) {
} }
/** /**
* * Creates table to track orders that require extra authentication verification.
* create table to track orders that require extra authentication verification.
*/ */
function uc_stripe_update_7301() { function uc_stripe_update_7301() {
@ -267,17 +266,27 @@ function uc_stripe_update_7301() {
'type' => 'varchar', 'type' => 'varchar',
'length' => '100', 'length' => '100',
'not null' => TRUE 'not null' => TRUE
) ),
), ),
'unique keys' => array( 'unique keys' => array(
'hash' => array( 'hash' => array(
'hash' 'hash'
) )
), ),
'primary key' => array( 'primary key' => array('id'),
'id'
)
); );
db_create_table('uc_stripe_pending_auth', $table); db_create_table('uc_stripe_pending_auth', $table);
} }
/**
* Changes typo in variable uc_stripe_authenticaiton_required_email.
*/
function uc_stripe_update_7302() {
$typo_var_name = 'uc_stripe_authenticaiton_required_email';
$value = variable_get($typo_var_name, '');
if (!empty($value)) {
variable_set('uc_stripe_authentication_required_email', $value);
variable_del($typo_var_name);
}
}

6
uc_stripe.module
View File

@ -416,10 +416,10 @@ function uc_stripe_settings_form() {
$email_text = _uc_stripe_get_authentication_required_email_text(); $email_text = _uc_stripe_get_authentication_required_email_text();
$form['uc_stripe_settings']['uc_stripe_authenticaiton_required_email'] = array( $form['uc_stripe_settings']['uc_stripe_authentication_required_email'] = array(
'#type' => 'textarea', '#type' => 'textarea',
'#title' => t('Email for Recurring payment authentication'), '#title' => t('Email for Recurring payment authentication'),
'#default_value' => variable_get('uc_stripe_authenticaiton_required_email', $email_text), '#default_value' => variable_get('uc_stripe_authentication_required_email', $email_text),
'#description' => t('If your site uses recurring payments, some transactions will require the customer to return to the site and authenticate before the subscrption payment can be processed.') '#description' => t('If your site uses recurring payments, some transactions will require the customer to return to the site and authenticate before the subscrption payment can be processed.')
); );
@ -768,7 +768,7 @@ function uc_stripe_renew($order, &$fee) {
))->execute(); ))->execute();
// Prepare email to alert user that authentication is required. // Prepare email to alert user that authentication is required.
$params['body'] = variable_get('uc_stripe_authenticaiton_required_email', _uc_stripe_get_authentication_required_email_text()); $params['body'] = variable_get('uc_stripe_authentication_required_email', _uc_stripe_get_authentication_required_email_text());
$params['user'] = user_load($order->uid); $params['user'] = user_load($order->uid);
$params['hash'] = $hash; $params['hash'] = $hash;
drupal_mail('uc_stripe', 'authentication_required', $params['user']->mail,language_default(), $params); drupal_mail('uc_stripe', 'authentication_required', $params['user']->mail,language_default(), $params);