Update README.md

Changed donations section.

.gitignore

@@ -1,3 +1,4 @@
 ._*
 .fuse_*
-.DS_Store
+.DS_Store
+qrcodes/*.png

README.md

@@ -53,14 +53,31 @@ $ 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
+
+### 1.4
+* Optional QRCode caching added
+
+### 1.41
+* Bugfix
+
+### 1.42
+* QRCodes always cached to disk due to browser incompatibility issues with dynamic generation.
+* Fixed bug preventing headers to be output on some systems
+
+### 1.43
+* Minor bug fixes
+
+### 1.44 
+* base64 encoded png qrcode
+
 ## Donations
 
 Donations are much appreciated if you found this resource useful. 
 
-* Bitcoin: 32AULufQ6AUzq9jKZdcLjSxfePZbsqQKEp
+Bitcoin, Lightning Network and most major credit cards available for donations at [https://frey.hk](https://frey.hk).
-* BTC Lightning via tippin.me: [https://tippin.me/@freyhk](https://tippin.me/@freyhk)
-* [Other forms of payment](https://frey.hk/#donations)
 
 ## License
 
-This project is licensed under the LGPL 3 License - see the [LICENSE.md](LICENSE.md) file for details
+This project is licensed under the LGPL 3 License - see the [LICENSE.md](LICENSE.md) file for details

hong-kong-fps-woo-payment.php

@@ -1,18 +1,18 @@
 <?php 
 /**
  * @package Hong_Kong_FPS_Woo_Payment
- * @version 1.3
+ * @version 1.44
  */
 /*
 Plugin Name: Hong Kong FPS Woo Payment
 Plugin URI: https://github.com/invite-frey/is-woo-payment-fps
 Description: Woocommerce payment method enabling Hong Kong FPS payments. Displays QR code and FPS payent if to user. Requires manual confirmation.
-Author: Frey Mansikkaniemi, invITe Services
+Author: invITe Services
-Version: 1.3
+Version: 1.44
 Author URI: http://frey.hk/
 License: GPLv3
 */
-
+ 
 if (!defined('ABSPATH')) {
     return;
 }
@@ -53,32 +53,13 @@ function its_wpf_add_class( $methods ){
 }
 
 
-/**
- * Print out qr code when the right query var is found
- */
-
-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 ) )
-    {
-        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();
-    }
-}
-
 /**
  * Change text on the Pay order button.
  */
 
 add_filter('woocommerce_available_payment_gateways', 'its_wpf_pay_order_label');
 function its_wpf_pay_order_label($gateways) {
-    if($gateways[ITS_WPF_PLUGIN_ID]) {
+    if(!empty($gateways[ITS_WPF_PLUGIN_ID])) {
         $gateways[ITS_WPF_PLUGIN_ID]->order_button_text = __('Confirm FPS Payment Completed',ITS_WPF_PLUGIN_ID);
     }
     return $gateways;
@@ -118,6 +99,3 @@ add_action('init', 'its_wpf_init_fps_qrcode_class');
 function its_wpf_init_fps_qrcode_class(){
     require_once 'its-fps-qrcodedata-class.php';
 }
-
-?>
-

its-fps-qrcodedata-class.php

@@ -144,6 +144,4 @@ if( !class_exists('ITS_FPS_QRCodeData') ){
     
         }
     }
-}
+}
-
-?>

qrcodes/readme.txt

@@ -0,0 +1 @@
+Dynamically generated qrcodes are saved here

readme.txt

@@ -58,3 +58,22 @@ Enables [FPS](https://www.hkma.gov.hk/eng/key-functions/international-financial-
 = 1.3 =
 * Output QR Code at a higher priority during WP startup
 * Form validation for the Payment Gateway settings
+
+= 1.31 =
+* Bug fixes
+
+= 1.4 =
+* Optional QRCode caching added
+
+= 1.41 =
+* Bugfix
+
+= 1.42 =
+* QRCodes always cached to disk due to browser incompatibility issues with dynamic generation.
+* Fixed bug preventing headers to be output on some systems
+
+= 1.43 =  
+* Minor bugfixes
+
+= 1.44 =
+* base64 encoded png qrcode

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' ) );
         }
@@ -73,7 +74,7 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
                 'fps_payment_reference_guide' => array(
                     'title'       => __('Payment Reference Guide',ITS_WPF_PLUGIN_ID),
                     'type'        => 'textarea',
-                    'default'     => __('Please input the payment reference number below after payment has been completed.',ITS_WPF_PLUGIN_ID),
+                    'default'     => __('Please use the code below as a Message to Payee when initiating the transaction in your bank\'s app.',ITS_WPF_PLUGIN_ID),
                     'description' => __('Instructions visible to the customer for providing payment reference number after payment. This is not visble of Ask to Pay is active.',ITS_WPF_PLUGIN_ID)
                 ),
                 'ask_to_pay' => array(
@@ -233,6 +234,22 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
     
             return $url;
         }
+
+        private function qrcode_img_data($data_string){
+            /**
+             * Load the PHP QRcode library
+             */
+
+            if( !class_exists( 'QRtools' ) ){
+                require_once 'libs/phpqrcode.php';
+            }
+
+            $fp = fopen('php://memory','r+');
+            QRCode::png($data_string,$fp,QR_ECLEVEL_H);
+            rewind($fp);
+            $qrcode = stream_get_contents($fp);
+            return $qrcode;
+        }
     
         public function payment_fields() {
     
@@ -249,11 +266,7 @@ 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(
+            $qr_code_img = $this->qrcode_img_data($qrcode->getDataString());
-                '_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 ) );
@@ -280,7 +293,7 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
             }
             ?>
             <div class="form-row form-row-wide" style="text-align: center;">
-                <img src="<?php echo $qr_code_url?>">
+                <img style="margin: 0 auto;" src="data:image/png;base64,<?php echo base64_encode($qr_code_img); ?>" />
             </div>
     
             
@@ -329,7 +342,3 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
         } 
     }
 }
-
-
-
-?>