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

// Fix strict standard on paymentModule + fix stats SQL bug

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7689 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-07-22 09:49:29 +00:00
1 parent e72ae93557
commit 1a462e0a85
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/paypal/paypal.php
+1 -1
View File
@@ -476,7 +476,7 @@ class PayPal extends PaymentModule
} }
public function validateOrder($id_cart, $id_order_state, $amountPaid, $paymentMethod = 'Unknown', $message = NULL, $extraVars = array(), $currency_special = NULL, $dont_touch_amount = false, $secure_key = false) public function validateOrder($id_cart, $id_order_state, $amountPaid, $paymentMethod = 'Unknown', $message = NULL, $extraVars = array(), $currency_special = NULL, $dont_touch_amount = false, $secure_key = false, Shop $shop = null)
{ {
if (!$this->active) if (!$this->active)
return; return;
modules/statsforecast/statsforecast.php
+2 -2
View File
@@ -280,10 +280,10 @@ class StatsForecast extends Module
.$this->sqlShopRestriction(false, 'c'); .$this->sqlShopRestriction(false, 'c');
$visitors = Db::getInstance()->getValue($sql); $visitors = Db::getInstance()->getValue($sql);
$sql = 'SELECT COUNT(DISTINCT id_customer) $sql = 'SELECT COUNT(DISTINCT g.id_customer)
FROM '._DB_PREFIX_.'connections c FROM '._DB_PREFIX_.'connections c
INNER JOIN '._DB_PREFIX_.'guest g ON c.id_guest = g.id_guest INNER JOIN '._DB_PREFIX_.'guest g ON c.id_guest = g.id_guest
WHERE c.id_customer != 0 WHERE g.id_customer != 0
AND c.date_add BETWEEN '.ModuleGraph::getDateBetween() AND c.date_add BETWEEN '.ModuleGraph::getDateBetween()
.$this->sqlShopRestriction(false, 'c'); .$this->sqlShopRestriction(false, 'c');
$customers = Db::getInstance()->getValue($sql); $customers = Db::getInstance()->getValue($sql);