Skip to content

Commit

Permalink
https://github.com/opencart/opencart/issues/11458
Browse files Browse the repository at this point in the history
  • Loading branch information
danielkerr committed Sep 7, 2022
1 parent a0ae5a9 commit 967607c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
12 changes: 10 additions & 2 deletions upload/admin/model/sale/subscription.php
Expand Up @@ -162,10 +162,18 @@ public function addTransaction(int $subscription_id, string $description = '', f
$this->db->query("INSERT INTO `" . DB_PREFIX . "subscription_transaction` SET `subscription_id` = '" . (int)$subscription_id . "', `description` = '" . $this->db->escape($description) . "', `amount` = '" . (float)$amount . "', `date_added` = NOW()");
}

public function getTransactions(int $subscription_id): array {
public function getTransactions(int $subscription_id, int $start = 0, int $limit = 10): array {
if ($start < 0) {
$start = 0;
}

if ($limit < 1) {
$limit = 10;
}

$transaction_data = [];

$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "subscription_transaction` WHERE `subscription_id` = '" . (int)$subscription_id . "' ORDER BY `date_added` DESC");
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "subscription_transaction` WHERE `subscription_id` = '" . (int)$subscription_id . "' ORDER BY `date_added` DESC LIMIT " . (int)$start . "," . (int)$limit);

foreach ($query->rows as $result) {
$transaction_data[] = [
Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/mail/subscription.php
Expand Up @@ -15,7 +15,7 @@ public function index(string &$route, array &$args, &$output): void {
} else {
$subscription = [];
}

/*
$subscription['order_product_id']
$subscription['customer_id']
$subscription['order_id']
Expand All @@ -34,7 +34,7 @@ public function index(string &$route, array &$args, &$output): void {
$subscription['remaining' ]
$subscription['date_next']
$subscription['status' ]

*/
// We need to grab the old order status ID
$order_info = $this->model_checkout_order->getOrder($order_id);

Expand Down

0 comments on commit 967607c

Please sign in to comment.