From 544529348a30c5c2bebf93e9ee7600266b5d0de7 Mon Sep 17 00:00:00 2001 From: Frey Mansikkaniemi Date: Sun, 6 Sep 2020 21:00:45 +0800 Subject: [PATCH 1/7] Bugfix --- hong-kong-fps-woo-payment.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php index 95f5388..81fe640 100644 --- a/hong-kong-fps-woo-payment.php +++ b/hong-kong-fps-woo-payment.php @@ -60,15 +60,18 @@ function its_wpf_add_class( $methods ){ add_action( 'init', 'its_wpf_qrcode_catch', 0 ); function its_wpf_qrcode_catch() { - $qrcode_string = $_REQUEST['generate_fps_qrcode']; - $nonce = $_REQUEST['_wpnonce']; - if( $qrcode_string && $nonce && wp_verify_nonce( $nonce, ITS_WPF_PLUGIN_ID ) ) + if(isset($_REQUEST['generate_fps_qrcode']) && isset($_REQUEST['_wpnonce'])) { - require_once('libs/phpqrcode.php'); - ob_clean(); //Clean the output buffer before printing out image - header('Content-Type: image/png'); - QRcode::png($qrcode_string,false,QR_ECLEVEL_H); - exit(); + $qrcode_string = $_REQUEST['generate_fps_qrcode']; + $nonce = $_REQUEST['_wpnonce']; + if( $qrcode_string && $nonce && wp_verify_nonce( $nonce, ITS_WPF_PLUGIN_ID ) ) + { + require_once('libs/phpqrcode.php'); + ob_clean(); //Clean the output buffer before printing out image + header('Content-Type: image/png'); + QRcode::png($qrcode_string,false,QR_ECLEVEL_H); + exit(); + } } } From 102b41354dcbeaf2073af2f5d7fbd11f577561b1 Mon Sep 17 00:00:00 2001 From: Frey Mansikkaniemi Date: Sun, 6 Sep 2020 21:09:47 +0800 Subject: [PATCH 2/7] Register query vars for troubleshooting --- hong-kong-fps-woo-payment.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php index 81fe640..01e7dcf 100644 --- a/hong-kong-fps-woo-payment.php +++ b/hong-kong-fps-woo-payment.php @@ -53,6 +53,18 @@ function its_wpf_add_class( $methods ){ } +/** + * Reqister query var for qrcode image generation + */ + +add_filter( 'query_vars', 'its_wpf_qrcode_add_var' ); +function its_wpf_qrcode_add_var( $vars ) +{ + $vars[] = 'generate_fps_qrcode'; + $vars[] = '_wpnonce'; + return $vars; +} + /** * Print out qr code when the right query var is found */ From 4bf51e177852e118ac61ca6af593604bd52ab3ac Mon Sep 17 00:00:00 2001 From: Frey Mansikkaniemi Date: Sun, 6 Sep 2020 21:13:46 +0800 Subject: [PATCH 3/7] Bumped up version --- README.md | 3 +++ hong-kong-fps-woo-payment.php | 4 ++-- readme.txt | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f416dbf..fe3e3d2 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,9 @@ $ git clone https://github.com/invite-frey/is-woo-payment-fps.git * Output QR Code at a higher priority during WP startup * Form validation for the Payment Gateway settings +### 1.31 +* Bug fixes + ## Donations Donations are much appreciated if you found this resource useful. diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php index 01e7dcf..07753e2 100644 --- a/hong-kong-fps-woo-payment.php +++ b/hong-kong-fps-woo-payment.php @@ -1,14 +1,14 @@ Date: Mon, 7 Sep 2020 10:47:08 +0800 Subject: [PATCH 4/7] Added option to cache qrcodrs in file --- .gitignore | 3 +- qrcodes/readme.txt | 1 + ...teway-invite-fps-payment-gateway-class.php | 33 ++++++++++++++++--- 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 qrcodes/readme.txt diff --git a/.gitignore b/.gitignore index 3a01c2d..04095c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ._* .fuse_* -.DS_Store \ No newline at end of file +.DS_Store +qrcodes/*.png \ No newline at end of file diff --git a/qrcodes/readme.txt b/qrcodes/readme.txt new file mode 100644 index 0000000..cee8006 --- /dev/null +++ b/qrcodes/readme.txt @@ -0,0 +1 @@ +Dynamically generated qrcodes are saved here diff --git a/wc-gateway-invite-fps-payment-gateway-class.php b/wc-gateway-invite-fps-payment-gateway-class.php index 0c63957..1daa14e 100644 --- a/wc-gateway-invite-fps-payment-gateway-class.php +++ b/wc-gateway-invite-fps-payment-gateway-class.php @@ -24,6 +24,7 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){ $this->account_bank_code = $this->get_option( 'account_bank_code' ); $this->ask_to_pay = $this->get_option( 'ask_to_pay' ); $this->fps_payment_reference_guide = $this->get_option( 'fps_payment_reference_guide' ); + $this->write_qr_code_to_file = $this->get_option('write_qr_code_to_file'); add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) ); } @@ -83,6 +84,13 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){ 'description' => __('The ask to pay function must be enabled by your bank in order to use payment reference numbers.',ITS_WPF_PLUGIN_ID), 'default' => 'no' ), + 'write_qr_code_to_file' => array( + 'title' => __('Write QRCode to file',ITS_WPF_PLUGIN_ID), + 'label' => __('Write QRCode to file',ITS_WPF_PLUGIN_ID), + 'type' => 'checkbox', + 'description' => __('Enable this option if the QRCode does not show up, or if you want to cache each generated QRCode to a file for reuse. Provides better performance if the total amount is often the same.',ITS_WPF_PLUGIN_ID), + 'default' => 'no' + ), ); } @@ -233,6 +241,18 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){ return $url; } + + private function qrcode_file_url($data_string){ + $path = plugin_dir_path( __FILE__ ) . "qrcodes/"; + $filename = md5($data_string) . '.png'; + + if( !file_exists($path . $filename) ){ + require_once('libs/phpqrcode.php'); + QRcode::png($data_string,$path . $filename,QR_ECLEVEL_H); + } + + return plugin_dir_url( __FILE__ ) . "qrcodes/" . $filename; + } public function payment_fields() { @@ -249,11 +269,14 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){ $fps_data['currency'] = $fps_data['curr']; $qrcode = new ITS_FPS_QRCodeData($fps_data); - $qr_code_url = add_query_arg( - '_wpnonce', - wp_create_nonce(ITS_WPF_PLUGIN_ID), - get_site_url() . '/?generate_fps_qrcode=' . urlencode($qrcode->getDataString()) - ); + $qr_code_url = + $this->write_qr_code_to_file ? + $this->qrcode_file_url($qrcode->getDataString()) : + add_query_arg( + '_wpnonce', + wp_create_nonce(ITS_WPF_PLUGIN_ID), + get_site_url() . '/?generate_fps_qrcode=' . urlencode($qrcode->getDataString()) + ); if ( $this->description ) { echo wpautop( wp_kses_post( $this->description ) ); From c4c3991890d469e2cecefcf794b129af7e4502c6 Mon Sep 17 00:00:00 2001 From: Frey Mansikkaniemi Date: Mon, 7 Sep 2020 10:50:11 +0800 Subject: [PATCH 5/7] Bumped up the version --- README.md | 3 +++ hong-kong-fps-woo-payment.php | 4 ++-- readme.txt | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe3e3d2..b560f05 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,9 @@ $ git clone https://github.com/invite-frey/is-woo-payment-fps.git ### 1.31 * Bug fixes +### 1.4 +* Optional QRCode caching added + ## Donations Donations are much appreciated if you found this resource useful. diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php index 07753e2..4141fba 100644 --- a/hong-kong-fps-woo-payment.php +++ b/hong-kong-fps-woo-payment.php @@ -1,14 +1,14 @@ Date: Mon, 7 Sep 2020 11:09:10 +0800 Subject: [PATCH 6/7] Bugfix --- README.md | 3 +++ hong-kong-fps-woo-payment.php | 4 ++-- readme.txt | 3 +++ wc-gateway-invite-fps-payment-gateway-class.php | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b560f05..0539151 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,9 @@ $ git clone https://github.com/invite-frey/is-woo-payment-fps.git ### 1.4 * Optional QRCode caching added +### 1.41 +* Bugfix + ## Donations Donations are much appreciated if you found this resource useful. diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php index 4141fba..ea9bc23 100644 --- a/hong-kong-fps-woo-payment.php +++ b/hong-kong-fps-woo-payment.php @@ -1,14 +1,14 @@ write_qr_code_to_file ? + $this->write_qr_code_to_file === 'yes' ? $this->qrcode_file_url($qrcode->getDataString()) : add_query_arg( '_wpnonce', From 14d4d6f9318e34aaf59ff0728859a9424b784694 Mon Sep 17 00:00:00 2001 From: Frey Mansikkaniemi Date: Mon, 7 Sep 2020 18:40:39 +0800 Subject: [PATCH 7/7] Empty lines removed --- hong-kong-fps-woo-payment.php | 3 +-- its-fps-qrcodedata-class.php | 2 +- wc-gateway-invite-fps-payment-gateway-class.php | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php index ea9bc23..6190d84 100644 --- a/hong-kong-fps-woo-payment.php +++ b/hong-kong-fps-woo-payment.php @@ -134,5 +134,4 @@ function its_wpf_init_fps_qrcode_class(){ require_once 'its-fps-qrcodedata-class.php'; } -?> - +?> \ No newline at end of file diff --git a/its-fps-qrcodedata-class.php b/its-fps-qrcodedata-class.php index ff2f694..b5da6bf 100644 --- a/its-fps-qrcodedata-class.php +++ b/its-fps-qrcodedata-class.php @@ -146,4 +146,4 @@ if( !class_exists('ITS_FPS_QRCodeData') ){ } } -?> +?> \ No newline at end of file diff --git a/wc-gateway-invite-fps-payment-gateway-class.php b/wc-gateway-invite-fps-payment-gateway-class.php index ae42596..f5037d4 100644 --- a/wc-gateway-invite-fps-payment-gateway-class.php +++ b/wc-gateway-invite-fps-payment-gateway-class.php @@ -352,7 +352,4 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){ } } } - - - -?> +?> \ No newline at end of file