updated ubercart contrib module
This commit is contained in:
parent
26fadc74e4
commit
4e780cb6d4
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for uc_payment module.
|
||||
* RTL Styles for uc_payment module.
|
||||
*/
|
||||
|
||||
.payment-details-cod .form-item {
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -6,8 +6,8 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/methods
|
||||
|
||||
; 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"
|
||||
|
||||
@ -101,11 +101,11 @@ function uc_flatrate_node_update($node) {
|
||||
foreach ($node->flatrate as $mid => $rate) {
|
||||
if (is_numeric($rate) && $rate >= 0) {
|
||||
$query->values(array(
|
||||
'vid' => $node->vid,
|
||||
'nid' => $node->nid,
|
||||
'mid' => $mid,
|
||||
'rate' => $rate,
|
||||
));
|
||||
'vid' => $node->vid,
|
||||
'nid' => $node->nid,
|
||||
'mid' => $mid,
|
||||
'rate' => $rate,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for shipping quote cart and checkout panes.
|
||||
* RTL Styles for shipping quote cart and checkout panes.
|
||||
*/
|
||||
|
||||
#uc-cart-pane-quotes .form-submit {
|
||||
|
||||
@ -75,7 +75,7 @@ function uc_quote_admin_settings($form, &$form_state) {
|
||||
);
|
||||
|
||||
$form['actions'] = array('#type' => 'actions');
|
||||
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
|
||||
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
|
||||
return $form;
|
||||
}
|
||||
|
||||
@ -200,7 +200,7 @@ function uc_quote_method_settings($form, &$form_state) {
|
||||
);
|
||||
|
||||
$form['actions'] = array('#type' => 'actions');
|
||||
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
|
||||
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
|
||||
|
||||
return $form;
|
||||
}
|
||||
@ -216,7 +216,7 @@ function theme_uc_quote_method_settings($variables) {
|
||||
|
||||
drupal_add_tabledrag('uc-quote-methods', 'order', 'sibling', 'uc-quote-method-weight');
|
||||
|
||||
$header = array(t('Shipping method'), t('Details'), array('data' => t('List position'), 'sort' => 'asc'), t('Operations'));
|
||||
$header = array(t('Shipping method'), t('Details'), array('data' => t('List position'), 'sort' => 'asc'), t('Operations'));
|
||||
$rows = array();
|
||||
foreach (element_children($form['methods']) as $method) {
|
||||
$row = array(
|
||||
|
||||
@ -9,8 +9,8 @@ configure = admin/store/settings/quotes
|
||||
; Test cases
|
||||
files[] = tests/uc_quote.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"
|
||||
|
||||
@ -562,7 +562,7 @@ function uc_checkout_pane_quotes($op, &$order, $form = NULL, &$form_state = NULL
|
||||
|
||||
$form_state['uc_ajax']['uc_quote']['panes][quotes][quote_button'] = array(
|
||||
'payment-pane' => 'uc_ajax_replace_checkout_pane',
|
||||
'quotes-pane' => 'uc_ajax_replace_checkout_pane'
|
||||
'quotes-pane' => 'uc_ajax_replace_checkout_pane',
|
||||
);
|
||||
$form_state['uc_ajax']['uc_quote']['panes][quotes][quotes][quote_option'] = array(
|
||||
'payment-pane' => 'uc_ajax_replace_checkout_pane',
|
||||
@ -768,7 +768,7 @@ function uc_quote_apply_quote_to_order($form, &$form_state) {
|
||||
);
|
||||
}
|
||||
|
||||
// Save selected shipping
|
||||
// Save selected shipping.
|
||||
uc_quote_uc_order('save', $order, '');
|
||||
|
||||
// Update line items.
|
||||
@ -902,8 +902,8 @@ function uc_quote_replace_order_quotes($form, $form_state) {
|
||||
}
|
||||
|
||||
/**
|
||||
* AJAX callback for applying shipping rates.
|
||||
*/
|
||||
* AJAX callback for applying shipping rates.
|
||||
*/
|
||||
function uc_quote_order_update_rates($form, $form_state) {
|
||||
// Update shipping line item.
|
||||
if (isset($form_state['uc_quote'])) {
|
||||
|
||||
@ -22,7 +22,7 @@ function uc_quote_assemble_quotes($order) {
|
||||
|
||||
$shipping_types = array();
|
||||
foreach ($products as $product) {
|
||||
$shipping_types[] = uc_product_get_shipping_type($product);
|
||||
$shipping_types[] = uc_product_get_shipping_type($product);
|
||||
}
|
||||
|
||||
$shipping_types = array_unique($shipping_types);
|
||||
@ -83,7 +83,7 @@ function uc_quote_action_get_quote($order, $method) {
|
||||
}
|
||||
}
|
||||
ob_start();
|
||||
// Load include file containing quote callback, if there is one
|
||||
// Load include file containing quote callback, if there is one.
|
||||
if (isset($method['quote']['file'])) {
|
||||
$inc_file = drupal_get_path('module', $method['module']) . '/' . $method['quote']['file'];
|
||||
if (is_file($inc_file)) {
|
||||
|
||||
@ -8,8 +8,8 @@ core = 7.x
|
||||
files[] = views/uc_shipping_handler_field_shipment_id.inc
|
||||
files[] = views/uc_shipping_handler_field_package_weight.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"
|
||||
|
||||
@ -228,7 +228,7 @@ function uc_shipping_schema() {
|
||||
),
|
||||
'indexes' => array(
|
||||
'order_id' => array('order_id'),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
$schema['uc_packages'] = array(
|
||||
|
||||
@ -457,10 +457,10 @@ function uc_shipping_package_save($package) {
|
||||
|
||||
foreach ($package->products as $id => $product) {
|
||||
$insert->values(array(
|
||||
'package_id' => $package->package_id,
|
||||
'order_product_id' => $id,
|
||||
'qty' => $product->qty,
|
||||
));
|
||||
'package_id' => $package->package_id,
|
||||
'order_product_id' => $id,
|
||||
'qty' => $product->qty,
|
||||
));
|
||||
|
||||
$result = db_query("SELECT data FROM {uc_order_products} WHERE order_product_id = :id", array(':id' => $id));
|
||||
if ($order_product = $result->fetchObject()) {
|
||||
|
||||
@ -6,8 +6,8 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/settings/ups
|
||||
|
||||
; 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"
|
||||
|
||||
@ -6,8 +6,8 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/settings/usps
|
||||
|
||||
; 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"
|
||||
|
||||
@ -6,8 +6,8 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/methods
|
||||
|
||||
; 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"
|
||||
|
||||
@ -103,11 +103,11 @@ function uc_weightquote_node_update($node) {
|
||||
foreach ($node->weightquote as $mid => $rate) {
|
||||
if (is_numeric($rate) && $rate >= 0) {
|
||||
$query->values(array(
|
||||
'vid' => $node->vid,
|
||||
'nid' => $node->nid,
|
||||
'mid' => $mid,
|
||||
'rate' => $rate,
|
||||
));
|
||||
'vid' => $node->vid,
|
||||
'nid' => $node->nid,
|
||||
'mid' => $mid,
|
||||
'rate' => $rate,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@ -222,7 +222,7 @@ function uc_weightquote_quote($products, $details, $method) {
|
||||
// Add the product-specific rate.
|
||||
$product_rate = $product->weightquote[$mid] * $product->qty;
|
||||
}
|
||||
$rate += $product_rate * $product->weight * uc_weight_conversion($product->weight_units, variable_get('uc_weight_unit', 'lb'));
|
||||
$rate += $product_rate * $product->weight * uc_weight_conversion($product->weight_units, variable_get('uc_weight_unit', 'lb'));
|
||||
}
|
||||
|
||||
$quotes[] = array(
|
||||
|
||||
@ -4,8 +4,8 @@ dependencies[] = uc_cart
|
||||
package = Ubercart - extra
|
||||
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"
|
||||
|
||||
@ -316,7 +316,7 @@ class UbercartAttributeTestCase extends UbercartTestHelper {
|
||||
$edit = (array) self::createAttribute(array(), FALSE);
|
||||
|
||||
$this->drupalPost('admin/store/products/attributes/add', $edit, t('Submit'));
|
||||
if ($edit['display'] !=0) {
|
||||
if ($edit['display'] != 0) {
|
||||
// We redirect to add options page ONLY for non-textfield attributes.
|
||||
$this->assertText('Options for ' . $edit['name']);
|
||||
$this->assertText('No options for this attribute have been added yet.');
|
||||
@ -650,7 +650,7 @@ class UbercartAttributeTestCase extends UbercartTestHelper {
|
||||
$this->clickLink('Add an attribute');
|
||||
$this->assertText($attribute->name);
|
||||
|
||||
$this->drupalPost(NULL, array('add_attributes[' . $attribute->aid. ']' => 1), t('Add attributes'));
|
||||
$this->drupalPost(NULL, array('add_attributes[' . $attribute->aid . ']' => 1), t('Add attributes'));
|
||||
$this->assertText('1 attribute has been added.');
|
||||
$this->assertText($attribute->name, 'Attribute name found');
|
||||
$this->assertFieldByName('attributes[' . $attribute->aid . '][label]', $attribute->label, 'Attribute label found');
|
||||
@ -662,7 +662,7 @@ class UbercartAttributeTestCase extends UbercartTestHelper {
|
||||
$this->assertNoText($attribute->name);
|
||||
$this->assertText('No attributes left to add.');
|
||||
|
||||
$edit = array('attributes[' . $attribute->aid. '][remove]' => 1);
|
||||
$edit = array('attributes[' . $attribute->aid . '][remove]' => 1);
|
||||
$this->drupalPost('node/' . $product->nid . '/edit/attributes', $edit, t('Save changes'));
|
||||
$this->assertText('You must first add attributes to this product.');
|
||||
}
|
||||
|
||||
@ -8,8 +8,8 @@ core = 7.x
|
||||
files[] = tests/uc_attribute.test
|
||||
files[] = tests/uc_attribute_checkout.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"
|
||||
|
||||
@ -3,8 +3,8 @@ core = 7.x
|
||||
dependencies[] = uc_cart
|
||||
hidden = TRUE
|
||||
|
||||
; 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"
|
||||
|
||||
@ -16,8 +16,8 @@ files[] = uc_cart.controller.inc
|
||||
|
||||
configure = admin/store/settings/cart
|
||||
|
||||
; 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"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for the uc_cart module cart block.
|
||||
* RTL Styles for the uc_cart module cart block.
|
||||
*/
|
||||
|
||||
.cart-block-icon-full,
|
||||
|
||||
@ -63,13 +63,13 @@ function uc_cart_links_settings_form_validate($form, &$form_state) {
|
||||
foreach ($data as $message) {
|
||||
// Ignore blank lines.
|
||||
if (preg_match('/^\s*$/', $message)) {
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
// Check for properly formattted messages.
|
||||
// Each line must be one or more numeric characters for the key followed
|
||||
// by "|" followed by one or more characters for the value. Both the key
|
||||
// and the value may have leading and/or trailing whitespace.
|
||||
else if (!preg_match('/^\s*[1-9][0-9]*\s*\|\s*\S+.*$/', $message)) {
|
||||
elseif (!preg_match('/^\s*[1-9][0-9]*\s*\|\s*\S+.*$/', $message)) {
|
||||
form_set_error('uc_cart_links_messages', t('Invalid Cart Links message "%message". Messages must be a numeric key followed by "|" followed by a value.', array('%message' => $message)));
|
||||
break;
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@ files[] = tests/uc_cart_links.test
|
||||
|
||||
configure = admin/store/settings/cart-links
|
||||
|
||||
; 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"
|
||||
|
||||
@ -15,8 +15,8 @@ files[] = tests/uc_catalog.test
|
||||
|
||||
configure = admin/store/settings/catalog
|
||||
|
||||
; 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"
|
||||
|
||||
@ -22,10 +22,10 @@ define('UC_FILE_FORM_ACTION', 1 );
|
||||
function uc_file_admin_files_form($form, &$form_state) {
|
||||
|
||||
if (isset($form_state['storage']['step']) && $form_state['storage']['step'] == UC_FILE_FORM_ACTION) {
|
||||
return array(
|
||||
'#validate' => array('uc_file_admin_files_form_action_validate'),
|
||||
'#submit' => array('uc_file_admin_files_form_action_submit'),
|
||||
) + $form + uc_file_admin_files_form_action($form, $form_state);
|
||||
return array(
|
||||
'#validate' => array('uc_file_admin_files_form_action_validate'),
|
||||
'#submit' => array('uc_file_admin_files_form_action_submit'),
|
||||
) + $form + uc_file_admin_files_form_action($form, $form_state);
|
||||
}
|
||||
else {
|
||||
// Refresh our file list before display.
|
||||
@ -283,15 +283,31 @@ function uc_file_admin_files_form_action($form, &$form_state) {
|
||||
break;
|
||||
|
||||
case 'uc_file_upload':
|
||||
// Calculate the max size of uploaded files, in bytes.
|
||||
$max_bytes = trim(ini_get('post_max_size'));
|
||||
switch (strtolower($max_bytes{strlen($max_bytes) - 1})) {
|
||||
case 'g':
|
||||
$max_bytes *= 1024;
|
||||
case 'm':
|
||||
$max_bytes *= 1024;
|
||||
case 'k':
|
||||
$max_bytes *= 1024;
|
||||
// Calculate the maximum size of uploaded files in bytes.
|
||||
$post_max_size = ini_get('post_max_size');
|
||||
if (is_numeric($post_max_size)) {
|
||||
// Handle the case where 'post_max_size' has no suffix.
|
||||
// An explicit cast is needed because floats are not allowed.
|
||||
$max_bytes = (int) $post_max_size;
|
||||
}
|
||||
else {
|
||||
// Handle the case where 'post_max_size' has a suffix of
|
||||
// 'M', 'K', or 'G' (case insensitive).
|
||||
$max_bytes = (int) substr($post_max_size, 0, -1);
|
||||
$suffix = strtolower(substr($post_max_size, -1));
|
||||
switch ($suffix) {
|
||||
case 'k':
|
||||
$max_bytes *= 1024;
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
$max_bytes *= 1048576;
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
$max_bytes *= 1073741824;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Gather list of directories under the selected one(s).
|
||||
@ -313,7 +329,9 @@ function uc_file_admin_files_form_action($form, &$form_state) {
|
||||
$form['upload'] = array(
|
||||
'#type' => 'file',
|
||||
'#title' => t('File'),
|
||||
'#description' => t('The maximum file size that can be uploaded is %size bytes. You will need to use a different method to upload the file to the directory (e.g. (S)FTP, SCP) if your file exceeds this size. Files you upload using one of these alternate methods will be automatically detected.', array('%size' => number_format($max_bytes))),
|
||||
// Deliberately concatenate the strings to preserve backwards
|
||||
// compatibility with existing translations.
|
||||
'#description' => t('The maximum file size that can be uploaded is %size bytes. You will need to use a different method to upload the file to the directory (e.g. (S)FTP, SCP) if your file exceeds this size. Files you upload using one of these alternate methods will be automatically detected.', array('%size' => number_format($max_bytes))) . ' ' . t("Note: A value of '0' means there is no size limit."),
|
||||
);
|
||||
|
||||
$form['#attributes']['class'][] = 'foo';
|
||||
@ -375,7 +393,6 @@ function uc_file_admin_files_form_action_validate($form, &$form_state) {
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
// This action isn't handled by us, so check if any
|
||||
// hook_uc_file_action('validate', $args) are implemented.
|
||||
foreach (module_implements('uc_file_action') as $module) {
|
||||
|
||||
@ -11,8 +11,8 @@ files[] = tests/uc_file.test
|
||||
stylesheets[all][] = uc_file.css
|
||||
scripts[] = uc_file.js
|
||||
|
||||
; 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"
|
||||
|
||||
@ -7,8 +7,8 @@ dependencies[] = uc_store
|
||||
package = Ubercart - extra
|
||||
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"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for uc_order module.
|
||||
* RTL Styles for uc_order module.
|
||||
*/
|
||||
|
||||
.view-uc-orders #edit-delivery-first-name-wrapper,
|
||||
|
||||
@ -39,8 +39,8 @@ files[] = uc_order.info.inc
|
||||
configure = admin/store/settings/orders
|
||||
stylesheets[all][] = uc_order.css
|
||||
|
||||
; 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"
|
||||
|
||||
@ -1481,6 +1481,7 @@ function uc_order_load_line_items_display($order) {
|
||||
}
|
||||
}
|
||||
foreach ($line_items as &$item) {
|
||||
$item['title'] = check_plain($item['title']);
|
||||
$item['formatted_amount'] = uc_currency_format($item['amount']);
|
||||
}
|
||||
|
||||
@ -1776,6 +1777,8 @@ function template_preprocess_uc_order(&$variables) {
|
||||
$variables['products'] = $order->products;
|
||||
$display = uc_order_product_view_multiple($order->products);
|
||||
foreach ($variables['products'] as &$product) {
|
||||
$product->title = check_plain($product->title);
|
||||
$product->model = check_plain($product->model);
|
||||
$product->total_price = render($display['uc_order_product'][$product->order_product_id]['total']);
|
||||
if ($product->qty > 1) {
|
||||
$product->individual_price = t('(!price each)', array('!price' => uc_currency_format($display['uc_order_product'][$product->order_product_id]['price']['#price'])));
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for uc_product module.
|
||||
* RTL Styles for uc_product module.
|
||||
*/
|
||||
|
||||
.product-image {
|
||||
|
||||
@ -20,8 +20,8 @@ files[] = views/uc_product_handler_filter_product.inc
|
||||
configure = admin/store/settings/products
|
||||
stylesheets[all][] = uc_product.css
|
||||
|
||||
; 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"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for uc_product_kit module.
|
||||
* RTL Styles for uc_product_kit module.
|
||||
*/
|
||||
|
||||
#block-cart-contents .kit-component-cart-desc ul.product-description {
|
||||
|
||||
@ -10,8 +10,8 @@ files[] = tests/uc_product_kit.test
|
||||
files[] = views/uc_product_kit_handler_filter_product_kit.inc
|
||||
files[] = views/uc_product_kit_handler_filter_product_kit_item.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"
|
||||
|
||||
@ -7,8 +7,8 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/store
|
||||
|
||||
; 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"
|
||||
|
||||
@ -11,8 +11,8 @@ files[] = tests/uc_roles.test
|
||||
; Views handlers
|
||||
files[] = views/uc_roles_handler_field_rid.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"
|
||||
|
||||
@ -12,8 +12,8 @@ files[] = views/uc_stock_handler_filter_below_threshold.inc
|
||||
|
||||
configure = admin/store/settings/stock
|
||||
|
||||
; 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"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for uc_store module.
|
||||
* RTL Styles for uc_store module.
|
||||
*/
|
||||
|
||||
.uc-inline-form .form-item {
|
||||
|
||||
@ -16,8 +16,8 @@ files[] = tests/uc_ajax.test
|
||||
configure = admin/store/settings/store
|
||||
stylesheets[all][] = uc_store.css
|
||||
|
||||
; 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"
|
||||
|
||||
@ -5,8 +5,8 @@ dependencies[] = uc_taxes
|
||||
package = Ubercart - core (optional)
|
||||
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"
|
||||
|
||||
@ -11,8 +11,8 @@ files[] = tests/uc_taxes.test
|
||||
|
||||
configure = admin/store/settings/taxes
|
||||
|
||||
; 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"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user