Merge branch 'opencart:master' into master

stalker780 · Feb 9, 2025 · 701b6ae · 701b6ae
2 parents 2085eb8 + de37ffe
commit 701b6ae
Show file tree

Hide file tree

Showing 28 changed files with 8,377 additions and 73 deletions.
diff --git a/upload/admin/controller/report/statistics.php b/upload/admin/controller/report/statistics.php
@@ -256,7 +256,7 @@ public function product(): void {
 			// Product
 			$this->load->model('catalog/product');
 
-			$this->model_report_statistics->editValue('product', $this->model_catalog_product->getTotalProducts(['filter_quantity' => 0]));
+			$this->model_report_statistics->editValue('product', $this->model_catalog_product->getTotalProducts(['filter_quantity_to' => 0]));
 
 			$json['success'] = $this->language->get('text_success');
 		}

diff --git a/upload/admin/model/catalog/product.php b/upload/admin/model/catalog/product.php
@@ -2605,7 +2605,7 @@ public function getSubscriptions(int $product_id): array {
 	/**
 	 * Delete Subscriptions By Subscription Plan ID
 	 *
-	 * @param int $subscription_plan_id primary key of the product subscription plan record
+	 * @param int $subscription_plan_id primary key of the subscription plan record
 	 *
 	 * @return void
 	 *

diff --git a/upload/admin/model/customer/custom_field.php b/upload/admin/model/customer/custom_field.php
@@ -338,7 +338,7 @@ public function getDescriptions(int $custom_field_id): array {
 	 *
 	 * @param int $language_id primary key of the language record
 	 *
-	 * @return array<int, array<string, string>> description records that have information ID
+	 * @return array<int, array<string, string>> description records that have language ID
 	 *
 	 * @example
 	 *

diff --git a/upload/admin/model/localisation/language.php b/upload/admin/model/localisation/language.php
@@ -275,7 +275,7 @@ public function addLanguage(array $data): int {
 	 *     'locale'     => 'Language Locale',
 	 *     'extension'  => '',
 	 *     'sort_order' => 0,
-	 *     'status'     => 0
+	 *     'status'     => 1
 	 * ];
 	 *
 	 * $this->load->model('localisation/language');

diff --git a/upload/admin/model/localisation/tax_rate.php b/upload/admin/model/localisation/tax_rate.php
@@ -19,7 +19,7 @@ class TaxRate extends \Opencart\System\Engine\Model {
 	 *
 	 * $tax_rate_data = [
 	 *     'name'        => 'Tax Rate Name',
-	 *     'rate'        => 'Tax Rate',
+	 *     'rate'        => 0.0000,
 	 *     'type'        => 'F',
 	 *     'geo_zone_id' => 1
 	 * ];
@@ -54,7 +54,7 @@ public function addTaxRate(array $data): int {
 	 *
 	 * $tax_rate_data = [
 	 *     'name'        => 'Tax Rate Name',
-	 *     'rate'        => 'Tax Rate',
+	 *     'rate'        => 0.0000,
 	 *     'type'        => 'F',
 	 *     'geo_zone_id' => 1
 	 * ];

diff --git a/upload/admin/model/sale/order.php b/upload/admin/model/sale/order.php
@@ -761,7 +761,7 @@ public function getTotalsByCode(int $order_id, $code): array {
 	 *
 	 * $this->load->model('sale/order');
 	 *
-	 * $sale_total = $this->model_sale_order->getTotalSales(['filter_order_status' => implode(',', array_merge(1, 3)]);
+	 * $sale_total = $this->model_sale_order->getTotalSales(['filter_order_status' => implode(',', array_merge(1, 3))]);
 	 */
 	public function getTotalSales(array $data = []): float {
 		$sql = "SELECT SUM(`total`) AS `total` FROM `" . DB_PREFIX . "order`";

diff --git a/upload/admin/model/sale/subscription.php b/upload/admin/model/sale/subscription.php
@@ -416,8 +416,6 @@ public function getOptions(int $subscription_id, int $subscription_product_id):
 	 * Delete Options
 	 *
 	 * @param int $subscription_id  primary key of the subscription record
-	 * @param int $order_id         primary key of the order record
-	 * @param int $order_product_id primary key of the order product record
 	 *
 	 * @return void
 	 *

diff --git a/upload/admin/model/user/user.php b/upload/admin/model/user/user.php
@@ -467,7 +467,7 @@ public function getLogins(int $user_id, int $start = 0, int $limit = 10): array
 			$limit = 10;
 		}
 
-		$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "user_login` WHERE `user_id` = '" . (int)$user_id . "' LIMIT " . (int)$start . "," . (int)$limit);
+		$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "user_login` WHERE `user_id` = '" . (int)$user_id . "' ORDER BY `date_added` DESC LIMIT " . (int)$start . "," . (int)$limit);
 
 		if ($query->num_rows) {
 			return $query->rows;