Permalink
Browse files

// Modules updated : Fedex, UPS, USPS

  • Loading branch information...
1 parent ff0bb2f commit 73b3fad851b642e2fc2499fde10181031bdf2ce1 @gaillafr gaillafr committed Feb 18, 2013
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -2,11 +2,11 @@
<module>
<name>fedexcarrier</name>
<displayName><![CDATA[Fedex Carrier]]></displayName>
- <version><![CDATA[1.2.6]]></version>
+ <version><![CDATA[1.2.7]]></version>
<description><![CDATA[Offer your customers, different delivery methods with Fedex]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries>us</limited_countries>
-</module>
+</module>
View
@@ -0,0 +1,43 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_c0d00fcb670ada42dad4698b865f40cd'] = 'Connect to Fedex';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_0aad1e954489f441f8824e1f990d4774'] = 'Offers your customers different delivery methods by connecting your store to Fedex\'s services';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_d999f792aee7c730cdc95f6aff4aa436'] = 'Connect to Fedex';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_99e509958c21ac35438651547a7bb035'] = 'Connect to Fedex Module Status';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_d23a9177c3c7256ede85643a19335afb'] = 'Connect to Fedex is configured and online!';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_5bc95bc43c48a735773d4182dcf526fb'] = 'Connect to Fedex is not configured yet. You must:';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_3e203b9a16f360b88d90bba6eb61ce61'] = 'Complete the \"General Settings\" form';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_f8f5a972333ee726fbe5bb52409c0ed0'] = 'Select a country';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_cf1580798f7aba85d519afadf1ffd886'] = 'Select a state';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_ce135482b30deedcc0046df41c12de79'] = 'Select a default pickup type';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_4664d1ae1832bed2246e8a6850365075'] = 'Select a default packaging type';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_c5238c5f72dee585afdf4bddf6de518e'] = 'Using the Calculation Mode \"All items in one package\" will automatically choose the default packaging size, default packaging type, and default delivery services. Specific configurations for categories or products will not be used.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_d63e135774e62574e2a1921267dad142'] = 'Choose the delivery service that will be available for customers.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_729d4f7143a3de7b0ed18de667fdf4d5'] = 'Prestashop could not connect to Fedex webservices';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_67e19ffdaa0a11e69349810403a9727e'] = 'You must configure the \"General Settings\" tab in order to use this tab.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_4f8e00c5ae41d97ab62a947b8e806d55'] = 'You have not set a specific configuration of Connect to Fedex for this category yet.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_f1c611f93510bbee05663c82f6d439e2'] = 'Are you sure you want to delete this specific Connect to Fedex configuration for this category?';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_b03dfe92d8c5b6a15d3f139998580563'] = 'Select a pickup type';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Select a packaging type';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_7fcafa7c47e984693fcb8a92c0fd1beb'] = 'Select a category';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_d725c0166e978cc30853996c70440873'] = 'You must select a category.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_ff63f917e2a947d454bce41b104cfbd2'] = 'This category already has a specific Connect to Fedex configuration.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_fd0119c2a5fc18aa64887b5b7ab41c19'] = 'An error has occurred, please try again.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_cef3da9171b7ac6d7a6e206e68a2a246'] = 'You have not set a specific configuration of Connect to Fedex for this product yet.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_ceb0ede9c02d159aa2360a3d0694d9ed'] = 'Are you sure you want to delete this specific Connect to Fedex configuration for this product?';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_3c4d710b56f4318dae775cff80619f84'] = 'Select a product';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_9c07640370e4681bf98638d0c458cd2e'] = 'You must select a product.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_8fc3abc76f5a163f81962a52fc5a3703'] = 'This product already has a specific Connect to Fedex configuration.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_9c3eacca576fbfc5dca21b50d9f6ef8f'] = 'Welcome to the PrestaShop Connect to Fedex Module configurator';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_ec0e6948e8f34818d80f27c309f46661'] = 'See below for the description of each field:';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_b12c6f84e131ed2192e9d9c6c531f239'] = 'Your Fedex Account';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_0ea2cd644fcacb9e8fe1d4c9c89a677b'] = 'You must subscribe to the Fedex website at this address';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_35ba940948fa0ea163fd01281de10e2f'] = 'This field must be the Zip/Postal code of the starting location of your package.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_81822348ace1ceabad5e9f8992ce9ea4'] = 'This field must be the country of the starting location of your package.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_74395432668d0313b593712dfc40479a'] = 'This field corresponds to the default pickup type when there is no specific configuration for the product or the category product.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_b9bba478eb4348e49e672e944b072b68'] = 'These checkboxes correspond to the delivery services that you would like to be available to customers when there is no specific configuration for the product or the category product.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_71ffd676000b4ec8ea95f4096adc3d3c'] = 'This section allows you to define a specific Connect to Fedex configuration for each product category, such as Packaging Type and Additional Charges.';
+$_MODULE['<{fedexcarrier}prestashop>fedexcarrier_89a9eabc8fc9335d484dcb1eb7ef4ac5'] = 'This section allows you to define a specific Connect to Fedex configuration for each product, such as Packaging Type and Additional Charges.';
+
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2011 PrestaShop
+* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
+* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -55,7 +55,7 @@ public function __construct()
{
$this->name = 'fedexcarrier';
$this->tab = 'shipping_logistics';
- $this->version = '1.2.6';
+ $this->version = '1.2.7';
$this->author = 'PrestaShop';
$this->limited_countries = array('us');
$this->module_key = 'e690479f7f292afefbef7e55f884527d';
@@ -340,7 +340,7 @@ public function getContent()
private function _displayForm()
{
$this->_html .= '<fieldset>
- <legend><img src="'.$this->_path.'logo.gif" alt="" /> '.$this->l('Fedex Module Status').'</legend>';
+ <legend><img src="'.$this->_path.'img/delivery.gif" alt="" /> '.$this->l('Fedex Module Status').'</legend>';
$alert = array();
$this->_webserviceTestResult = $this->webserviceTest();
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,6 +1,6 @@
<?php
/*
-* 2007-2011 PrestaShop
+* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
+* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -2,11 +2,11 @@
<module>
<name>upscarrier</name>
<displayName><![CDATA[UPS Carrier]]></displayName>
- <version><![CDATA[1.2.3]]></version>
+ <version><![CDATA[1.2.4]]></version>
<description><![CDATA[Offer your customers, different delivery methods with UPS]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries>us</limited_countries>
-</module>
+</module>
View
@@ -0,0 +1,40 @@
+<?php
+
+global $_MODULE;
+$_MODULE = array();
+$_MODULE['<{upscarrier}prestashop>upscarrier_ada23a988e5bab7c573cc51ec8a62ba2'] = 'Connect to UPS';
+$_MODULE['<{upscarrier}prestashop>upscarrier_2b0b9fe2cf477c3e8c78cc5fd59fb77e'] = 'Offers your customers different delivery methods by connecting your store to UPS\'s services';
+$_MODULE['<{upscarrier}prestashop>upscarrier_294b0cb30c16280c197e4bf3c0b90b74'] = 'Shipments originating in United States';
+$_MODULE['<{upscarrier}prestashop>upscarrier_0678819db75bb7cca9a7be0900bb0c4f'] = 'Shipments originating in Puerto Rico';
+$_MODULE['<{upscarrier}prestashop>upscarrier_4a83b0fdc908be0a47c45b4aab6faca3'] = 'Shipments originating in Canada';
+$_MODULE['<{upscarrier}prestashop>upscarrier_6d2dbe22de954fd80ed65691cf7f135b'] = 'Shipments originating in Mexico';
+$_MODULE['<{upscarrier}prestashop>upscarrier_1982bb03c0f6babc6e103a80da398c8f'] = 'Shipments originating in the European Union';
+$_MODULE['<{upscarrier}prestashop>upscarrier_dc3a853644e8937248bfdd66d7942c83'] = 'Shipments originating in other countries';
+$_MODULE['<{upscarrier}prestashop>upscarrier_ff00c491eedc4e610f8ec9d02a46cf1b'] = 'Connect to UPS Module Status';
+$_MODULE['<{upscarrier}prestashop>upscarrier_a6adb58e6abd44d96cec7996c0e38629'] = 'Connect to UPS is configured and online!';
+$_MODULE['<{upscarrier}prestashop>upscarrier_3184c79dd129c671b26afaefd7614488'] = 'Connect to UPS is not configured yet, please:';
+$_MODULE['<{upscarrier}prestashop>upscarrier_f8f5a972333ee726fbe5bb52409c0ed0'] = 'Select a country';
+$_MODULE['<{upscarrier}prestashop>upscarrier_cf1580798f7aba85d519afadf1ffd886'] = 'Select a state';
+$_MODULE['<{upscarrier}prestashop>upscarrier_9b940a1dd2cac4f70b0c7ccf1ceb899c'] = 'Select a rate service group';
+$_MODULE['<{upscarrier}prestashop>upscarrier_b03dfe92d8c5b6a15d3f139998580563'] = 'Select a pickup type';
+$_MODULE['<{upscarrier}prestashop>upscarrier_8d2ee0603dfce09b57d60db628cde269'] = 'Select a packaging type';
+$_MODULE['<{upscarrier}prestashop>upscarrier_3169c5057093f8e6c2750f1949a0900d'] = 'Using the Calculation Mode \"All items in one package\" will automatically choose the default packaging size, default packaging type, and default delivery services. Specific configurations for categories or products will not be used.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_d63e135774e62574e2a1921267dad142'] = 'Choose the delivery services that will be available for customers.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_67e19ffdaa0a11e69349810403a9727e'] = 'You must configure the \"General Settings\" tab in order to use this tab.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_4d9ed3dea8a0d40529cc1db394fb109d'] = 'You have not set a specific configuration of Connect to UPS for this category yet.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_aea9b02741653b84772a4a0dbf15cbc6'] = 'Are you sure you want to delete this specific Connect to UPS configuration for this category?';
+$_MODULE['<{upscarrier}prestashop>upscarrier_7fcafa7c47e984693fcb8a92c0fd1beb'] = 'Select a category';
+$_MODULE['<{upscarrier}prestashop>upscarrier_fd0119c2a5fc18aa64887b5b7ab41c19'] = 'An error has occurred, please try again.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_923e1dc0972e5449761b288f89844ea9'] = 'You have not set a specific configuration of Connect to UPS for this product yet.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_02ca5779558b45fdbcee2243c46a9b4f'] = 'Are you sure you want to delete this specific Connect to UPS configuration for this product?';
+$_MODULE['<{upscarrier}prestashop>upscarrier_3c4d710b56f4318dae775cff80619f84'] = 'Select a product';
+$_MODULE['<{upscarrier}prestashop>upscarrier_9c07640370e4681bf98638d0c458cd2e'] = 'You must select a product.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_1dc1a3bf2ab2094c2a0919d8526e8e3c'] = 'This product already has a specific Connect to UPS configuration.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_ad159d51a53b0d435976413a8888bb44'] = 'Welcome to the PrestaShop Connect to UPS Module configurator!';
+$_MODULE['<{upscarrier}prestashop>upscarrier_ec0e6948e8f34818d80f27c309f46661'] = 'See below for the description of each field:';
+$_MODULE['<{upscarrier}prestashop>upscarrier_35ba940948fa0ea163fd01281de10e2f'] = 'This field must be the Zip/Postal code of the starting location of your package.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_81822348ace1ceabad5e9f8992ce9ea4'] = 'This field must be the country of the starting location of your package.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_1d3fce5a25604726c1b3c726f9938858'] = 'This field corresponds to the default packaging type when there is no specific configuration for the product or the category product.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_b9bba478eb4348e49e672e944b072b68'] = 'These checkboxes correspond to the delivery services that you would like to be available to customers when there is no specific configuration for the product or the category product.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_90dc39cb4d212ee6e6e8c1ea45453019'] = 'This section allows you to define a specific Connect to UPS configuration for each product category, such as Packaging Type and Additional Charges.';
+$_MODULE['<{upscarrier}prestashop>upscarrier_2ce756272bcdd41712b4de841a3bd370'] = 'This section allows you to define a specific Connect to UPS configuration for each product, such as Packaging Type and Additional Charges.';
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -54,7 +54,7 @@ public function __construct()
{
$this->name = 'upscarrier';
$this->tab = 'shipping_logistics';
- $this->version = '1.2.3';
+ $this->version = '1.2.4';
$this->author = 'PrestaShop';
$this->limited_countries = array('us');
$this->module_key = 'b7e680a4290c977bb35e3b28817b8348';
@@ -342,7 +342,7 @@ public function getContent()
private function _displayForm()
{
$this->_html .= '<fieldset>
- <legend><img src="'.$this->_path.'logo.gif" alt="" /> '.$this->l('UPS Module Status').'</legend>';
+ <legend><img src="'.$this->_path.'img/delivery.gif" alt="" /> '.$this->l('UPS Module Status').'</legend>';
$alert = array();
if (!Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP'))
@@ -1541,7 +1541,6 @@ public function getWebserviceShippingCost($wsParams)
}
}
-
// If webservice return a cost, we add it, else, we return the original shipping cost
$result = $this->getUpsShippingCost($wsParams);
if ($result['connect'] && $result['cost'] > 0)
@@ -1612,13 +1611,10 @@ public function getOrderShippingCostExternal($params)
return $this->getOrderShippingCost($params, 23);
}
-
-
/*
** Webservices Methods
**
*/
-
public function parseXML($valTab)
{
$level = 0;
@@ -1750,7 +1746,6 @@ public function sendRequest($wsParams)
$errno = $errstr = $result = '';
$xml = $this->getXml($wsParams);
-
// Make the request
$opts = array(
'http'=>array(
@@ -1765,7 +1760,6 @@ public function sendRequest($wsParams)
if (!$result)
$this->_webserviceError = $this->l('Could not connect to UPS.com');
-
// Get xml from HTTP Result
$data = strstr($result, '<?');
$xml_parser = xml_parser_create();
@@ -1852,4 +1846,3 @@ public function getXml($wsParams = array())
return $xml;
}
}
-
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -2,11 +2,11 @@
<module>
<name>uspscarrier</name>
<displayName><![CDATA[U.S.P.S. Rate Calulator]]></displayName>
- <version><![CDATA[1.2.4]]></version>
+ <version><![CDATA[1.2.5]]></version>
<description><![CDATA[Calculates shipping rates for United States Postal Service for Domestic shipping within the USA.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries>us</limited_countries>
-</module>
+</module>
Oops, something went wrong.

0 comments on commit 73b3fad

Please sign in to comment.