1.0.2 release

cmextension · Aug 8, 2014 · 0679fac · 0679fac
1 parent 1ac46ea
commit 0679fac
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 10 deletions.
diff --git a/packages/com_cmdonation/admin/cmdonation.php b/packages/com_cmdonation/admin/cmdonation.php
@@ -12,7 +12,7 @@
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
 }
 
-require JPATH_COMPONENT_ADMINISTRATOR . '/helpers/cmdonation.php';
+require_once JPATH_COMPONENT_ADMINISTRATOR . '/helpers/cmdonation.php';
 
 // Load CM Donation component's front-end language files.
 $lang = JFactory::getLanguage();

diff --git a/packages/com_cmdonation/admin/helpers/cmdonation.php b/packages/com_cmdonation/admin/helpers/cmdonation.php
@@ -19,7 +19,7 @@ class CMDonationHelper
 	 *
 	 * @param   string  $active  Active view's name.
 	 *
-	 * @return  void
+	 * @return  string
 	 *
 	 * @since   1.0.0
 	 */

diff --git a/packages/com_cmdonation/cmdonation.xml b/packages/com_cmdonation/cmdonation.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="2.5" method="upgrade">
 	<name>com_cmdonation</name>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<copyright>(C) 2014 CMExtension team</copyright>
 	<author>CMExtension team</author>
 	<authorEmail>cmext.vn@gmail.com</authorEmail>
 	<authorUrl>www.cmext.vn</authorUrl>
 	<license>GNU General Public License version 2 or later</license>
-	<creationDate>August 6, 2014</creationDate>
+	<creationDate>August 8, 2014</creationDate>
 	<description>COM_CMDONATION_XML_DESCRIPTION</description>
 
 	<install>

diff --git a/.../plg_cmdonation_paypalproexpress/language/en-GB/en-GB.plg_cmdonation_paypalproexpress.ini b/.../plg_cmdonation_paypalproexpress/language/en-GB/en-GB.plg_cmdonation_paypalproexpress.ini
@@ -21,3 +21,63 @@ PLG_CMDONATION_PAYPALPROEXPRESS_SB_APISIG_DESC = "Your API signature you were gi
 
 PLG_CMDONATION_PAYPALPROEXPRESS_SANDBOX_LABEL = "Sandbox"
 PLG_CMDONATION_PAYPALPROEXPRESS_SANDBOX_DESC = "When enabled, all transactions will be performed against the PayPal Sandbox for testing."
+
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_LABEL = "Currency"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_DESC = "The currency you use in donations. The currencies in the list are supported by PayPal."
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_LABEL = "Locale"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_DESC = "The locale is used in PayPal's donation page. If your site is a multilanguage site, you can use the Joomla!'s' locale that donor uses. For example, if your site is in English and French, donor views your site in French and decides to donate, French is the locale of PayPal's donation page after donor is taken to PayPal. If your site is only in 1 language, you should choose other options. The locales in the list are supported by PayPal (except the first option for Joomla!'s locale)."
+
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_AUD = "AUD - Australian Dollar"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_CAD = "CAD - Canadian Dollar"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_CZK = "CZK - Czech Koruna"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_DKK = "DKK - Danish Krone"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_EUR = "EUR - Euro"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_HKD = "HKD - Hong Kong Dollar"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_HUF = "HUF - Hungarian Forint"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_ILS = "ILS - Israeli New Sheqel"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_JPY = "JPY - Japanese Yen"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_MXN = "MXN - Mexican Peso"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_NOK = "NOK - Norwegian Krone"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_NZD = "NZD - New Zealand Dollar"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_PHP = "PHP - Philippine Peso"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_PLN = "PLN - Polish Zloty"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_GBP = "GBP - Pound Sterling"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_SGD = "SGD - Singapore Dollar"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_SEK = "SEK - Swedish Krona"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_CHF = "CHF - Swiss Franc"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_TWD = "TWD - Taiwan New Dollar"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_THB = "THB - Thai Baht"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_TRY = "TRY - Turkish Lira"
+PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_USD = "USD - U.S. Dollar"
+
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_JOOMLA = "Joomla!'s locale"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_AU = "AU - Australia"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_AT = "AT - Austria"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_BE = "BE - Belgium"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_BR = "BR - Brazil"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_CA = "CA - Canada"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_CH = "CH - Switzerland"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_CN = "CN - China"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_DE = "DE - Germany"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ES = "ES - Spain"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_GB = "GB - United Kingdom"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_FR = "FR - France"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_IT = "IT - Italy"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_NL = "NL - Netherlands"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_PL = "PL - Poland"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_PT = "PT - Portugal"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_RU = "RU - Russia"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_US = "US - United States"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_DA_DK = "da_DK - Danish (for Denmark only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_HE_IL = "he_IL - Hebrew (all)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ID_ID = "id_ID - Indonesian (for Indonesia only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_JP_JP = "jp_JP - Japanese (for Japan only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_NO_NO = "no_NO - Norwegian (for Norway only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_PT_BR = "pt_BR - Brazilian Portuguese (for Portugal and Brazil only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_RU_RU = "ru_RU - Russian (for Lithuania, Latvia, and Ukraine only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_SV_SE = "sv_SE - Swedish (for Sweden only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_TH_TH = "th_TH - Thai (for Thailand only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_TR_TR = "tr_TR - Turkish (for Turkey only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ZH_CN = "zh_CN - Simplified Chinese (for China only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ZH_HK = "zh_HK - Traditional Chinese (for Hong Kong only)"
+PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ZH_TW = "zh_TW - Traditional Chinese (for Taiwan only)"
diff --git a/packages/plg_cmdonation_paypalproexpress/paypalproexpress.php b/packages/plg_cmdonation_paypalproexpress/paypalproexpress.php
@@ -101,6 +101,7 @@ public function onCMPaymentNew($paymentMethod, $user, $data)
 			'ALLOWNOTE'							=> 0,
 			// Allow paying with credit cards without signing up for a PayPal account.
 			'SOLUTIONTYPE'						=> 'Sole',
+			'LOCALECODE'						=> $this->getLocale(),
 		);
 
 		if ($data->recurring)
@@ -922,6 +923,62 @@ private function getCurrency()
 		return trim($this->params->get('currency', 'USD'));
 	}
 
+	/**
+	 * Get locale from plugin's settings.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0.2
+	 */
+	private function getLocale()
+	{
+		$locale = trim($this->params->get('locale', 'GB'));
+
+		if ($locale == 'JOOMLA')
+		{
+			$lang = JFactory::getLanguage();
+			$langTag = $lang->getTag();
+
+			/*
+			 * Array(Joomla! language tag => PayPal local code)
+			 * https://developer.paypal.com/docs/classic/api/merchant/SetExpressCheckout_API_Operation_NVP/
+			 */
+			$langMaps = array(
+				'en-AU'	=> 'AU',
+				'nl-BE'	=> 'BE',
+				'pt-PT'	=> 'BR', // Or pt_BR?
+				'en-CA'	=> 'CA',
+				'de-DE'	=> 'DE',
+				'de-CH'	=> 'DE',
+				'de-AT'	=> 'DE',
+				'es-ES'	=> 'ES',
+				'en-GB'	=> 'GB',
+				'fr-CA'	=> 'FR',
+				'it-IT'	=> 'IT',
+				'nl-NL'	=> 'NL',
+				'pl-PL'	=> 'PL',
+				'pt-PT'	=> 'PT',
+				'ru-RU'	=> 'RU', // Or ru_RU?
+				'en-US'	=> 'US',
+				'zh-CN'	=> 'zh_CN',
+				'zh-TW'	=> 'zh_TW',
+				'da-DK'	=> 'da_DK',
+				'he-IL'	=> 'he_IL',
+				'id-ID'	=> 'id_ID',
+				'ja-JP'	=> 'ja_JP',
+				'nb-NO'	=> 'no_NO',
+				'nn-NO'	=> 'no_NO',
+				'sv-SE'	=> 'sv_SE',
+				'th-TH'	=> 'th_TH',
+				'tr-TR'	=> 'tr_TR'
+			);
+
+			return isset($langMaps[$langTag]) ? $langMaps[$langTag] : 'GB';
+		}
+
+		return $locale;
+	}
+
 	/**
 	 * Get PayPal's API version
 	 *

diff --git a/packages/plg_cmdonation_paypalproexpress/paypalproexpress.xml b/packages/plg_cmdonation_paypalproexpress/paypalproexpress.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="2.5" type="plugin" group="cmdonation" method="upgrade">
 	<name>CM Donation - PayPal Payments Pro (Express Checkout) payment plugin</name>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<copyright>(C) 2014 CMExtension team</copyright>
 	<author>CMExtension team</author>
 	<authorEmail>cmext.vn@gmail.com</authorEmail>
 	<authorUrl>www.cmext.vn</authorUrl>
 	<license>GNU General Public License version 2 or later</license>
-	<creationDate>August 6, 2014</creationDate>
+	<creationDate>August 8, 2014</creationDate>
 	<description>PayPal Payments Pro (Express Checkout) payment plugin for CM Donation component</description>
 
 	<files>
@@ -60,6 +60,68 @@
 						<option value="1">JYes</option>
 						<option value="0">JNo</option>
 				</field>
+
+				<field name="currency" type="list" default="USD"
+					label="PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_LABEL"
+					description="PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_DESC">
+						<option value="AUD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_AUD</option>
+						<option value="CAD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_CAD</option>
+						<option value="CZK">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_CZK</option>
+						<option value="DKK">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_DKK</option>
+						<option value="EUR">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_EUR</option>
+						<option value="HKD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_HKD</option>
+						<option value="HUF">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_HUF</option>
+						<option value="ILS">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_ILS</option>
+						<option value="JPY">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_JPY</option>
+						<option value="MXN">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_MXN</option>
+						<option value="NOK">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_NOK</option>
+						<option value="NZD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_NZD</option>
+						<option value="PHP">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_PHP</option>
+						<option value="PLN">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_PLN</option>
+						<option value="GBP">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_GBP</option>
+						<option value="SGD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_SGD</option>
+						<option value="SEK">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_SEK</option>
+						<option value="CHF">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_CHF</option>
+						<option value="TWD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_TWD</option>
+						<option value="THB">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_THB</option>
+						<option value="TRY">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_TRY</option>
+						<option value="USD">PLG_CMDONATION_PAYPALPROEXPRESS_CURRENCY_USD</option>
+				</field>
+				<field name="locale" type="list" default="GB"
+					label="PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_LABEL"
+					description="PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_DESC">
+						<option value="JOOMLA">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_JOOMLA</option>
+						<option value="AU">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_AU</option>
+						<option value="AT">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_AT</option>
+						<option value="BE">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_BE</option>
+						<option value="BR">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_BR</option>
+						<option value="CA">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_CA</option>
+						<option value="CH">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_CH</option>
+						<option value="CN">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_CN</option>
+						<option value="DE">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_DE</option>
+						<option value="ES">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ES</option>
+						<option value="GB">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_GB</option>
+						<option value="FR">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_FR</option>
+						<option value="IT">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_IT</option>
+						<option value="NL">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_NL</option>
+						<option value="PL">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_PL</option>
+						<option value="PT">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_PT</option>
+						<option value="RU">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_RU</option>
+						<option value="US">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_US</option>
+						<option value="da_DK">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_DA_DK</option>
+						<option value="he_IL">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_HE_IL</option>
+						<option value="id_ID">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ID_ID</option>
+						<option value="jp_JP">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_JP_JP</option>
+						<option value="no_NO">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_NO_NO</option>
+						<option value="pt_BR">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_PT_BR</option>
+						<option value="ru_RU">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_RU_RU</option>
+						<option value="sv_SE">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_SV_SE</option>
+						<option value="th_TH">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_TH_TH</option>
+						<option value="tr_TR">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_TR_TR</option>
+						<option value="zh_CN">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ZH_CN</option>
+						<option value="zh_HK">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ZH_HK</option>
+						<option value="zh_TW">PLG_CMDONATION_PAYPALPROEXPRESS_LOCALE_ZH_TW</option>
+				</field>
 			</fieldset>
 		</fields>
 	</config>

diff --git a/packages/plg_content_cmdonationcontent/cmdonationcontent.xml b/packages/plg_content_cmdonationcontent/cmdonationcontent.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="2.5" type="plugin" group="content" method="upgrade">
 	<name>PLG_CONTENT_CMDONATIONCONTENT</name>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<copyright>(C) 2014 CMExtension team</copyright>
 	<author>CMExtension team</author>
 	<authorEmail>cmext.vn@gmail.com</authorEmail>
 	<authorUrl>www.cmext.vn</authorUrl>
 	<license>GNU General Public License version 2 or later</license>
-	<creationDate>August 6, 2014</creationDate>
+	<creationDate>August 8, 2014</creationDate>
 	<description>PLG_CONTENT_CMDONATIONCONTENT_XML_DESCRIPTION</description>
 	<files>
 		<folder>language</folder>

diff --git a/pkg_cmdonation.xml b/pkg_cmdonation.xml
@@ -2,11 +2,11 @@
 <extension type="package" version="2.5">
 	<name>CM Donation package</name>
 	<description>The package for CM Donation component. Including the component and the required plug-ins.</description>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<author>CMExtension team</author>
 	<authorEmail>cmext.vn@gmail.com</authorEmail>
 	<authorUrl>www.cmext.vn</authorUrl>
-	<creationDate>August 6, 2014</creationDate>
+	<creationDate>August 8, 2014</creationDate>
 	<copyright>(C) 2014 CMExtension team</copyright>
 	<license>GNU General Public License version 2 or later</license>
 	<packagename>cmdonation</packagename>