diff --git a/upload/admin/model/extension/payment/opayo.php b/upload/admin/model/extension/payment/opayo.php index 001e2a5b5eb..900229d6e96 100644 --- a/upload/admin/model/extension/payment/opayo.php +++ b/upload/admin/model/extension/payment/opayo.php @@ -247,7 +247,7 @@ public function editRecurringStatus($order_recurring_id, $status) { $this->db->query("UPDATE `" . DB_PREFIX . "order_recurring` SET `status` = '" . (int)$status . "' WHERE `order_recurring_id` = '" . (int)$order_recurring_id . "'"); } - public function sendCurl($url, $payment_data) { + public function sendCurl($url, $payment_data, $i = null) { $curl = curl_init($url); curl_setopt($curl, CURLOPT_PORT, 443); diff --git a/upload/catalog/model/extension/payment/worldpay.php b/upload/catalog/model/extension/payment/worldpay.php index e46b9cce41d..93fbf10174d 100644 --- a/upload/catalog/model/extension/payment/worldpay.php +++ b/upload/catalog/model/extension/payment/worldpay.php @@ -78,7 +78,7 @@ public function getOrder($order_id) { if ($qry->num_rows) { $order = $qry->row; - $order['transactions'] = $this->getTransactions($order['worldpay_order_id']); + $order['transactions'] = $this->getTransactions($order['worldpay_order_id'], null); return $order; } else { @@ -90,7 +90,7 @@ public function addTransaction($worldpay_order_id, $type, $order_info) { $this->db->query("INSERT INTO `" . DB_PREFIX . "worldpay_order_transaction` SET `worldpay_order_id` = '" . (int)$worldpay_order_id . "', `date_added` = now(), `type` = '" . $this->db->escape($type) . "', `amount` = '" . $this->currency->format($order_info['total'], $order_info['currency_code'], false, false) . "'"); } - public function getTransactions($worldpay_order_id) { + public function getTransactions($worldpay_order_id, $currency_code) { $qry = $this->db->query("SELECT * FROM `" . DB_PREFIX . "worldpay_order_transaction` WHERE `worldpay_order_id` = '" . (int)$worldpay_order_id . "'"); if ($qry->num_rows) {