Release 1.0.43

pfpayments · Mar 13, 2023 · 8b640e0 · 8b640e0
1 parent 065f6a4
commit 8b640e0
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 10 deletions.
diff --git a/Application/Model/Transaction.php b/Application/Model/Transaction.php
@@ -113,6 +113,10 @@ public function getVersion(){
 		return $this->version;
 	}
 
+	public function getEmailSent(){
+		return $this->getFieldData('pfcemailsent');
+	}
+
 	public function setOrderId($value){
 		$this->_setFieldData('oxorderid', $value);
 	}
@@ -141,6 +145,14 @@ protected function setSdkTransaction($value){
 		$this->sdkTransaction = $value;
 	}
 
+	public function setEmailSent($value){
+		$this->_setFieldData('pfcemailsent', $value);
+	}
+
+	public function markEmailAsSent(){
+		$this->setEmailSent(true);
+	}
+
 	public function loadByOrder($orderId){
 		$select = $this->buildSelectString(array(
 			'oxorderid' => $orderId 

diff --git a/Extend/Application/Model/Order.php b/Extend/Application/Model/Order.php
@@ -83,7 +83,42 @@ public function PostFinanceCheckoutAuthorize(){
 		$basket = $this->getPostFinanceCheckoutBasket();
 		$basket->onUpdate();
 		$basket->calculateBasket();
-		$res = $this->_sendOrderByEmail($this->getOrderUser(), $basket, $this->getPaymentType());
+
+		if ($this->checkPostFinanceCheckoutEmailSent()) {
+			$res = $this->_sendOrderByEmail($this->getOrderUser(), $basket, $this->getPaymentType());
+			$this->markPostFinanceCheckoutEmailAsSent();
+			PostFinanceCheckoutModule::log(Logger::DEBUG, "Confirmation email was sent {$this->getId()}.");
+		}
+	}
+
+	/**
+	 * Check if the email was sent when the transaction state is updated to authorized to avoid duplicate emails.
+	 * Return true if the email hasn't been emailed yet
+	 *
+	 * @return bool
+	 */
+	public function checkPostFinanceCheckoutEmailSent(){
+		$currentState = substr($this->getFieldData('OXTRANSSTATUS'), strlen('POSTFINANCECHECKOUT_'));
+		$transaction = $this->getPostFinanceCheckoutTransaction();
+
+		if ($currentState === TransactionState::AUTHORIZED && !$transaction->getEmailSent()) {
+			return true;
+		}
+
+		$sent = $transaction->getEmailSent() ? 'yes' : 'no';
+		PostFinanceCheckoutModule::log(Logger::DEBUG,
+			"Attempted to send an email on order {$this->getId()} with current state {$currentState}, was sent? {$sent}.");
+
+		return false;
+	}
+
+	/**
+	 * Marks as sent when the transaction state is updated to authorized only the first time.
+	 */
+	public function markPostFinanceCheckoutEmailAsSent(){
+		$transaction = $this->getPostFinanceCheckoutTransaction();
+		$transaction->markEmailAsSent();
+		$transaction->save();
 	}
 
 	public function setPostFinanceCheckoutPaid(){

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # OXID 6.X
 
-v1.0.42, 2023-1
+v1.0.43, 2023-3
 
 This repository contains the OXID  PostFinance Checkout payment module that enables the shop to process payments with [PostFinance Checkout](https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html).
 
@@ -33,8 +33,8 @@ Support queries can be issued on the [PostFinance Checkout support site](https:/
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.42/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.43/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.42/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.43/LICENSE) for more information.
diff --git a/docs/2_fix_token.sql → docs/2_fix_token_migration.sql b/docs/2_fix_token.sql → docs/2_fix_token_migration.sql
diff --git a/docs/3_fix_emails_optimistic_locking_migration.sql b/docs/3_fix_emails_optimistic_locking_migration.sql
@@ -0,0 +1 @@
+ALTER TABLE `pfcPostFinanceCheckout_transaction` ADD `PFCEMAILSENT` bool DEFAULT '0';
diff --git a/docs/README.md b/docs/README.md
@@ -2,7 +2,7 @@
 
 # OXID 6.X
 
-v1.0.42, 2023-1
+v1.0.43, 2023-3
 
 This repository contains the OXID  PostFinance Checkout payment module that enables the shop to process payments with [PostFinance Checkout](https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html).
 
@@ -33,8 +33,8 @@ Support queries can be issued on the [PostFinance Checkout support site](https:/
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.42/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.43/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.42/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.43/LICENSE) for more information.
diff --git 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/oxid-6.0/releases/tag/1.0.42/">
+		<a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.43/">
 			Source
 		</a>
 	</li>
@@ -49,7 +49,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.42/">Download</a> the extension.</p>
+<p><a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.43/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload them to the root directory of your store using FTP/SSH.</p>

diff --git a/metadata.php b/metadata.php
@@ -29,7 +29,7 @@
         'en' => 'PFC PostFinanceCheckout Module'
     ),
     'thumbnail' => 'out/pictures/picture.png',
-    'version' => '1.0.42',
+    'version' => '1.0.43',
     'author' => 'customweb GmbH',
     'url' => 'https://www.customweb.com',
     'email' => 'info@customweb.com',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE `pfcPostFinanceCheckout_transaction` ADD `PFCEMAILSENT` bool DEFAULT '0';