From 1fdf4400b704950fd6b05eb7b9f366cb0b0ffbab Mon Sep 17 00:00:00 2001 From: rMalie Date: Tue, 19 Jul 2011 14:10:44 +0000 Subject: [PATCH] // Fix minor bugs --- classes/PaymentModule.php | 2 +- classes/Product.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index f66ccd1c1..3d4a9d2c9 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -217,7 +217,7 @@ abstract class PaymentModuleCore extends Module if (!empty($product['ecotax'])) $ecotaxTaxRate = Tax::getProductEcotaxRate($order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); - $quantityDiscount = SpecificPrice::getQuantityDiscount((int)$product['id_product'], $this->shopID, (int)$cart->id_currency, (int)$vat_address->id_country, (int)$customer->id_default_group, (int)$product['cart_quantity']); + $quantityDiscount = SpecificPrice::getQuantityDiscount((int)$product['id_product'], $this->context->shop->getID(), (int)$cart->id_currency, (int)$vat_address->id_country, (int)$customer->id_default_group, (int)$product['cart_quantity']); $unitPrice = Product::getPriceStatic((int)$product['id_product'], true, ($product['id_product_attribute'] ? intval($product['id_product_attribute']) : NULL), 2, NULL, false, true, 1, false, (int)$order->id_customer, NULL, (int)$order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}); $quantityDiscountValue = $quantityDiscount ? ((Product::getTaxCalculationMethod((int)$order->id_customer) == PS_TAX_EXC ? Tools::ps_round($unitPrice, 2) : $unitPrice) - $quantityDiscount['price'] * (1 + $tax_rate / 100)) : 0.00; $query .= '('.(int)($order->id).', diff --git a/classes/Product.php b/classes/Product.php index 84145b904..a05c8b7b0 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2065,10 +2065,10 @@ class ProductCore extends ObjectModel if (is_numeric($productAttribute)) $sql .= ' AND stock.id_product_attribute = '.$productAttribute; else if (is_string($productAttribute)) - $sql .= ' AND stock.id_product_attribute = '.pSQL($productAttribute).'.id_product_attribute'; + $sql .= ' AND stock.id_product_attribute = IFNULL('.pSQL($productAttribute).'.id_product_attribute, 0)'; } $sql .= Shop::sqlSharedStock('stock', $context) . ' '; - + return $sql; }