From 4c0bf0e8cc87561b60ed01d7535d4a0d368e2c60 Mon Sep 17 00:00:00 2001
From: Aashish Gurung <101558497+aashishgurung@users.noreply.github.com>
Date: Fri, 29 Sep 2023 12:36:52 +0700
Subject: [PATCH 1/2] Added instructions in thank you page for promptpay
 payment. (#404)

* Added instructions in thank you page for promptpay payment.

* Moved instructions below QR code.

* Updated instruction title and changed unordered list to ordered list.

* Changed text 'Payment expires in' to 'Payment expires at'

* Removed period from a bullet point.

---------

Co-authored-by: Aashish <aashish@omise.co>
---
 assets/css/omise-css.css                          | 10 ++++++++++
 .../gateway/class-omise-payment-promptpay.php     | 15 +++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/assets/css/omise-css.css b/assets/css/omise-css.css
index ae4037a4..8247d58d 100644
--- a/assets/css/omise-css.css
+++ b/assets/css/omise-css.css
@@ -595,3 +595,13 @@ line-height: 2;
     width: 100%;
 	margin-bottom: 1rem;
 }
+
+.qr-alert-box {
+	padding: 15px;
+	margin: 20px 0;
+	border: 1px solid black;
+}
+
+.align-left {
+	text-align: left;
+}
diff --git a/includes/gateway/class-omise-payment-promptpay.php b/includes/gateway/class-omise-payment-promptpay.php
index 8de9b69c..6f09506f 100644
--- a/includes/gateway/class-omise-payment-promptpay.php
+++ b/includes/gateway/class-omise-payment-promptpay.php
@@ -132,13 +132,14 @@ public function display_qrcode( $order, $context = 'view' ) {
 
 		if ( 'view' === $context ) : ?>
 			<div id="omise-offline-additional-details" class="omise omise-additional-payment-details-box omise-promptpay-details" <?php echo 'email' === $context ? 'style="margin-bottom: 4em; text-align:center;"' : ''; ?>>
-				<p><?php echo __( 'Scan the QR code to pay', 'omise' ); ?></p>
+				<p><strong><?php echo __( 'Scan the QR code to pay', 'omise' ); ?></strong></p>
+
 				<div class="omise omise-promptpay-qrcode" alt="Opn Payments QR code ID: <?php echo $charge['source']['scannable_code']['image']['id']; ?>">
 					<?php $this->load_qr_svg_to_DOM($qrcode, 'omise-promptpay-qrcode-svg') ?>
 				</div>
 				<a id="omise-download-promptpay-qr" class="omise-download-promptpay-qr" href="<?php echo $qrcode ?>" download="qr_code.svg">Download QR</a>
 				<div>
-					<?php echo __( 'Payment expires in: ', 'omise' ); ?>
+					<?php echo __( 'Payment expires at: ', 'omise' ); ?>
 					<?php echo wc_format_datetime( $expires_datetime, wc_date_format() ); ?>
 					<?php echo wc_format_datetime( $expires_datetime, wc_time_format() ); ?>
 				</div>
@@ -146,6 +147,16 @@ public function display_qrcode( $order, $context = 'view' ) {
 				<div id="omise-offline-payment-timeout" style="margin-top: 2em; display: none;">
 					<p><button id="omise-offline-payment-refresh-status">refresh status</button></p>
 				</div>
+
+				<div class="qr-alert-box">
+					<p><strong>To make payment:</strong></p>
+					<ol class="align-left">
+						<li>Download the QR code or open your preferred bank app to scan it</li>
+						<li>Check that the payment details are correct</li>
+						<li>Import the QR code image into your bank app or scan the QR code with your bank app to pay</li>
+						<li>Share the payment slip from your bank app to the seller</li>
+					</ol>
+				</div>
 			</div>
 
 			<div id="omise-offline-payment-result" class="omise-additional-payment-details-box" style="display: none;"></div>

From 33be8552a58346dc27b539c3d153163907de7047 Mon Sep 17 00:00:00 2001
From: Aashish <aashish@omise.co>
Date: Tue, 3 Oct 2023 13:45:18 +0700
Subject: [PATCH 2/2] Bump version to v5.4.1.

---
 CHANGELOG.md          | 3 +++
 omise-woocommerce.php | 4 ++--
 readme.txt            | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 935dd617..585eafb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+### [v5.4.1 _(Oct 3, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v5.4.1)
+- Added payment instructions in thank you page for PromptPay payment. (PR [#401](https://github.com/omise/omise-woocommerce/pull/404))
+
 ### [v5.4.0 _(Sep 21, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v5.4.0)
 - Added OCBC Digital for Singapore PSP. (PR [#401](https://github.com/omise/omise-woocommerce/pull/401))
 
diff --git a/omise-woocommerce.php b/omise-woocommerce.php
index fd1b3df6..d03f9513 100644
--- a/omise-woocommerce.php
+++ b/omise-woocommerce.php
@@ -4,7 +4,7 @@
  * Plugin Name: Opn Payments
  * Plugin URI:  https://www.omise.co/woocommerce
  * Description: Opn Payments is a WordPress plugin designed specifically for WooCommerce. The plugin adds support for Opn Payments Payment Gateway's payment methods to WooCommerce.
- * Version:     5.4.0
+ * Version:     5.4.1
  * Author:      Opn Payments and contributors
  * Author URI:  https://github.com/omise/omise-woocommerce/graphs/contributors
  * Text Domain: omise
@@ -22,7 +22,7 @@ class Omise
 	 *
 	 * @var string
 	 */
-	public $version = '5.4.0';
+	public $version = '5.4.1';
 
 	/**
 	 * The Omise Instance.
diff --git a/readme.txt b/readme.txt
index 1f57bf7f..aeb03786 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Opn Payments
 Tags: opn payments, payment, payment gateway, woocommerce plugin, omise, opn, installment, internet banking, alipay, paynow, truemoney wallet, woocommerce payment
 Requires at least: 4.3.1
 Tested up to: 6.0.2
-Stable tag: 5.4.0
+Stable tag: 5.4.1
 License: MIT
 License URI: https://opensource.org/licenses/MIT
 
@@ -34,6 +34,10 @@ From there:
 
 == Changelog ==
 
+= 5.4.1 =
+
+- Added payment instructions in thank you page for PromptPay payment. (PR [#401](https://github.com/omise/omise-woocommerce/pull/404))
+
 = 5.4.0 =
 
 - Added OCBC Digital for Singapore PSP. (PR [#401](https://github.com/omise/omise-woocommerce/pull/401))