// Modules updated : Fedex, UPS, USPS

config.xml

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

en.php

@@ -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.';

upscarrier.php

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