Merge pull request opencart#13817 from TheCartpenter/patch-86

Removed extra lines
mhcwebdesign · Mar 29, 2024 · 402c011 · 402c011
2 parents 0f39596 + fc1d3c4
commit 402c011
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 8 deletions.
diff --git a/upload/admin/controller/marketplace/modification.php b/upload/admin/controller/marketplace/modification.php
@@ -347,7 +347,6 @@ public function refresh(): void {
 									} else {
 										// Log
 										$log[] = PHP_EOL . 'FILE: (sub modification) ' . $key;
-
 									}
 
 									foreach ($operations as $operation) {

diff --git a/upload/admin/model/localisation/length_class.php b/upload/admin/model/localisation/length_class.php
@@ -154,7 +154,6 @@ public function getLengthClass(int $length_class_id): array {
 	 */
 	public function addDescription(int $length_class_id, int $language_id, array $data): void {
 		$this->db->query("INSERT INTO `" . DB_PREFIX . "length_class_description` SET `length_class_id` = '" . (int)$length_class_id . "', `language_id` = '" . (int)$language_id . "', `title` = '" . $this->db->escape($data['title']) . "', `unit` = '" . $this->db->escape($data['unit']) . "'");
-
 	}
 
 	/**

diff --git a/upload/admin/model/sale/order.php b/upload/admin/model/sale/order.php
@@ -652,7 +652,7 @@ public function createInvoiceNo(int $order_id): string {
 	 * @return int
 	 */
 	public function getRewardTotal(int $order_id): int {
-		$query = $this->db->query("SELECT SUM(reward) AS `total` FROM `" . DB_PREFIX . "order_product` WHERE `order_id` = '" . (int)$order_id . "'");
+		$query = $this->db->query("SELECT SUM(`reward`) AS `total` FROM `" . DB_PREFIX . "order_product` WHERE `order_id` = '" . (int)$order_id . "'");
 
 		return (int)$query->row['total'];
 	}

diff --git a/upload/admin/model/user/api.php b/upload/admin/model/user/api.php
@@ -60,7 +60,6 @@ public function editApi(int $api_id, array $data): void {
 	 */
 	public function deleteApi(int $api_id): void {
 		$this->db->query("DELETE FROM `" . DB_PREFIX . "api` WHERE `api_id` = '" . (int)$api_id . "'");
-
 	}
 
 	/**

diff --git a/upload/admin/view/template/sale/order_info.twig b/upload/admin/view/template/sale/order_info.twig
@@ -80,9 +80,9 @@
                     {% for option in order_product.option %}
                       <br/>
                       {% if option.type != 'file' %}
-                      <small> - {{ option.name }}: {{ option.value }}</small>
+                        <small> - {{ option.name }}: {{ option.value }}</small>
                       {% else %}
-                      <small> - {{ option.name }}: <a href="{{ option.href }}">{{ option.value }}</a></small> {% endif %}
+                        <small> - {{ option.name }}: <a href="{{ option.href }}">{{ option.value }}</a></small> {% endif %}
                     {% endfor %}
                   {% endif %}
 

diff --git a/upload/catalog/controller/checkout/cart.php b/upload/catalog/controller/checkout/cart.php
@@ -30,9 +30,7 @@ public function index(): void {
 			if (!$this->cart->hasStock() && (!$this->config->get('config_stock_checkout') || $this->config->get('config_stock_warning'))) {
 				$data['error_warning'] = $this->language->get('error_stock');
 			} elseif (!$this->cart->hasMinimum()) {
-
 				$data['error_warning'] = $this->language->get('error_minimum');
-
 			} elseif (isset($this->session->data['error'])) {
 				$data['error_warning'] = $this->session->data['error'];