diff --git a/modules/paypal/paypal.php b/modules/paypal/paypal.php index 554c39af0..cbd4f402a 100644 --- a/modules/paypal/paypal.php +++ b/modules/paypal/paypal.php @@ -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) return; diff --git a/modules/statsforecast/statsforecast.php b/modules/statsforecast/statsforecast.php index 7b7e87938..b535c0095 100644 --- a/modules/statsforecast/statsforecast.php +++ b/modules/statsforecast/statsforecast.php @@ -280,10 +280,10 @@ class StatsForecast extends Module .$this->sqlShopRestriction(false, 'c'); $visitors = Db::getInstance()->getValue($sql); - $sql = 'SELECT COUNT(DISTINCT id_customer) + $sql = 'SELECT COUNT(DISTINCT g.id_customer) FROM '._DB_PREFIX_.'connections c 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() .$this->sqlShopRestriction(false, 'c'); $customers = Db::getInstance()->getValue($sql);