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

// Merge -> revision 8114

Browse Source
This commit is contained in:
rMalie
2011-08-19 09:46:12 +00:00
parent 8e5e085d33
commit fd25111d74
12 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paypal/payment/paypalpayment.php
+11 -2
View File
@@ -71,14 +71,23 @@ class PaypalPayment extends Paypal
$discounts = (float)($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
if ($discounts == 0)
{
if ($params['cart']->id_customer)
{
$customer = new Customer((int)$params['cart']->id_customer);
$taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);
}
else
$taxCalculationMethod = Group::getDefaultPriceDisplayMethod();
$priceField = (($taxCalculationMethod == PS_TAX_EXC) ? 'price' : 'price_wt');
$products = $cart->getProducts();
$amt = 0;
for ($i = 0; $i < sizeof($products); $i++)
{
$request .= '&L_NAME'.$i.'='.substr(urlencode($products[$i]['name'].(isset($products[$i]['attributes'])?' - '.$products[$i]['attributes']:'').(isset($products[$i]['instructions'])?' - '.$products[$i]['instructions']:'') ), 0, 127);
$request .= '&L_AMT'.$i.'='.urlencode($this->PayPalRound($products[$i]['price_wt']));
$request .= '&L_AMT'.$i.'='.urlencode($this->PayPalRound($products[$i][$priceField]));
$request .= '&L_QTY'.$i.'='.urlencode($products[$i]['cart_quantity']);
$amt += $this->PayPalRound($products[$i]['price_wt']*$products[$i]['cart_quantity']);
$amt += $this->PayPalRound($products[$i][$priceField] * $products[$i]['cart_quantity']);
}
$shipping = $this->PayPalRound($cart->getOrderShippingCost($cart->id_carrier, false));
$request .= '&ITEMAMT='.urlencode($amt);
modules/paysafecard/payment.php
+1 -1
View File
@@ -51,7 +51,7 @@ if ($result[0] == 0)
{
list ($rc, $errorcode, $error_message, $amount, $used_currency, $state) = $result;
if ($state == PrepaidServicesAPI::DISPOSITION_DISPOSED || $state == PrepaidServicesAPI::DISPOSITION_DEBITED)
if ($state == PSCPrepaidServicesAPI::DISPOSITION_DISPOSED || $state == PSCPrepaidServicesAPI::DISPOSITION_DEBITED)
{
$state = Configuration::get('PS_OS_PAYMENT');
$message .= $module->getL('disposition_created');
modules/shopimporter/shopimporter.php
+1 -1
View File
@@ -1099,7 +1099,7 @@ class shopimporter extends ImportModule
Image::deleteAllImages(_PS_PROD_IMG_DIR_);
Image::clearTmpDir();
break;
case 'Manufacturers' :
case 'manufacturer' :
Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');
Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang');
foreach (scandir(_PS_MANU_IMG_DIR_) AS $d)