dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// REVERT MERGE

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paypal/express/submit.php
+4 -8
View File
@@ -299,10 +299,8 @@ function displayAccount()
// Select the most appropriate country
if (Tools::getValue('id_country'))
$selectedCountry = (int)(Tools::getValue('id_country'));
else if ((int)$result['COUNTRYCODE'])
{
else
$selectedCountry = Country::getByIso(strval($result['COUNTRYCODE']));
}
$countries = Country::getCountries((int)($cookie->id_lang), true);
// Smarty assigns
@@ -335,12 +333,10 @@ function displayAccount()
// #####
// Process !!
/*if (!$cookie->isLogged(true))
{
displayAccount();
if (!$cookie->isLogged(true))
die('Not logged');
}*/
if (!$cart->getOrderTotal(true, Cart::BOTH))
elseif (!$cart->getOrderTotal(true, Cart::BOTH))
die('Empty cart');
// No token, we need to get one by making PayPal Authorisation
modules/paypal/ipn.php
+3 -3
View File
@@ -61,13 +61,13 @@ if (!$result OR (Tools::strlen($result) < 8) OR (!$statut = substr($result, -8))
switch ($status)
{
case 'Completed':
$id_order_state = Configuration::get('PS_OS_PAYMENT');
$id_order_state = _PS_OS_PAYMENT_;
break;
case 'Pending':
$id_order_state = Configuration::get('PS_OS_PAYPAL');
$id_order_state = _PS_OS_PAYPAL_;
break;
default:
$id_order_state = Configuration::get('PS_OS_ERROR');
$id_order_state = _PS_OS_ERROR_;
}
if ($order->getCurrentState() == $id_order_state)
modules/paypal/paypal.php
+9 -9
View File
@@ -133,7 +133,7 @@ class PayPal extends PaymentModule
$orderState->logable = true;
$orderState->invoice = true;
if ($orderState->add())
copy(dirname(__FILE__).'/../../img/os/'.Configuration::get('PS_OS_PAYPAL').'.gif', dirname(__FILE__).'/../../img/os/'.(int)$orderState->id.'.gif');
copy(dirname(__FILE__).'/../../img/os/'._PS_OS_PAYPAL_.'.gif', dirname(__FILE__).'/../../img/os/'.(int)$orderState->id.'.gif');
Configuration::updateValue('PAYPAL_OS_AUTHORIZATION', (int)$orderState->id);
}
@@ -452,16 +452,16 @@ class PayPal extends PaymentModule
switch ($result['PAYMENTSTATUS'])
{
case 'Completed':
$id_order_state = Configuration::get('PS_OS_PAYMENT');
$id_order_state = _PS_OS_PAYMENT_;
break;
case 'Pending':
if ($result['PENDINGREASON'] != 'authorization')
$id_order_state = Configuration::get('PS_OS_PAYPAL');
$id_order_state = _PS_OS_PAYPAL_;
else
$id_order_state = (int)(Configuration::get('PAYPAL_OS_AUTHORIZATION'));
break;
default:
$id_order_state = Configuration::get('PS_OS_ERROR');
$id_order_state = _PS_OS_ERROR_;
}
// Call payment validation method
@@ -1065,7 +1065,7 @@ class PayPal extends PaymentModule
die(Tools::displayError('Error when updating PayPal database'));
$history = new OrderHistory();
$history->id_order = (int)($id_order);
$history->changeIdOrderState(Configuration::get('PS_OS_REFUND'), (int)($id_order));
$history->changeIdOrderState(_PS_OS_REFUND_, (int)($id_order));
$history->addWithemail();
}
else
@@ -1102,7 +1102,7 @@ class PayPal extends PaymentModule
{
$history = new OrderHistory();
$history->id_order = (int)($id_order);
$history->changeIdOrderState(Configuration::get('PS_OS_PAYMENT'), (int)$id_order);
$history->changeIdOrderState(_PS_OS_PAYMENT_, (int)$id_order);
$history->addWithemail();
$message .= $this->l('Order finished with PayPal!');
}
@@ -1143,7 +1143,7 @@ class PayPal extends PaymentModule
{
$history = new OrderHistory();
$history->id_order = (int)($id_order);
$history->changeIdOrderState(Configuration::get('PS_OS_PAYMENT'), (int)($id_order));
$history->changeIdOrderState(_PS_OS_PAYMENT_, (int)($id_order));
$history->addWithemail();
}
elseif ($response['PAYMENTSTATUS'] == 'Pending' AND $response['PENDINGREASON'] == 'authorization')
@@ -1157,7 +1157,7 @@ class PayPal extends PaymentModule
{
$history = new OrderHistory();
$history->id_order = (int)($id_order);
$history->changeIdOrderState(Configuration::get('PS_OS_ERROR'), (int)($id_order));
$history->changeIdOrderState(_PS_OS_ERROR_, (int)($id_order));
$history->addWithemail();
}
if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `payment_status` = \''.pSQL($response['PAYMENTSTATUS']).($response['PENDINGREASON'] == 'authorization' ? '_authorization' : '').'\' WHERE `id_order` = '.(int)$id_order))
@@ -1240,7 +1240,7 @@ class PayPal extends PaymentModule
$orderState->logable = true;
$orderState->invoice = true;
if ($orderState->add())
copy(_PS_ROOT_DIR_.'/img/os/'.Configuration::get('PS_OS_PAYPAL').'.gif', _PS_ROOT_DIR_.'/img/os/'.(int)($orderState->id).'.gif');
copy(_PS_ROOT_DIR_.'/img/os/'._PS_OS_PAYPAL_.'.gif', _PS_ROOT_DIR_.'/img/os/'.(int)($orderState->id).'.gif');
Configuration::updateValue('PAYPAL_OS_AUTHORIZATION', (int)($orderState->id));
}
/* Delete unseless configuration */
modules/paypal/validation.php
+3 -3
View File
@@ -136,7 +136,7 @@ if (strtoupper($result) == 'VERIFIED')
elseif (Order::getOrderByCartId((int)($cart_secure[0])))
$errors = $paypal->getL('order').'<br />';
else
$paypal->validateOrder((int)$cart_secure[0], Configuration::get('PS_OS_PAYMENT'), (float)($_POST['mc_gross']), $paypal->displayName, $paypal->getL('transaction').$_POST['txn_id'], array('transaction_id' => $_POST['txn_id'], 'payment_status' => $_POST['payment_status']), NULL, false, $cart_secure[1]);
$paypal->validateOrder((int)$cart_secure[0], _PS_OS_PAYMENT_, (float)($_POST['mc_gross']), $paypal->displayName, $paypal->getL('transaction').$_POST['txn_id'], array('transaction_id' => $_POST['txn_id'], 'payment_status' => $_POST['payment_status']), NULL, false, $cart_secure[1]);
}
}
else
@@ -145,7 +145,7 @@ else
if (!empty($errors) AND isset($_POST['custom']))
{
if (strtoupper($_POST['payment_status']) == 'PENDING')
$paypal->validateOrder((int)$cart_secure[0], Configuration::get('PS_OS_PAYPAL'), (float)$_POST['mc_gross'], $paypal->displayName, $paypal->getL('transaction').$_POST['txn_id'].'<br />'.$errors, array('transaction_id' => $_POST['txn_id'], 'payment_status' => $_POST['payment_status']), NULL, false, $cart_secure[1]);
$paypal->validateOrder((int)$cart_secure[0], _PS_OS_PAYPAL_, (float)$_POST['mc_gross'], $paypal->displayName, $paypal->getL('transaction').$_POST['txn_id'].'<br />'.$errors, array('transaction_id' => $_POST['txn_id'], 'payment_status' => $_POST['payment_status']), NULL, false, $cart_secure[1]);
else
$paypal->validateOrder((int)$cart_secure[0], Configuration::get('PS_OS_ERROR'), 0, $paypal->displayName, $errors.'<br />', array(), NULL, false, $cart_secure[1]);
$paypal->validateOrder((int)$cart_secure[0], _PS_OS_ERROR_, 0, $paypal->displayName, $errors.'<br />', array(), NULL, false, $cart_secure[1]);
}