From 2889076e8d2ad0a52bd179d8cdb8b6982839a310 Mon Sep 17 00:00:00 2001
From: Drew Rowan <andrew.rowan@wallee.com>
Date: Mon, 24 Oct 2022 14:53:34 +0200
Subject: [PATCH] Release 1.0.52

---
 README.md                                                  | 4 ++--
 docs/en/documentation.html                                 | 4 ++--
 .../template/extension/payment/postfinancecheckout.tpl     | 4 ++--
 .../library/postfinancecheckout/dynamic/catalog/model.php  | 7 +++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ce5dc7f..14c1602 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This repository contains the OpenCart  PostFinance Checkout payment module that
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/opencart-2.3/1.0.51/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/opencart-2.3/1.0.52/docs/en/documentation.html)
 
 ## Support
 
@@ -21,4 +21,4 @@ Support queries can be issued on the [PostFinance Checkout support site](https:/
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/opencart-2.3/blob/1.0.51/LICENSE) for more information.
\ No newline at end of file
+Please see the [license file](https://github.com/pfpayments/opencart-2.3/blob/1.0.52/LICENSE) for more information.
\ No newline at end of file
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index 44c6da4..bf901ab 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/opencart-2.3/releases/tag/1.0.51/">
+		<a href="https://github.com/pfpayments/opencart-2.3/releases/tag/1.0.52/">
 			Source
 		</a>
 	</li>
@@ -49,7 +49,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/pfpayments/opencart-2.3/releases/tag/1.0.51/">Download</a> the extension.</p>
+<p><a href="https://github.com/pfpayments/opencart-2.3/releases/tag/1.0.52/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>
diff --git a/upload/admin/view/template/extension/payment/postfinancecheckout.tpl b/upload/admin/view/template/extension/payment/postfinancecheckout.tpl
index 5b87577..9236bfd 100644
--- a/upload/admin/view/template/extension/payment/postfinancecheckout.tpl
+++ b/upload/admin/view/template/extension/payment/postfinancecheckout.tpl
@@ -271,14 +271,14 @@
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><?php echo $entry_version; ?></label>
 							<div class="col-sm-10">
-								<p class="form-control-static">1.0.51</p>
+								<p class="form-control-static">1.0.52</p>
 							</div>
 						</div>
 	
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><?php echo $entry_date; ?></label>
 							<div class="col-sm-10">
-								<p class="form-control-static">2022/10/07 11:02:14</p>
+								<p class="form-control-static">2022/10/24 14:53:31</p>
 							</div>
 						</div>
 					</fieldset>
diff --git a/upload/system/library/postfinancecheckout/dynamic/catalog/model.php b/upload/system/library/postfinancecheckout/dynamic/catalog/model.php
index ad8f217..8feaf10 100644
--- a/upload/system/library/postfinancecheckout/dynamic/catalog/model.php
+++ b/upload/system/library/postfinancecheckout/dynamic/catalog/model.php
@@ -17,6 +17,13 @@ public function getMethod($address, $total){
 			return array();
 		}
 		
+		// for journal3 one step checkout the user data is empty by default
+		// i assume this is some oversight by the folks at journal3
+		$data = $this->registry->get('session')->data;
+		if(isset($data['j3_checkout_id']) && !isset($this->session->data['user_id'])) {
+			$this->session->data['user_id'] = $data['j3_checkout_id'];
+		}
+
 		// check if transaction can be saved to the session.
 		if (\PostFinanceCheckoutHelper::instance($this->registry)->getCustomerSessionIdentifier() === null) {
 			return array();