https://github.com/opencart/opencart/issues/11458

opencart · Oct 22, 2023 · 66fa3b1 · 66fa3b1
1 parent 3df3ec0
commit 66fa3b1
Show file tree

Hide file tree

Showing 9 changed files with 579 additions and 544 deletions.
diff --git a/upload/admin/controller/sale/order.php b/upload/admin/controller/sale/order.php
@@ -131,7 +131,7 @@ public function index(): void {
 		];
 
 		$data['add'] = $this->url->link('sale/order.info', 'user_token=' . $this->session->data['user_token'] . $url);
-		$data['delete'] = $this->url->link('sale/order.delete', 'user_token=' . $this->session->data['user_token']);
+		$data['delete'] = $this->url->link('sale/order.delete', 'user_token=' . $this->session->data['user_token'] . $url);
 		$data['invoice'] = $this->url->link('sale/order.invoice', 'user_token=' . $this->session->data['user_token']);
 		$data['shipping'] = $this->url->link('sale/order.shipping', 'user_token=' . $this->session->data['user_token']);
 

diff --git a/upload/admin/controller/sale/subscription.php b/upload/admin/controller/sale/subscription.php
@@ -418,11 +418,9 @@ public function info(): void {
 
 		$data['back'] = $this->url->link('sale/subscription', 'user_token=' . $this->session->data['user_token'] . $url);
 
-		$data['subscription_id'] = $subscription_id;
-
 		$this->load->model('sale/subscription');
 
-		$subscription_info = $this->model_sale_subscription->getSubscription($data['subscription_id']);
+		$subscription_info = $this->model_sale_subscription->getSubscription($subscription_id);
 
 		if (!empty($subscription_info)) {
 			$data['subscription_id'] = $subscription_info['subscription_id'];
@@ -437,7 +435,7 @@ public function info(): void {
 			$order_info = $this->model_sale_order->getOrder($subscription_info['order_id']);
 		}
 
-		if (!empty($subscription_info)) {
+		if (!empty($order_info)) {
 			$data['order'] = $this->url->link('sale/order.info', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $subscription_info['order_id']);
 		} else {
 			$data['order'] = '';
@@ -468,12 +466,6 @@ public function info(): void {
 			$data['lastname'] = '';
 		}
 
-		if (!empty($customer_info)) {
-			$data['lastname'] = $customer_info['lastname'];
-		} else {
-			$data['lastname'] = '';
-		}
-
 		// Subscription
 		$data['subscription_plans'] = [];
 
@@ -666,9 +658,9 @@ public function info(): void {
 
 		// Product data
 		if (!empty($subscription_info)) {
-			$this->load->model('sale/order');
-
-			$product_info = $this->model_sale_order->getProductByOrderProductId($subscription_info['order_id'], $subscription_info['order_product_id']);
+			//$this->load->model('sale/order');
+			//getSubscriptionByOrderProductId
+		//	$product_info = $this->model_sale_order->getProductByOrderProductId($subscription_info['order_id'], $subscription_info['order_product_id']);
 		}
 
 		if (!empty($product_info['name'])) {

diff --git a/upload/admin/view/template/cms/article_form.twig b/upload/admin/view/template/cms/article_form.twig
@@ -60,7 +60,7 @@
                         </div>
                       </div>
                     </div>
-                    <div class="row mb-3 required">
+                    <div class="row mb-3">
                       <label for="input-tag-{{ language.language_id }}" class="col-sm-2 col-form-label">{{ entry_tag }}</label>
                       <div class="col-sm-10">
                         <input type="text" name="article_description[{{ language.language_id }}][tag]" value="{{ article_description[language.language_id] ? article_description[language.language_id].tag }}" placeholder="{{ entry_tag }}" id="input-tag-{{ language.language_id }}" class="form-control"/>

diff --git a/upload/admin/view/template/customer/customer_form.twig b/upload/admin/view/template/customer/customer_form.twig