Skip to content

Commit f8920ac

Browse files
committed
Merge remote-tracking branch 'origin/1.3.4' into 1.3.4
2 parents d45ef29 + 49dbead commit f8920ac

File tree

885 files changed

+119952
-120839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

885 files changed

+119952
-120839
lines changed

public_html/admin/controller/pages/extension/extensions_store.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function main()
120120
$this->data['amp_product_url'] = $this->model_tool_mp_api->getMPURL().$mp_params.$token_param;
121121

122122
$return_url = base64_encode($this->html->getSecureURL('tool/extensions_store/install'));
123-
$mp_params = '?rt=r/checkout/purchase&return_url='.$return_url;
123+
$mp_params = '?rt=r/product/product&return_url='.$return_url;
124124
$mp_params .= '&store_id='.UNIQUE_ID;
125125
$mp_params .= '&store_url='.HTTPS_SERVER;
126126
$mp_params .= '&store_version='.VERSION;

public_html/admin/controller/pages/sale/order.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ public function details(...$args)
463463
$this->data['comment'] = nl2br($order_info['comment']);
464464
$this->data['firstname'] = $order_info['firstname'];
465465
$this->data['lastname'] = $order_info['lastname'];
466-
$this->data['lastname'] = $order_info['lastname'];
467466
$this->data['total'] = $this->currency->format(
468467
$order_info['total'],
469468
$order_info['currency'],

0 commit comments

Comments
 (0)