Skip to content

Commit

Permalink
Upgraded PayPal Checkout to v3.1.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheCartpenter
TheCartpenter committed May 29, 2024
1 parent 2817705 commit 2e423bd
Show file tree
Hide file tree
Showing 15 changed files with 1,736 additions and 1,750 deletions.
564 changes: 277 additions & 287 deletions upload/admin/controller/extension/payment/paypal.php
View file

Large diffs are not rendered by default.

666 changes: 333 additions & 333 deletions upload/admin/language/en-gb/extension/payment/paypal.php
View file

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions upload/admin/model/extension/payment/paypal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class ModelExtensionPaymentPayPal extends Model {

public function getTotalSales() {
$implode = [];
$implode = array();

foreach ($this->config->get('config_complete_status') as $order_status_id) {
$implode[] = "'" . (int)$order_status_id . "'";
Expand All @@ -14,126 +14,126 @@ public function getTotalSales() {
}

public function getTotalSalesByDay() {
$implode = [];
$implode = array();

foreach ($this->config->get('config_complete_status') as $order_status_id) {
$implode[] = "'" . (int)$order_status_id . "'";
}

$sale_data = [];
$sale_data = array();

for ($i = 0; $i < 24; $i++) {
$sale_data[$i] = [
$sale_data[$i] = array(
'hour' => $i,
'total' => 0,
'paypal_total' => 0
];
);
}

$query = $this->db->query("SELECT SUM(total) AS total, SUM(IF (payment_code = 'paypal', total, 0)) AS paypal_total, HOUR(date_added) AS hour FROM `" . DB_PREFIX . "order` WHERE order_status_id IN(" . implode(',', $implode) . ") AND DATE(date_added) = DATE(NOW()) GROUP BY HOUR(date_added) ORDER BY date_added ASC");

foreach ($query->rows as $result) {
$sale_data[$result['hour']] = [
$sale_data[$result['hour']] = array(
'hour' => $result['hour'],
'total' => $result['total'],
'paypal_total' => $result['paypal_total']
];
);
}

return $sale_data;
}

public function getTotalSalesByWeek() {
$implode = [];
$implode = array();

foreach ($this->config->get('config_complete_status') as $order_status_id) {
$implode[] = "'" . (int)$order_status_id . "'";
}

$sale_data = [];
$sale_data = array();

$date_start = strtotime('-' . date('w') . ' days');

for ($i = 0; $i < 7; $i++) {
$date = date('Y-m-d', $date_start + ($i * 86400));

$sale_data[date('w', strtotime($date))] = [
$sale_data[date('w', strtotime($date))] = array(
'day' => date('D', strtotime($date)),
'total' => 0,
'paypal_total' => 0
];
);
}

$query = $this->db->query("SELECT SUM(total) AS total, SUM(IF (payment_code = 'paypal', total, 0)) AS paypal_total, date_added FROM `" . DB_PREFIX . "order` WHERE order_status_id IN(" . implode(',', $implode) . ") AND DATE(date_added) >= DATE('" . $this->db->escape(date('Y-m-d', $date_start)) . "') GROUP BY DAYNAME(date_added)");

foreach ($query->rows as $result) {
$sale_data[date('w', strtotime($result['date_added']))] = [
$sale_data[date('w', strtotime($result['date_added']))] = array(
'day' => date('D', strtotime($result['date_added'])),
'total' => $result['total'],
'paypal_total' => $result['paypal_total']
];
);
}

return $sale_data;
}

public function getTotalSalesByMonth() {
$implode = [];
$implode = array();

foreach ($this->config->get('config_complete_status') as $order_status_id) {
$implode[] = "'" . (int)$order_status_id . "'";
}

$sale_data = [];
$sale_data = array();

for ($i = 1; $i <= date('t'); $i++) {
$date = date('Y') . '-' . date('m') . '-' . $i;

$sale_data[date('j', strtotime($date))] = [
$sale_data[date('j', strtotime($date))] = array(
'day' => date('d', strtotime($date)),
'total' => 0,
'paypal_total' => 0
];
);
}

$query = $this->db->query("SELECT SUM(total) AS total, SUM(IF (payment_code = 'paypal', total, 0)) AS paypal_total, date_added FROM `" . DB_PREFIX . "order` WHERE order_status_id IN(" . implode(',', $implode) . ") AND DATE(date_added) >= '" . $this->db->escape(date('Y') . '-' . date('m') . '-1') . "' GROUP BY DATE(date_added)");

foreach ($query->rows as $result) {
$sale_data[date('j', strtotime($result['date_added']))] = [
$sale_data[date('j', strtotime($result['date_added']))] = array(
'day' => date('d', strtotime($result['date_added'])),
'total' => $result['total'],
'paypal_total' => $result['paypal_total']
];
);
}

return $sale_data;
}

public function getTotalSalesByYear() {
$implode = [];
$implode = array();

foreach ($this->config->get('config_complete_status') as $order_status_id) {
$implode[] = "'" . (int)$order_status_id . "'";
}

$sale_data = [];
$sale_data = array();

for ($i = 1; $i <= 12; $i++) {
$sale_data[$i] = [
$sale_data[$i] = array(
'month' => date('M', mktime(0, 0, 0, $i)),
'total' => 0,
'paypal_total' => 0
];
);
}

$query = $this->db->query("SELECT SUM(total) AS total, SUM(IF (payment_code = 'paypal', total, 0)) AS paypal_total, date_added FROM `" . DB_PREFIX . "order` WHERE order_status_id IN(" . implode(',', $implode) . ") AND YEAR(date_added) = YEAR(NOW()) GROUP BY MONTH(date_added)");

foreach ($query->rows as $result) {
$sale_data[date('n', strtotime($result['date_added']))] = [
$sale_data[date('n', strtotime($result['date_added']))] = array(
'month' => date('M', strtotime($result['date_added'])),
'total' => $result['total'],
'paypal_total' => $result['paypal_total']
];
);
}

return $sale_data;
Expand All @@ -152,7 +152,7 @@ public function deletePayPalCustomerTokens($customer_id) {
public function editPayPalOrder($data) {
$sql = "UPDATE `" . DB_PREFIX . "paypal_checkout_integration_order` SET";

$implode = [];
$implode = array();

if (!empty($data['paypal_order_id'])) {
$implode[] = "`paypal_order_id` = '" . $this->db->escape($data['paypal_order_id']) . "'";
Expand Down Expand Up @@ -233,7 +233,7 @@ public function getPayPalOrder($order_id) {
if ($query->num_rows) {
return $query->row;
} else {
return [];
return array();
}
}

Expand Down Expand Up @@ -271,10 +271,10 @@ public function addOrderHistory($order_history_token, $order_id, $order_status_i
$catalog = HTTP_CATALOG;
}

$data = [
$data = array(
'order_id' => $order_id,
'order_status_id' => $order_status_id
];
);

$curl = curl_init();

Expand Down
Loading

0 comments on commit 2e423bd

Please sign in to comment.