bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated ubercart contrib module

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2019-10-14 10:35:12 +02:00
parent 26fadc74e4
commit 4e780cb6d4
55 changed files with 181 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.info
View File

@@ -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"

10
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.module
View File

@@ -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,
));
}
}

2
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote-rtl.css
View File

@@ -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 {

6
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.admin.inc
View File

@@ -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(

6
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.info
View File

@@ -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"

8
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.module
View File

@@ -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'])) {

4
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.pages.inc
View File

@@ -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)) {

6
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.info
View 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"

2
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.install
View File

@@ -228,7 +228,7 @@ function uc_shipping_schema() {
),
'indexes' => array(
'order_id' => array('order_id'),
),
),
);
$schema['uc_packages'] = array(

8
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.module
View File

@@ -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
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_ups/uc_ups.info
View File

@@ -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
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_usps/uc_usps.info
View File

@@ -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
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.info
View File

@@ -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"

12
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.module
View File

@@ -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(