Changeset 2974591

Timestamp:

10/04/2023 08:12:34 AM (2 years ago)

Author:

hsuvant

Message:

Fixed issue with subscription payments being charged twice

Location:

visma-pay-embedded-card-payment-gateway/trunk

Files:

• build/blocks.asset.php (modified) (1 diff)
• build/blocks.js (modified) (1 diff)
• includes/blocks/visma_pay_embedded_card_blocks_support.php (modified) (1 diff)
• includes/lib/Visma/VismaPay.php (modified) (1 diff)
• languages/visma-pay-embedded-card-payment-gateway-fi-0a194271922d454324b7e88e0bfed673.json (modified) (1 diff)
• languages/visma-pay-embedded-card-payment-gateway-fi.mo (modified) (previous)
• languages/visma-pay-embedded-card-payment-gateway-fi.po (modified) (2 diffs)
• languages/visma-pay-embedded-card-payment-gateway.pot (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• visma-pay-embedded-card-payment-gateway.php (modified) (2 diffs)

visma-pay-embedded-card-payment-gateway/trunk/build/blocks.asset.php

@@ -1 @@
-<?php return array('dependencies' => array('wp-element', 'wp-i18n'), 'version' => 'c849462627304c2fe47d');
+<?php return array('dependencies' => array('wp-element', 'wp-i18n'), 'version' => 'eca14a32dee6a5fa52b7');

visma-pay-embedded-card-payment-gateway/trunk/build/blocks.js

@@ -1 @@
-!function(){"use strict";var e=window.wp.element,t=window.wp.i18n;const{registerPaymentMethod:a}=wc.wcBlocksRegistry,{getSetting:n}=wc.wcSettings,r="https://www.vismapay.com",s=n("vismapay_embedded_card_data",{}),c={generic:`${(0,t.__)("Something went wrong","visma-pay-embedded-card-payment-gateway")}.`,formInvalid:`${(0,t.__)("Please check the card information","visma-pay-embedded-card-payment-gateway")}.`},i=()=>(0,e.createElement)("div",{id:"pf-cc-form"},(0,e.createElement)("iframe",{scrolling:"no",id:"pf-cc-iframe",className:"intrinsic-ignore",height:"220px",style:{border:"none",width:"100%"},src:`${r}/e-payments/embedded_card_form?lang=${s.lang}`})),m=()=>(s.visa||s.master||s.amex||s.diners)&&(0,e.createElement)("div",{className:"vpe-card-brand-row"},s.visa&&(0,e.createElement)(e.Fragment,null,(0,e.createElement)(l,{imgSrc:"visa.png",imgAlt:"Visa",imgClassNames:"visa"}),(0,e.createElement)(l,{imgSrc:"verified.png",imgAlt:"Verified by Visa",imgClassNames:"verified"})),s.mastercard&&(0,e.createElement)(e.Fragment,null,(0,e.createElement)(l,{imgSrc:"mastercard.png",imgAlt:"MasterCard"}),(0,e.createElement)(l,{imgSrc:"securecode.png",imgAlt:"MasterCard SecureCode"})),s.amex&&(0,e.createElement)(l,{imgSrc:"americanexpress.png",imgAlt:"America Express"}),s.diners&&(0,e.createElement)(l,{imgSrc:"dinersclub.png",imgAlt:"Diners"}),(0,e.createElement)("div",{style:{display:"block",clear:"both"}})),l=({imgSrc:t,imgAlt:a,imgClassNames:n=""})=>(0,e.createElement)("div",{className:"vpe-card-brand-container"},(0,e.createElement)("img",{className:`vpe-card-brand-logo ${n}`,src:`${s.imgUrl}/${t}`,alt:a})),d=({eventRegistration:a,emitResponse:n,components:s})=>{const{onCheckoutValidation:l,onPaymentSetup:d,onCheckoutSuccess:o,onCheckoutFail:g}=a,{responseTypes:p}=n,{LoadingMask:u}=s,[y,f]=(0,e.useState)(!1);let E=null;const v=e=>{if(e.origin!==r)return;let t=null;try{t=JSON.parse(e.data)}catch(e){}E=null!==t&&void 0!==t.valid&&!0===t.valid},w=async(e=3e3)=>{let t=!0,a=!1;for(setTimeout((()=>{null===E&&(t=!1)}),e);t&&!a;)if(null!==E)a=!0;else{const e=new Promise((e=>{setTimeout(e,100)}));await e}if(null===E)return Promise.reject()};(0,e.useEffect)((()=>(window.addEventListener("message",v),()=>{window.removeEventListener("message",v)})),[]),(0,e.useEffect)((()=>{const e=l((async()=>{f(!0);const e=document.querySelector("#pf-cc-iframe");if(!e)return f(!1),{errorMessage:c.generic};e.contentWindow.postMessage(JSON.stringify({action:"validate"}),r);try{await w()}catch(e){return f(!1),{errorMessage:c.generic}}return!!E||(f(!1),{errorMessage:c.formInvalid})}));return()=>{e()}}),[l]),(0,e.useEffect)((()=>{const e=d((()=>({type:p.SUCCESS,meta:{paymentMethodData:{payment_method:"visma_pay_embedded_card"}}})));return()=>{e()}}),[p.SUCCESS,d]),(0,e.useEffect)((()=>{const e=o((async e=>{const t=e?.processingResponse;if(t&&"success"===t?.paymentStatus&&"success"===t?.paymentDetails?.result&&t.paymentDetails.bpf_token){const e=document.querySelector("#pf-cc-iframe");if(!e)return f(!1),{type:p.ERROR,message:c.generic};const a={action:"pay",token:t.paymentDetails.bpf_token};e.contentWindow.postMessage(JSON.stringify(a),r);try{await w(5e3)}catch(e){return f(!1),{type:p.ERROR,message:c.generic}}return!!E||(f(!1),{type:p.ERROR,message:c.formInvalid})}return f(!1),{type:p.ERROR,message:c.generic}}));return()=>{e()}}),[p.ERROR,p.SUCCESS,o]),(0,e.useEffect)((()=>{const e=g((e=>(f(!1),!0)));return()=>{e()}}),[g]);const S=(0,e.createElement)("div",{id:"visma-pay-embedded-card-payment-content"},(0,e.createElement)("p",null,(0,t.__)("Payment card","visma-pay-embedded-card-payment-gateway")),(0,e.createElement)(i,null),(0,e.createElement)(m,null));return(0,e.createElement)(u,{isLoading:y,showSpinner:!0},S)};a({name:"visma_pay_embedded_card",label:(0,e.createElement)((t=>{const{PaymentMethodLabel:a}=t.components;return(0,e.createElement)(a,{text:s.title})}),null),ariaLabel:s.title,content:(0,e.createElement)(d,null),edit:(0,e.createElement)(d,null),canMakePayment:()=>!0,paymentMethodId:"visma_pay_embedded_card"})}();
+!function(){"use strict";var e=window.wp.element,t=window.wp.i18n;const{registerPaymentMethod:a}=wc.wcBlocksRegistry,{getSetting:n}=wc.wcSettings,r="https://www.vismapay.com",s=n("vismapay_embedded_card_data",{}),c={generic:`${(0,t.__)("Something went wrong","visma-pay-embedded-card-payment-gateway")}.`,formInvalid:`${(0,t.__)("Please check the card information","visma-pay-embedded-card-payment-gateway")}.`},i=()=>(0,e.createElement)("div",{id:"pf-cc-form"},(0,e.createElement)("iframe",{scrolling:"no",id:"pf-cc-iframe",className:"intrinsic-ignore",height:"220px",style:{border:"none",width:"100%"},src:`${r}/e-payments/embedded_card_form?lang=${s.lang}`})),m=()=>(s.visa||s.master||s.amex||s.diners)&&(0,e.createElement)("div",{className:"vpe-card-brand-row"},s.visa&&(0,e.createElement)(e.Fragment,null,(0,e.createElement)(l,{imgSrc:"visa.png",imgAlt:"Visa",imgClassNames:"visa"}),(0,e.createElement)(l,{imgSrc:"verified.png",imgAlt:"Verified by Visa",imgClassNames:"verified"})),s.mastercard&&(0,e.createElement)(e.Fragment,null,(0,e.createElement)(l,{imgSrc:"mastercard.png",imgAlt:"MasterCard"}),(0,e.createElement)(l,{imgSrc:"securecode.png",imgAlt:"MasterCard SecureCode"})),s.amex&&(0,e.createElement)(l,{imgSrc:"americanexpress.png",imgAlt:"America Express"}),s.diners&&(0,e.createElement)(l,{imgSrc:"dinersclub.png",imgAlt:"Diners"}),(0,e.createElement)("div",{style:{display:"block",clear:"both"}})),l=({imgSrc:t,imgAlt:a,imgClassNames:n=""})=>(0,e.createElement)("div",{className:"vpe-card-brand-container"},(0,e.createElement)("img",{className:`vpe-card-brand-logo ${n}`,src:`${s.imgUrl}/${t}`,alt:a})),o=({eventRegistration:a,emitResponse:n,components:s})=>{const{onCheckoutValidation:l,onPaymentSetup:o,onCheckoutSuccess:d,onCheckoutFail:g}=a,{responseTypes:p}=n,{LoadingMask:u}=s,[y,f]=(0,e.useState)(!1);let E=null;const v=e=>{if(e.origin!==r)return;let t=null;try{t=JSON.parse(e.data)}catch(e){}E=null!==t&&void 0!==t.valid&&!0===t.valid},w=async(e=3e3)=>{let t=!0,a=!1;for(setTimeout((()=>{null===E&&(t=!1)}),e);t&&!a;)if(null!==E)a=!0;else{const e=new Promise((e=>{setTimeout(e,100)}));await e}if(null===E)return Promise.reject()};(0,e.useEffect)((()=>(window.addEventListener("message",v),()=>{window.removeEventListener("message",v)})),[]),(0,e.useEffect)((()=>{const e=l((async()=>{f(!0);const e=document.querySelector("#pf-cc-iframe");if(!e)return f(!1),{errorMessage:c.generic};e.contentWindow.postMessage(JSON.stringify({action:"validate"}),r);try{await w()}catch(e){return f(!1),{errorMessage:c.generic}}return!!E||(f(!1),{errorMessage:c.formInvalid})}));return()=>{e()}}),[l]),(0,e.useEffect)((()=>{const e=o((()=>({type:p.SUCCESS,meta:{paymentMethodData:{payment_method:"visma_pay_embedded_card"}}})));return()=>{e()}}),[p.SUCCESS,o]),(0,e.useEffect)((()=>{const e=d((async e=>{const t=e?.processingResponse;if(t&&"success"===t?.paymentStatus&&"success"===t?.paymentDetails?.result&&t.paymentDetails.bpf_token){const e=document.querySelector("#pf-cc-iframe");if(!e)return f(!1),{type:p.ERROR,message:c.generic};const a={action:"pay",token:t.paymentDetails.bpf_token};e.contentWindow.postMessage(JSON.stringify(a),r);try{await w(5e3)}catch(e){return f(!1),{type:p.ERROR,message:c.generic}}return!!E||(f(!1),{type:p.ERROR,message:c.formInvalid})}return f(!1),{type:p.ERROR,message:c.generic}}));return()=>{e()}}),[p.ERROR,p.SUCCESS,d]),(0,e.useEffect)((()=>{const e=g((e=>(f(!1),!0)));return()=>{e()}}),[g]);const S=(0,e.createElement)("div",{id:"visma-pay-embedded-card-payment-content"},(0,e.createElement)("p",null,(0,t.__)("Payment card","visma-pay-embedded-card-payment-gateway")),(0,e.createElement)(i,null),(0,e.createElement)(m,null));return(0,e.createElement)(u,{isLoading:y,showSpinner:!0},S)};a({name:"visma_pay_embedded_card",label:(0,e.createElement)((t=>{const{PaymentMethodLabel:a}=t.components;return(0,e.createElement)(a,{text:s.title})}),null),ariaLabel:s.title,content:(0,e.createElement)(o,null),edit:(0,e.createElement)(o,null),canMakePayment:()=>!0,paymentMethodId:"visma_pay_embedded_card",supports:{features:s.supports}})}();

visma-pay-embedded-card-payment-gateway/trunk/includes/blocks/visma_pay_embedded_card_blocks_support.php

@@ -11 +11 @@
     {
         $this->settings = get_option('woocommerce_visma_pay_embedded_card_settings', []);
-        $this->gateway = new WC_Gateway_visma_pay_embedded_card();
+        $payment_gateways_class = WC()->payment_gateways();
+        $payment_gateways = $payment_gateways_class->payment_gateways();
+        $this->gateway = $payment_gateways['visma_pay_embedded_card'];
     }
 

visma-pay-embedded-card-payment-gateway/trunk/includes/lib/Visma/VismaPay.php

@@ -71 +71 @@
             $payment_data['plugin_info'] .= '0';
 
-        $payment_data['plugin_info'] .= '|1.1.0';
+        $payment_data['plugin_info'] .= '|1.1.2';
 
         return $this->makeRequest($url, $payment_data);

visma-pay-embedded-card-payment-gateway/trunk/languages/visma-pay-embedded-card-payment-gateway-fi-0a194271922d454324b7e88e0bfed673.json

@@ -1 @@
-{"translation-revision-date":"2023-09-14 15:11+0300","generator":"WP-CLI\/2.8.1","source":"build\/blocks.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"fi","plural-forms":"nplurals=2; plural=n != 1;"},"Payment card":["Maksukortti"],"Something went wrong":["Jokin meni pieleen"],"Please check the card information":["Tarkista maksukortin tiedot"]}}}
+{"translation-revision-date":"2023-09-27 09:50+0300","generator":"WP-CLI\/2.8.1","source":"build\/blocks.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"fi","plural-forms":"nplurals=2; plural=n != 1;"},"Payment card":["Maksukortti"],"Something went wrong":["Jokin meni pieleen"],"Please check the card information":["Tarkista maksukortin tiedot"]}}}

visma-pay-embedded-card-payment-gateway/trunk/languages/visma-pay-embedded-card-payment-gateway-fi.po

@@ -4 +4 @@
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/visma-pay-"
 "embedded-card-payment-gateway\n"
-"POT-Creation-Date: 2023-09-21T13:11:01+00:00\n"
-"PO-Revision-Date: 2023-09-21 16:12+0300\n"
+"POT-Creation-Date: 2023-10-03T13:10:45+00:00\n"
+"PO-Revision-Date: 2023-10-03 16:11+0300\n"
 "Last-Translator: Visma Pay <[email protected]>\n"
 "Language-Team: Suomi\n"
@@ -13 +13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.4\n"
 "X-Loco-Version: 2.5.0; wp-5.6\n"
 

visma-pay-embedded-card-payment-gateway/trunk/languages/visma-pay-embedded-card-payment-gateway.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Visma Pay Embedded Card Payment Gateway 1.1.0\n"
+"Project-Id-Version: Visma Pay Embedded Card Payment Gateway 1.1.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/visma-pay-embedded-card-payment-gateway\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-09-21T13:11:01+00:00\n"
+"POT-Creation-Date: 2023-10-03T13:10:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"

visma-pay-embedded-card-payment-gateway/trunk/readme.txt

@@ -42 +42 @@
 == Changelog ==
 
+= 1.1.2 =
+* Fixed issue with subscription payments being charged twice
+
+= 1.1.1 =
+* Added files that were missing from 1.1.0
+
 = 1.1.0 =
 * Support for Woocommerce Blocks
@@ -47 +53 @@
 
 = 1.0.5 =
-* Support for HSOP
+* Support for HPOS
 * Updated 'tested up to' versions.
 

visma-pay-embedded-card-payment-gateway/trunk/visma-pay-embedded-card-payment-gateway.php

@@ -4 +4 @@
  * Plugin URI: https://www.vismapay.com/docs
  * Description: Visma Pay Payment Gateway Embedded Card Integration for Woocommerce
- * Version: 1.1.1
+ * Version: 1.1.2
  * Author: Visma
  * Author URI: https://www.visma.fi/vismapay/
@@ -885 +885 @@
                 $result = $payment->chargeWithCardToken();
 
-                $order->update_meta_data('visma_pay_embedded_card_return_code', $result->resul);
+                $order->update_meta_data('visma_pay_embedded_card_return_code', $result->result);
                 $order->save();