Navigation

Changeset 872

Timestamp:

07/09/08 10:18:15 (2 months ago)

Author:

rach

Message:

correct currency behaviour with PAYPAL

now :
If you don't specify a currency in PAYPAL configuration (Admin)
You use the base currency if it is authorized by PAYPAL else it s USD

Files:

r861	r872
63	63
64	64	$my_currency = MODULE_PAYMENT_PAYPAL_CURRENCY;
65		if (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD'))) {
	65	$base_currency = strtoupper($GLOBALS['A2B']->config['global']['base_currency']);
	66
	67	if($my_currency ='Selected Currency' && in_array($base_currency,array('CAD', 'EUR', 'GBP', 'JPY', 'USD')) ){
	68	$my_currency = $base_currency;
	69	}
	70	elseif (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD'))) {
66	71	$my_currency = 'USD';
67	72	}
…	…
85	90	}
86	91	function get_CurrentCurrency()
87		{
	92	{
88	93	$my_currency = MODULE_PAYMENT_PAYPAL_CURRENCY;
89		if (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD'))) {
	94	$base_currency = strtoupper($GLOBALS['A2B']->config['global']['base_currency']);
	95	if($my_currency =='Selected Currency' && in_array($base_currency,array('CAD', 'EUR', 'GBP', 'JPY', 'USD')) ){
	96	$my_currency = $base_currency;
	97	}
	98	elseif (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD'))) {
90	99	$my_currency = 'USD';
91	100	}