updated ubercart, faq
This commit is contained in:
Bachir Soussi Chiadmi
@@ -6,9 +6,9 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/methods
|
||||
|
||||
; Information added by Drupal.org packaging script on 2014-10-22
|
||||
version = "7.x-3.8"
|
||||
; Information added by Drupal.org packaging script on 2016-07-16
|
||||
version = "7.x-3.10"
|
||||
core = "7.x"
|
||||
project = "ubercart"
|
||||
datestamp = "1413965350"
|
||||
datestamp = "1468644909"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ class UbercartQuoteTestCase extends UbercartTestHelper {
|
||||
/**
|
||||
* Overrides DrupalWebTestCase::setUp().
|
||||
*/
|
||||
function setUp() {
|
||||
protected function setUp($modules = array(), $permissions = array()) {
|
||||
$modules = array('rules_admin', 'uc_payment', 'uc_payment_pack', 'uc_quote', 'uc_flatrate');
|
||||
$permissions = array('administer rules', 'bypass rules access');
|
||||
parent::setUp($modules, $permissions);
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
/**
|
||||
* @file
|
||||
* Styles for shipping quote cart and checkout panes.
|
||||
*/
|
||||
|
||||
#uc-cart-pane-quotes .form-submit {
|
||||
margin-left: auto;
|
||||
margin-right: 16em;
|
||||
}
|
||||
|
||||
.quote-notes {
|
||||
margin-left: auto;
|
||||
margin-right: 25px;
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
}
|
||||
|
||||
#uc-cart-pane-quotes .form-submit {
|
||||
margin-left: 16em;
|
||||
margin-left: 16em; /* LTR */
|
||||
}
|
||||
|
||||
#quote {
|
||||
@@ -36,7 +36,7 @@
|
||||
}
|
||||
|
||||
.quote-notes {
|
||||
margin-left: 25px;
|
||||
margin-left: 25px; /* LTR */
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -9,9 +9,9 @@ configure = admin/store/settings/quotes
|
||||
; Test cases
|
||||
files[] = tests/uc_quote.test
|
||||
|
||||
; Information added by Drupal.org packaging script on 2014-10-22
|
||||
version = "7.x-3.8"
|
||||
; Information added by Drupal.org packaging script on 2016-07-16
|
||||
version = "7.x-3.10"
|
||||
core = "7.x"
|
||||
project = "ubercart"
|
||||
datestamp = "1413965350"
|
||||
datestamp = "1468644909"
|
||||
|
||||
|
||||
@@ -58,15 +58,6 @@ function uc_quote_menu() {
|
||||
return $items;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_init().
|
||||
*/
|
||||
function uc_quote_init() {
|
||||
global $conf;
|
||||
$conf['i18n_variables'][] = 'uc_quote_err_msg';
|
||||
$conf['i18n_variables'][] = 'uc_quote_pane_description';
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_theme().
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Variable module hook implementations.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* Implements hook_variable_group_info().
|
||||
*/
|
||||
function uc_quote_variable_group_info() {
|
||||
$groups['uc_quote'] = array(
|
||||
'title' => t('Ubercart shipping quote settings'),
|
||||
'access' => 'administer store',
|
||||
'path' => array('admin/store/settings/quotes'),
|
||||
);
|
||||
return $groups;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_variable_info().
|
||||
*/
|
||||
function uc_quote_variable_info($options) {
|
||||
$variables['uc_quote_err_msg'] = array(
|
||||
'type' => 'text',
|
||||
'title' => t('Shipping quote error message', array(), $options),
|
||||
'description' => t('The error message shown to a user when a problem is encountered while generating a shipping quote.', array(), $options),
|
||||
'group' => 'uc_quote',
|
||||
'default' => t("There were problems getting a shipping quote. Please verify the delivery and product information and try again.\nIf this does not resolve the issue, please call in to complete your order.", array(), $options),
|
||||
);
|
||||
$variables['uc_quote_pane_description'] = array(
|
||||
'type' => 'text',
|
||||
'title' => t('Shipping quote pane description', array(), $options),
|
||||
'description' => t('Message to indicate to users that a shipping quote can be updated automatically on address change, or manually by pressing a button.', array(), $options),
|
||||
'group' => 'uc_quote',
|
||||
'default' => t('Shipping quotes are generated automatically when you enter your address and may be updated manually with the button below.', array(), $options),
|
||||
);
|
||||
return $variables;
|
||||
}
|
||||
@@ -1096,7 +1096,7 @@ function theme_uc_shipping_shipment_print($variables) {
|
||||
file_exists($package->label_image->uri)) {
|
||||
// TODO: Find a way to store these magic numbers specifically for UPS.
|
||||
list($width, $height) = array(672, 392);
|
||||
$output .= '<br class="page-break" />' . "\n";;
|
||||
$output .= '<br class="page-break" />' . "\n";
|
||||
$output .= theme('image', array(
|
||||
'path' => $package->label_image->uri,
|
||||
'attributes' => array('width' => $width, 'height' => $height),
|
||||
|
||||
@@ -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 2014-10-22
|
||||
version = "7.x-3.8"
|
||||
; Information added by Drupal.org packaging script on 2016-07-16
|
||||
version = "7.x-3.10"
|
||||
core = "7.x"
|
||||
project = "ubercart"
|
||||
datestamp = "1413965350"
|
||||
datestamp = "1468644909"
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/settings/ups
|
||||
|
||||
; Information added by Drupal.org packaging script on 2014-10-22
|
||||
version = "7.x-3.8"
|
||||
; Information added by Drupal.org packaging script on 2016-07-16
|
||||
version = "7.x-3.10"
|
||||
core = "7.x"
|
||||
project = "ubercart"
|
||||
datestamp = "1413965350"
|
||||
datestamp = "1468644909"
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ function uc_usps_admin_settings($form, &$form_state) {
|
||||
'#type' => 'checkbox',
|
||||
'#title' => t('Display USPS "online" rates'),
|
||||
'#default_value' => variable_get('uc_usps_online_rates', FALSE),
|
||||
'#description' => t('Show your customer standard USPS rates (default) or discounted "online" rates. Online rates apply only if you, the merchant, pay for and print out postage from the USPS <a href="https://sss-web.usps.com/cns/landing.do">Click-N-Ship</a> web site.'),
|
||||
'#description' => t('Show your customer standard USPS rates (default) or discounted "online" rates. Online rates apply only if you, the merchant, pay for and print out postage from the USPS <a href="https://cns.usps.com/labelInformation.shtml">Click-N-Ship</a> web site.'),
|
||||
);
|
||||
|
||||
$form['domestic']['uc_usps_env_services'] = array(
|
||||
|
||||
@@ -6,9 +6,9 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/settings/usps
|
||||
|
||||
; Information added by Drupal.org packaging script on 2014-10-22
|
||||
version = "7.x-3.8"
|
||||
; Information added by Drupal.org packaging script on 2016-07-16
|
||||
version = "7.x-3.10"
|
||||
core = "7.x"
|
||||
project = "ubercart"
|
||||
datestamp = "1413965350"
|
||||
datestamp = "1468644909"
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@ core = 7.x
|
||||
|
||||
configure = admin/store/settings/quotes/methods
|
||||
|
||||
; Information added by Drupal.org packaging script on 2014-10-22
|
||||
version = "7.x-3.8"
|
||||
; Information added by Drupal.org packaging script on 2016-07-16
|
||||
version = "7.x-3.10"
|
||||
core = "7.x"
|
||||
project = "ubercart"
|
||||
datestamp = "1413965350"
|
||||
datestamp = "1468644909"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user