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

security updates

Browse Source 
have to check views and entityreference for custom patches
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-19 20:45:16 +02:00
parent 802ec0c6f3
commit b3221c71e2
516 changed files with 14267 additions and 7349 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,9 +6,9 @@ core = 7.x
configure = admin/store/settings/quotes/methods
; Information added by Drupal.org packaging script on 2013-12-17
version = "7.x-3.6"
; Information added by Drupal.org packaging script on 2014-10-22
version = "7.x-3.8"
core = "7.x"
project = "ubercart"
datestamp = "1387304010"
datestamp = "1413965350"

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

@@ -9,9 +9,9 @@ configure = admin/store/settings/quotes
; Test cases
files[] = tests/uc_quote.test
; Information added by Drupal.org packaging script on 2013-12-17
version = "7.x-3.6"
; Information added by Drupal.org packaging script on 2014-10-22
version = "7.x-3.8"
core = "7.x"
project = "ubercart"
datestamp = "1387304010"
datestamp = "1413965350"

1
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.install
View File

@@ -162,6 +162,7 @@ function uc_quote_schema() {
'default' => 0,
),
),
'primary key' => array('order_id'),
'unique keys' => array(
'order_id_quote_method' => array('order_id', 'method'),
),

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

@@ -563,6 +563,11 @@ function uc_checkout_pane_quotes($op, &$order, $form = NULL, &$form_state = NULL
'#weight' => 1,
);
// If this was an Ajax request, we reinvoke the 'prepare' op to ensure
// that we catch any changes in panes heavier than this one.
if (isset($form_state['triggering_element'])) {
uc_checkout_pane_quotes('prepare', $order, $form, $form_state);
}
$contents['quotes'] += $order->quote_form;
$form_state['uc_ajax']['uc_quote']['panes][quotes][quote_button'] = array(

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

@@ -8,9 +8,9 @@ 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 2013-12-17
version = "7.x-3.6"
; Information added by Drupal.org packaging script on 2014-10-22
version = "7.x-3.8"
core = "7.x"
project = "ubercart"
datestamp = "1387304010"
datestamp = "1413965350"

22
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.rules.inc
View File

@@ -20,7 +20,7 @@ function uc_shipping_rules_data_info() {
'type' => 'integer',
'label' => t('Shipment ID'),
),
'order-id' => array(
'order_id' => array(
'type' => 'integer',
'label' => t('Order ID'),
),
@@ -42,7 +42,7 @@ function uc_shipping_rules_data_info() {
'setter permission' => 'fulfill orders',
'property info' => $address_info,
),
'shipping-method' => array(
'shipping_method' => array(
'type' => 'text',
'label' => t('Shipping method'),
'description' => t('The transportation method used to ship.'),
@@ -57,22 +57,22 @@ function uc_shipping_rules_data_info() {
'label' => t('Carrier'),
'description' > t('The company making the delivery.'),
),
'transaction-id' => array(
'transaction_id' => array(
'type' => 'text',
'label' => t('Transaction ID'),
'description' => t("The carrier's shipment identifier."),
),
'tracking-number' => array(
'tracking_number' => array(
'type' => 'text',
'label' => t('Tracking number'),
'description' => t('The number used by the carrier to locate the shipment while it is in transit.'),
),
'ship-date' => array(
'ship_date' => array(
'type' => 'date',
'label' => t('Ship date'),
'description' => t('The time the shipment was sent out.'),
),
'expected-delivery' => array(
'expected_delivery' => array(
'type' => 'date',
'label' => t('Expected delivery'),
'description' => t('The time the shipment is expected to be delivered'),
@@ -87,16 +87,16 @@ function uc_shipping_rules_data_info() {
'label' => t('Packages'),
'description' => t('The physical items being shipped.'),
'property info' => array(
'package-id' => array(
'package_id' => array(
'type' => 'integer',
'label' => t('Package ID'),
),
'shipping-type' => array(
'shipping_type' => array(
'type' => 'text',
'label' => t('Shipping type'),
'description' => t('The basic type of shipment, e.g.: small package, freight, etc.'),
),
'pkg-type' => array(
'pkg_type' => array(
'type' => 'text',
'label' => t('Package type'),
'description' => t('The type of packaging.'),
@@ -121,7 +121,7 @@ function uc_shipping_rules_data_info() {
'label' => t('Value'),
'description' => t('The monetary value of the package contents.'),
),
'tracking-number' => array(
'tracking_number' => array(
'type' => 'text',
'label' => t('Tracking number'),
'description' => t('The number used by the carrier to locate the shipment while it is in transit.'),
@@ -141,7 +141,7 @@ function uc_shipping_rules_data_info() {
'label' => t('Products'),
'description' => t('The package contents.'),
),
'label-image' => array(
'label_image' => array(
'type' => 'file',
'label' => t('Label image'),
'description' => t('An image of the shipping label.'),

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

@@ -6,9 +6,9 @@ core = 7.x
configure = admin/store/settings/quotes/settings/ups
; Information added by Drupal.org packaging script on 2013-12-17
version = "7.x-3.6"
; Information added by Drupal.org packaging script on 2014-10-22
version = "7.x-3.8"
core = "7.x"
project = "ubercart"
datestamp = "1387304010"
datestamp = "1413965350"

1
sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_usps/uc_usps.countries.inc
View File

@@ -59,7 +59,6 @@ function uc_usps_country_map($code = NULL) {
654 => 'Saint Helena',
534 => 'Saint Maarten (Dutch) (Netherlands Antilles)',
663 => 'Saint Martin (French) (Guadeloupe)',
688 => 'Serbia-Montenegro',
703 => 'Slovak Republic',
158 => 'Taiwan',
834 => 'Tanzania',

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

@@ -6,9 +6,9 @@ core = 7.x
configure = admin/store/settings/quotes/settings/usps
; Information added by Drupal.org packaging script on 2013-12-17
version = "7.x-3.6"
; Information added by Drupal.org packaging script on 2014-10-22
version = "7.x-3.8"
core = "7.x"
project = "ubercart"
datestamp = "1387304010"
datestamp = "1413965350"

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

@@ -6,9 +6,9 @@ core = 7.x
configure = admin/store/settings/quotes/methods
; Information added by Drupal.org packaging script on 2013-12-17
version = "7.x-3.6"
; Information added by Drupal.org packaging script on 2014-10-22
version = "7.x-3.8"
core = "7.x"
project = "ubercart"
datestamp = "1387304010"
datestamp = "1413965350"

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

@@ -215,7 +215,7 @@ function uc_weightquote_quote($products, $details, $method) {
$rate = $method->base_rate;
foreach ($products as $product) {
if (empty($product->weightquote) || is_null($product->weightquote[$mid])) {
if (!isset($product->weightquote[$mid])) {
// Add the method's default product rate.
$product_rate = $method->product_rate * $product->qty;
}