updated ubercart contrib module

This commit is contained in:
2019-10-14 10:35:12 +02:00
parent 26fadc74e4
commit 4e780cb6d4
55 changed files with 181 additions and 161 deletions

View File

@@ -4,8 +4,8 @@ dependencies[] = uc_payment
package = Ubercart - payment
core = 7.x
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -5,8 +5,8 @@ dependencies[] = uc_credit
package = Ubercart - payment
core = 7.x
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -391,7 +391,7 @@ function _uc_authorizenet_cim_payment_profile_get($order, $profile_id, $payment_
}
/**
* Handles authorizations and captures through AIM at Authorize.Net
* Handles authorizations and captures through AIM at Authorize.net.
*/
function _uc_authorizenet_charge($order, $amount, $data) {
global $user;
@@ -523,7 +523,7 @@ function _uc_authorizenet_charge($order, $amount, $data) {
$response[$i] = substr($response[$i], 1, strlen($response[$i]) - 2);
}
/**
/*
* Response key index:
* 0 = Response Code
* 2 = Response Reason Code

View File

@@ -5,8 +5,8 @@ dependencies[] = uc_credit
package = Ubercart - payment
core = 7.x
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -8,8 +8,8 @@ core = 7.x
; Test cases
files[] = tests/uc_credit.test
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -7,8 +7,8 @@ core = 7.x
; Class definitions
files[] = uc_cybersource.soap.inc
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -139,7 +139,7 @@ function uc_cybersource_schema() {
'not null' => TRUE,
'default' => '',
),
'received' => array(
'received' => array(
'description' => 'The IPN receipt timestamp.',
'type' => 'int',
'unsigned' => TRUE,

View File

@@ -485,7 +485,7 @@ function uc_cybersource_hop_form($form, $form_state, $order) {
$data['orderPage_sendMerchantReceiptEmail'] = variable_get('uc_cybersource_hop_merchant_receipt_email', 'true');
$data['orderPage_sendMerchantURLPost'] = 'true';
// CyberSource posts payment confirmation to this URL.
$data['orderPage_merchantURLPostAddress']= url('cybersource/hop-post', array('absolute' => TRUE));
$data['orderPage_merchantURLPostAddress'] = url('cybersource/hop-post', array('absolute' => TRUE));
$data['orderPage_buyButtonText'] = t('Checkout');
$receipt_url = url('cybersource/hop-complete/' . $order->order_id, array('absolute' => TRUE));
$data['orderPage_receiptResponseURL'] = $receipt_url;

View File

@@ -16,7 +16,7 @@ class CyberSourceSoapClient extends SoapClient {
/**
* Inserts the UsernameToken information in the outgoing request.
*/
function __doRequest($request, $location, $action, $version) {
function __doRequest($request, $location, $action, $version, $one_way = 0) {
$login = _uc_cybersource_soap_login_data();
$soapHeader = '<SOAP-ENV:Header xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Security SOAP-ENV:mustUnderstand="1"><wsse:UsernameToken><wsse:Username>' . $login['merchant_id'] . '</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">' . $login['transaction_key'] . '</wsse:Password></wsse:UsernameToken></wsse:Security></SOAP-ENV:Header>';
@@ -35,7 +35,7 @@ class CyberSourceSoapClient extends SoapClient {
die('Error adding UsernameToken: ' . $e->code);
}
return parent::__doRequest($request, $location, $action, $version);
return parent::__doRequest($request, $location, $action, $version, $one_way);
}
}

View File

@@ -6,8 +6,8 @@ dependencies[] = uc_quote
package = Ubercart - payment
core = 7.x
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -1,6 +1,6 @@
/**
* @file
* Styles for uc_payment module.
* RTL Styles for uc_payment module.
*/
.payment-details-cod .form-item {

View File

@@ -10,8 +10,8 @@ files[] = tests/uc_payment.test
configure = admin/store/settings/payment
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -5,8 +5,8 @@ dependencies[] = uc_payment
package = Ubercart - payment
core = 7.x
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"

View File

@@ -113,12 +113,12 @@ function uc_payment_method_cod($op, &$order, $form = NULL, $form_state = NULL) {
switch ($op) {
case 'cart-details':
$build['policy'] = array(
'#markup' => '<p>' . variable_get('uc_cod_policy', t('Full payment is expected upon delivery or prior to pick-up.')) . '</p>'
'#markup' => '<p>' . variable_get('uc_cod_policy', t('Full payment is expected upon delivery or prior to pick-up.')) . '</p>',
);
if (($max = variable_get('uc_cod_max_order', 0)) > 0 && is_numeric($max)) {
$build['eligibility'] = array(
'#markup' => '<p>' . t('Orders totalling more than !number are <b>not eligible</b> for COD.', array('!number' => uc_currency_format($max))) . '</p>'
'#markup' => '<p>' . t('Orders totalling more than !number are <b>not eligible</b> for COD.', array('!number' => uc_currency_format($max))) . '</p>',
);
}
@@ -186,7 +186,7 @@ function uc_payment_method_cod($op, &$order, $form = NULL, $form_state = NULL) {
$order->order_total > $max) {
$result[] = array(
'pass' => FALSE,
'message' => t('Your final order total exceeds the maximum for COD payment. Please go back and select a different method of payment.')
'message' => t('Your final order total exceeds the maximum for COD payment. Please go back and select a different method of payment.'),
);
$_SESSION['expanded_panes'][] = 'payment';
return $result;
@@ -264,7 +264,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
switch ($op) {
case 'cart-details':
$build['instructions'] = array(
'#markup' => t('Checks should be made out to:')
'#markup' => t('Checks should be made out to:'),
);
if (!variable_get('uc_check_mailing_street1', FALSE)) {
@@ -303,7 +303,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
}
$build['policy'] = array(
'#markup' => '<p>' . variable_get('uc_check_policy', '') . '</p>'
'#markup' => '<p>' . variable_get('uc_check_policy', '') . '</p>',
);
return $build;
@@ -321,7 +321,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
variable_get('uc_store_zone', ''),
variable_get('uc_store_postal_code', ''),
variable_get('uc_store_country', 840)
)
),
);
}
else {
@@ -337,7 +337,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
variable_get('uc_check_mailing_zone', ''),
variable_get('uc_check_mailing_postal_code', ''),
variable_get('uc_check_mailing_country', 840)
)
),
);
}
return $review;

View File

@@ -4,8 +4,8 @@ dependencies[] = uc_payment
package = Ubercart - payment
core = 7.x
; Information added by Drupal.org packaging script on 2019-03-06
version = "7.x-3.12"
; Information added by Drupal.org packaging script on 2019-10-01
version = "7.x-3.13"
core = "7.x"
project = "ubercart"
datestamp = "1551862392"
datestamp = "1569942207"