diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml index 85bc6f872..92739a80a 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/icons.yml @@ -1,56 +1,43 @@ -name: Embed icons automatically +name: Icon update on: push: + branches: [ develop ] + pull_request: + branches: [ develop ] + workflow_dispatch: jobs: - icons_embedding: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Embed icons automatically + - name: Clone media repository run: | - ls -l - mkdir ~/tmp - cd ~/tmp - ls -l - git clone https://github.com/buckaroo-it/Media - cd Media - ls -l - echo ${{ github.workspace }}/library/buckaroo_images/svg - mkdir -p ${{ github.workspace }}/library/buckaroo_images/svg - cp "Payment methods/SVG/AfterPay.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Alipay.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Apple Pay.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ApplePay.svg - cp "Payment methods/SVG/Bancontact.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Belfius.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Billink.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/CBC.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/CreditClick.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Creditcards.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/EPS.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Giftcards.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Giropay.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/INGHomePay.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/In3.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/KBC.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Klarna.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/PayPal.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/PayPerEmail.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Payconiq.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Przelewy24.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/SEPA-directdebit.svg" ${{ github.workspace }}/library/buckaroo_images/svg/SEPAdirectdebit.svg - cp "Payment methods/SVG/SEPACreditTransfer.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Sofort.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Tinka.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/Trustly.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - cp "Payment methods/SVG/WeChat Pay.svg" ${{ github.workspace }}/library/buckaroo_images/svg/WeChatPay.svg - cp "Payment methods/SVG/iDEAL.svg" ${{ github.workspace }}/library/buckaroo_images/svg/ - ls -l ${{ github.workspace }}/library/buckaroo_images/svg - cd ${{ github.workspace }} - git config --global user.name "GitHub Actions Bot" - git config --global user.email "test@example.com" - git fetch - git add --all library/buckaroo_images/svg/ - if git commit -m 'Embed icons automatically' library/buckaroo_images/svg; then - echo ${GITHUB_REF} - git push origin HEAD:${GITHUB_REF} - fi + git clone https://github.com/buckaroo-it/Media + ls -lah + - name: Rename all files to lowercase + run: | + cd Media + cp ${{ github.workspace }}/.github/workflows/rename-icons.php ${{ github.workspace }}/Media/rename-icons.php + php ./rename-icons.php + - name: Copy payment method icons + run: | + cd Media + cp -R "Payment methods/SVG/." ${{ github.workspace }}/library/buckaroo_images/svg/ + cd ${{ github.workspace }}/library/buckaroo_images/svg/ + rm -f wechatpay.svg + rm -f vouchers.svg + rm -f trustly.svg + rm -f tinka.svg + rm -f alipay.svg + rm -f buckaroovoucher.svg + - name: Copy creditcards icons + run: | + cd Media + cp -R "Creditcard issuers/SVG/." ${{ github.workspace }}/library/buckaroo_images/creditcards/ + - name: Cleanup + run: | + rm -rd Media + - name: Create commit if we have changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Apply logo changes from media repository \ No newline at end of file diff --git a/.github/workflows/rename-icons.php b/.github/workflows/rename-icons.php new file mode 100644 index 000000000..6e553ebdd --- /dev/null +++ b/.github/workflows/rename-icons.php @@ -0,0 +1,13 @@ + $fio) { + $newname = $fio->getPath() . DIRECTORY_SEPARATOR . strtolower(str_replace(" ","",str_replace("&","-",$fio->getFilename()))); + echo $newname, "\r\n"; + rename($name, $newname); +} \ No newline at end of file diff --git a/WC_Buckaroo_Settings_Page.php b/WC_Buckaroo_Settings_Page.php index 87f8f3cc5..56ac94311 100644 --- a/WC_Buckaroo_Settings_Page.php +++ b/WC_Buckaroo_Settings_Page.php @@ -270,22 +270,24 @@ public function render_file_field($value) value="" class="" /> - +

- - - + + + + + {"use strict";var e;!function(e){!function(e){var t;e.validateCardNumber=function(e,t){if(null==e)return!1;if(/[^0-9]+/.test(e))return!1;if(e.length<10||e.length>19)return!1;for(var r=0,a=0;a9&&(n-=9),r+=n}if(r%10!=0)return!1;if(null==t)return!0;switch(t.toLowerCase()){case"visa":case"visaelectron":case"vpay":case"cartebleuevisa":case"dankort":return/^4[0-9]{12}(?:[0-9]{3})?$/.test(e);case"postepay":case"mastercard":return/^(5[1-5]|2[2-7])[0-9]{14}$/.test(e);case"bancontactmrcash":case"bancontact":return/^(4796|6060|6703|5613|5614)[0-9]{12,15}$/.test(e);case"maestro":return/^\d{12,19}$/.test(e);case"amex":case"americanexpress":return/^3[47][0-9]{13}$/.test(e);case"cartebancaire":case"cartasi":return/^((5[1-5]|2[2-7])[0-9]{14})|(4[0-9]{12}(?:[0-9]{3})?)$/.test(e);default:return!1}},e.validateCvc=function(e,t){if(null==e)return!1;if(null==t){if(0===e.length)return!0;if(3!==e.length&&4!==e.length)return!1}else switch(t.toLowerCase()){case"bancontactmrcash":case"bancontact":case"maestro":return 0===e.length;case"amex":case"americanexpress":if(4!==e.length)return!1;break;default:if(3!==e.length)return!1}return!/[^0-9]+/.test(e)},e.validateYear=function(e){return null!=e&&!/[^0-9]+/.test(e)&&(2===e.length||4===e.length)},e.validateMonth=function(e){if(null==e)return!1;if(/[^0-9]+/.test(e))return!1;if(1!==e.length&&2!==e.length)return!1;var t=parseInt(e);return!(t<1||t>12)},e.validateCardholderName=function(e){return null!=e&&!(null==(t=e)||t.replace(/\s/g,"").length<1);var t},function(e){e.algorithm="RSA-OAEP",e.hashName="SHA-1",e.exponent="AQAB",e.keyType="RSA",e.modulus="4NdLa7WIq-ygcTo4tGFu8ec7qRwtZ1jLEjKntXfs56gaWtaYSxc-er7ljG22rbv41T5raYfdzvPqV3YcTFCOLpdJIJkzTvorY-IDR09kN6uHKGutSjdkDpYrKFHeU_x0W7P0GUW2Sc14B7G_L8C2eMSqkDAMtANyvOCHdk_2chYOgYqIuZfInTaNEzHbYb6i-D5sKeu1D15G2uEFY-gkuLmtDq3xPUzK_G-haG4KsIL5JKbt-kV3_Dibu3OUpiMDN1YpocqaUR5soFmKiJi1PHtgQZ0aydXxveHIRhtE-5FgL7w307gOqbMJ4q3fXDAZQzKBwlNYnwgAaFW1PSzk9w",e.version="001",e.keyFormat="jwk",e.keyOperations=["encrypt"],e.publicKeyData={alg:e.algorithm,e:e.exponent,ext:!0,kty:e.keyType,n:e.modulus},e.algorithmParams={name:e.algorithm,hash:{name:e.hashName}}}(t||(t={}));var r=function(e){return btoa(String.fromCharCode.apply(null,e))},a=function(e,t,r,a,n){for(var o=unescape(encodeURIComponent(e+","+t+","+r+","+a+","+n)),i=[],l=0;l0||navigator.userAgent.match(/Trident.*rv\:11\./)?e.encryptCardDataIE(t,r,a,n,o,i):e.encryptCardDataOther(t,r,a,n,o).then((function(e){i(e)}),(function(e){console.log(e)}))}}(e.V001||(e.V001={}))}(e||(e={}));const t=e;jQuery((function(){(new class{listen(){let e=this;jQuery("body").on("change",'input[name="payment_method"]',(function(){jQuery("body").trigger("update_checkout")})),jQuery("body").on("updated_checkout",(function(t){e.afterpay(),e.afterpaynew(),e.bilink(),e.klarna()})),jQuery("#billing_company").on("input",(function(){e.bilink_toggle(jQuery(this).val()),jQuery("#buckaroo-afterpaynew-coc").parent().toggle(0!==jQuery.trim(jQuery(this).val()).length)})),jQuery("body").on("change","#buckaroo-in3-orderas",(function(){jQuery("#buckaroo-in3-coc-container, #buckaroo-in3-companyname-container").toggle("debtor"!==jQuery(this).val().toLowerCase())})),jQuery("body").on("change","#buckaroo-afterpay-b2b",(function(){let e=jQuery(this).is(":checked"),t=jQuery("#buckaroo-afterpay-birthdate"),r=t.parent(),a=jQuery('[name="buckaroo-afterpay-gender"]'),n=a.parent();jQuery("#showB2BBuckaroo").toggle(e),jQuery("#billing_company").length&&jQuery("#buckaroo-afterpay-CompanyName").val(jQuery("#billing_company").val()),t.prop("disabled",!e),r.toggle(!e),r.toggleClass("validate-required",!e),a.prop("disabled",!e),n.toggle(!e)}))}afterpay(){jQuery("input[name=billing_phone]").length&&jQuery("#buckaroo-afterpay-phone").parent().hide()}afterpaynew(){jQuery("input[name=billing_phone]").length&&jQuery("#buckaroo-afterpaynew-phone").parent().hide(),jQuery("#buckaroo-afterpaynew-coc").parent().toggle(0!==jQuery.trim(jQuery("input[name=billing_company]").val()).length)}bilink(){let e=jQuery("#billing_company");e.length&&this.bilink_toggle(e.val())}bilink_toggle(e){let t=jQuery("#buckaroo_billink_b2b"),r=jQuery("#buckaroo_billink_b2c");if(t.length&&r.length){var a=jQuery.trim(e).length>0;t.toggle(a),r.toggle(!a)}}klarna(){jQuery("input[name=billing_phone]").length&&jQuery('input[id^="buckaroo-klarna"][type="tel"]').parent().hide()}}).listen(),(new class{form=jQuery("form[name=checkout]");validator=t.V001;listen(){let e=this.validator,t=this;this.form.on("input",".cardNumber",(function(r){t.toggleClasses(e.validateCardNumber(r.target.value),r.target)})),this.form.on("input",".cvc",(function(r){t.toggleClasses(e.validateCvc(r.target.value),r.target)})),this.form.on("input",".cardHolderName",(function(r){t.toggleClasses(e.validateCardholderName(r.target.value),r.target)})),this.form.on("input",".expirationYear",(function(r){t.toggleClasses(e.validateYear(r.target.value),r.target)})),this.form.on("input",".expirationMonth",(function(r){t.toggleClasses(e.validateMonth(r.target.value),r.target)})),this.form.submit(this.submit.bind(this))}toggleClasses(e,t){(t=jQuery(t)).toggleClass("error",!e),t.toggleClass("validated",e),this.submit()}submit(e){let r=jQuery('input[name="payment_method"]:checked').parent(),a=r.find(".cardNumber").val(),n=r.find(".cvc").val(),o=r.find(".cardHolderName").val(),i=r.find(".expirationYear").val(),l=r.find(".expirationMonth").val(),u=t.V001.validateCardNumber(a),c=t.V001.validateCvc(n),s=t.V001.validateCardholderName(o),g=t.V001.validateYear(i),y=t.V001.validateMonth(l);u&&c&&s&&g&&y&&this.getEncryptedData(a,i,l,n,o,r)}getEncryptedData(e,r,a,n,o,i){t.V001.encryptCardData(e,r,a,n,o,(function(e){i.find(".encryptedCardData").val(e)}))}}).listen(),(new class{listen(){const e=this;jQuery("#buckaroo-idin-verify-button").click((()=>{jQuery("#buckaroo-idin-issuer")&&jQuery("#buckaroo-idin-issuer").val().length>1?e.identify(jQuery("#buckaroo-idin-issuer").val()):e.displayErrorMessage(buckaroo_global.idin_i18n.bank_required)}))}disableBlock(e){jQuery(e).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}identify(e){const t=this;t.disableBlock(".checkout.woocommerce-checkout"),jQuery.ajax({url:buckaroo_global.ajax_url,data:{"wc-api":"WC_Gateway_Buckaroo_idin-identify",issuer:e},dataType:"json"}).done((e=>{jQuery(".woocommerce-checkout").unblock(),e&&e.message?t.displayErrorMessage(e.message):e&&"success"==e.result?window.location.replace(e.redirect):t.displayErrorMessage(buckaroo_global.idin_i18n.general_error)})).fail((()=>{t.displayErrorMessage(buckaroo_global.idin_i18n.general_error),jQuery(".woocommerce-checkout").unblock()}))}displayErrorMessage(e){const t=` \n \n `;jQuery(".woocommerce-notices-wrapper").first().prepend(t);var r=jQuery(".woocommerce-notices-wrapper .woocommerce-error").first();setTimeout((function(){r.fadeOut(1e3)}),1e4),jQuery("html, body").scrollTop(0)}}).listen()}))})(); \ No newline at end of file +(()=>{"use strict";var e;!function(e){!function(e){var t;e.validateCardNumber=function(e,t){if(null==e)return!1;if(/[^0-9]+/.test(e))return!1;if(e.length<10||e.length>19)return!1;for(var r=0,a=0;a9&&(n-=9),r+=n}if(r%10!=0)return!1;if(null==t)return!0;switch(t.toLowerCase()){case"visa":case"visaelectron":case"vpay":case"cartebleuevisa":case"dankort":return/^4[0-9]{12}(?:[0-9]{3})?$/.test(e);case"postepay":case"mastercard":return/^(5[1-5]|2[2-7])[0-9]{14}$/.test(e);case"bancontactmrcash":case"bancontact":return/^(4796|6060|6703|5613|5614)[0-9]{12,15}$/.test(e);case"maestro":return/^\d{12,19}$/.test(e);case"amex":case"americanexpress":return/^3[47][0-9]{13}$/.test(e);case"cartebancaire":case"cartasi":return/^((5[1-5]|2[2-7])[0-9]{14})|(4[0-9]{12}(?:[0-9]{3})?)$/.test(e);default:return!1}},e.validateCvc=function(e,t){if(null==e)return!1;if(null==t){if(0===e.length)return!0;if(3!==e.length&&4!==e.length)return!1}else switch(t.toLowerCase()){case"bancontactmrcash":case"bancontact":case"maestro":return 0===e.length;case"amex":case"americanexpress":if(4!==e.length)return!1;break;default:if(3!==e.length)return!1}return!/[^0-9]+/.test(e)},e.validateYear=function(e){return null!=e&&!/[^0-9]+/.test(e)&&(2===e.length||4===e.length)},e.validateMonth=function(e){if(null==e)return!1;if(/[^0-9]+/.test(e))return!1;if(1!==e.length&&2!==e.length)return!1;var t=parseInt(e);return!(t<1||t>12)},e.validateCardholderName=function(e){return null!=e&&!(null==(t=e)||t.replace(/\s/g,"").length<1);var t},function(e){e.algorithm="RSA-OAEP",e.hashName="SHA-1",e.exponent="AQAB",e.keyType="RSA",e.modulus="4NdLa7WIq-ygcTo4tGFu8ec7qRwtZ1jLEjKntXfs56gaWtaYSxc-er7ljG22rbv41T5raYfdzvPqV3YcTFCOLpdJIJkzTvorY-IDR09kN6uHKGutSjdkDpYrKFHeU_x0W7P0GUW2Sc14B7G_L8C2eMSqkDAMtANyvOCHdk_2chYOgYqIuZfInTaNEzHbYb6i-D5sKeu1D15G2uEFY-gkuLmtDq3xPUzK_G-haG4KsIL5JKbt-kV3_Dibu3OUpiMDN1YpocqaUR5soFmKiJi1PHtgQZ0aydXxveHIRhtE-5FgL7w307gOqbMJ4q3fXDAZQzKBwlNYnwgAaFW1PSzk9w",e.version="001",e.keyFormat="jwk",e.keyOperations=["encrypt"],e.publicKeyData={alg:e.algorithm,e:e.exponent,ext:!0,kty:e.keyType,n:e.modulus},e.algorithmParams={name:e.algorithm,hash:{name:e.hashName}}}(t||(t={}));var r=function(e){return btoa(String.fromCharCode.apply(null,e))},a=function(e,t,r,a,n){for(var o=unescape(encodeURIComponent(e+","+t+","+r+","+a+","+n)),i=[],l=0;l0||navigator.userAgent.match(/Trident.*rv\:11\./)?e.encryptCardDataIE(t,r,a,n,o,i):e.encryptCardDataOther(t,r,a,n,o).then((function(e){i(e)}),(function(e){console.log(e)}))}}(e.V001||(e.V001={}))}(e||(e={}));const t=e;jQuery((function(){(new class{listen(){let e=this;jQuery("body").on("change",'input[name="payment_method"]',(function(){jQuery("body").trigger("update_checkout")})),jQuery("body").on("updated_checkout",(function(t){e.afterpay(),e.afterpaynew(),e.bilink(),e.klarna()})),jQuery("#billing_company").on("input",(function(){e.bilink_toggle(jQuery(this).val()),jQuery("#buckaroo-afterpaynew-coc").parent().toggle(0!==jQuery.trim(jQuery(this).val()).length)})),jQuery("body").on("change","#buckaroo-afterpay-b2b",(function(){let e=jQuery(this).is(":checked"),t=jQuery("#buckaroo-afterpay-birthdate"),r=t.parent(),a=jQuery('[name="buckaroo-afterpay-gender"]'),n=a.parent();jQuery("#showB2BBuckaroo").toggle(e),jQuery("#billing_company").length&&jQuery("#buckaroo-afterpay-CompanyName").val(jQuery("#billing_company").val()),t.prop("disabled",!e),r.toggle(!e),r.toggleClass("validate-required",!e),a.prop("disabled",!e),n.toggle(!e)}))}afterpay(){jQuery("input[name=billing_phone]").length&&jQuery("#buckaroo-afterpay-phone").parent().hide()}afterpaynew(){jQuery("input[name=billing_phone]").length&&jQuery("#buckaroo-afterpaynew-phone").parent().hide(),jQuery("#buckaroo-afterpaynew-coc").parent().toggle(0!==jQuery.trim(jQuery("input[name=billing_company]").val()).length)}bilink(){let e=jQuery("#billing_company");e.length&&this.bilink_toggle(e.val())}bilink_toggle(e){let t=jQuery("#buckaroo_billink_b2b"),r=jQuery("#buckaroo_billink_b2c");if(t.length&&r.length){var a=jQuery.trim(e).length>0;t.toggle(a),r.toggle(!a)}}klarna(){jQuery("input[name=billing_phone]").length&&jQuery('input[id^="buckaroo-klarna"][type="tel"]').parent().hide()}}).listen(),(new class{form=jQuery("form[name=checkout]");validator=t.V001;listen(){let e=this.validator,t=this;this.form.on("input",".cardNumber",(function(r){t.toggleClasses(e.validateCardNumber(r.target.value),r.target)})),this.form.on("input",".cvc",(function(r){t.toggleClasses(e.validateCvc(r.target.value),r.target)})),this.form.on("input",".cardHolderName",(function(r){t.toggleClasses(e.validateCardholderName(r.target.value),r.target)})),this.form.on("input",".expirationYear",(function(r){t.toggleClasses(e.validateYear(r.target.value),r.target)})),this.form.on("input",".expirationMonth",(function(r){t.toggleClasses(e.validateMonth(r.target.value),r.target)})),this.form.submit(this.submit.bind(this))}toggleClasses(e,t){(t=jQuery(t)).toggleClass("error",!e),t.toggleClass("validated",e),this.submit()}submit(e){let r=jQuery('input[name="payment_method"]:checked').parent(),a=r.find(".cardNumber").val(),n=r.find(".cvc").val(),o=r.find(".cardHolderName").val(),i=r.find(".expirationYear").val(),l=r.find(".expirationMonth").val(),u=t.V001.validateCardNumber(a),c=t.V001.validateCvc(n),s=t.V001.validateCardholderName(o),g=t.V001.validateYear(i),y=t.V001.validateMonth(l);u&&c&&s&&g&&y&&this.getEncryptedData(a,i,l,n,o,r)}getEncryptedData(e,r,a,n,o,i){t.V001.encryptCardData(e,r,a,n,o,(function(e){i.find(".encryptedCardData").val(e)}))}}).listen(),(new class{listen(){const e=this;jQuery("#buckaroo-idin-verify-button").click((()=>{jQuery("#buckaroo-idin-issuer")&&jQuery("#buckaroo-idin-issuer").val().length>1?e.identify(jQuery("#buckaroo-idin-issuer").val()):e.displayErrorMessage(buckaroo_global.idin_i18n.bank_required)}))}disableBlock(e){jQuery(e).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}identify(e){const t=this;t.disableBlock(".checkout.woocommerce-checkout"),jQuery.ajax({url:buckaroo_global.ajax_url,data:{"wc-api":"WC_Gateway_Buckaroo_idin-identify",issuer:e},dataType:"json"}).done((e=>{jQuery(".woocommerce-checkout").unblock(),e&&e.message?t.displayErrorMessage(e.message):e&&"success"==e.result?window.location.replace(e.redirect):t.displayErrorMessage(buckaroo_global.idin_i18n.general_error)})).fail((()=>{t.displayErrorMessage(buckaroo_global.idin_i18n.general_error),jQuery(".woocommerce-checkout").unblock()}))}displayErrorMessage(e){const t=` \n \n `;jQuery(".woocommerce-notices-wrapper").first().prepend(t);var r=jQuery(".woocommerce-notices-wrapper .woocommerce-error").first();setTimeout((function(){r.fadeOut(1e3)}),1e4),jQuery("html, body").scrollTop(0)}}).listen()}))})(); \ No newline at end of file diff --git a/assets/js/package-lock.json b/assets/js/package-lock.json index 177e78205..e1e17e796 100644 --- a/assets/js/package-lock.json +++ b/assets/js/package-lock.json @@ -72,14 +72,14 @@ "peer": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", "dev": true, "peer": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "node_modules/@leichtgewicht/ip-codec": { @@ -127,9 +127,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.4.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz", - "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz", + "integrity": "sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==", "dev": true, "peer": true, "dependencies": { @@ -179,9 +179,9 @@ } }, "node_modules/@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.10", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz", + "integrity": "sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==", "dev": true, "dependencies": { "@types/node": "*" @@ -200,9 +200,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.7.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz", - "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==", + "version": "18.15.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", + "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==", "dev": true }, "node_modules/@types/qs": { @@ -233,9 +233,9 @@ } }, "node_modules/@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz", + "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==", "dev": true, "dependencies": { "@types/mime": "*", @@ -485,9 +485,9 @@ } }, "node_modules/acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true, "peer": true, "bin": { @@ -659,9 +659,9 @@ } }, "node_modules/bonjour-service": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz", - "integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "dependencies": { "array-flatten": "^2.1.2", @@ -693,9 +693,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", - "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "dev": true, "funding": [ { @@ -709,10 +709,10 @@ ], "peer": true, "dependencies": { - "caniuse-lite": "^1.0.30001370", - "electron-to-chromium": "^1.4.202", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.5" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" }, "bin": { "browserslist": "cli.js" @@ -751,9 +751,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001378", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz", - "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==", + "version": "1.0.30001473", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz", + "integrity": "sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==", "dev": true, "funding": [ { @@ -763,6 +763,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "peer": true @@ -1000,9 +1004,9 @@ "dev": true }, "node_modules/dns-packet": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz", - "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.5.0.tgz", + "integrity": "sha512-USawdAUzRkV6xrqTjiAEp6M9YagZEzWcSUaZTcIFAiyQWW1SoI6KyId8y2+/71wbgHKQAKd+iupLv4YvEwYWvA==", "dev": true, "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -1018,9 +1022,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.225", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz", - "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw==", + "version": "1.4.345", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.345.tgz", + "integrity": "sha512-znGhOQK2TUYLICgS25uaM0a7pHy66rSxbre7l762vg9AUoCcJK+Bu+HCPWpjL/U/kK8/Hf+6E0szAUJSyVYb3Q==", "dev": true, "peer": true }, @@ -1034,9 +1038,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, "peer": true, "dependencies": { @@ -1438,9 +1442,9 @@ "peer": true }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/handle-thing": { @@ -1496,9 +1500,9 @@ } }, "node_modules/hpack.js/node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -1684,9 +1688,9 @@ } }, "node_modules/is-core-module": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", - "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -1847,6 +1851,16 @@ "node": ">=0.10.0" } }, + "node_modules/launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -2029,9 +2043,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", "dev": true, "peer": true }, @@ -2117,9 +2131,9 @@ } }, "node_modules/open": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz", - "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "dependencies": { "define-lazy-prop": "^2.0.0", @@ -2234,8 +2248,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", @@ -2290,9 +2303,9 @@ } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" @@ -2357,9 +2370,9 @@ } }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -2565,9 +2578,9 @@ "dev": true }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "peer": true, "dependencies": { @@ -2691,6 +2704,15 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz", + "integrity": "sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -2885,9 +2907,9 @@ } }, "node_modules/terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.16.8", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.8.tgz", + "integrity": "sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==", "dev": true, "peer": true, "dependencies": { @@ -2904,17 +2926,17 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz", - "integrity": "sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz", + "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==", "dev": true, "peer": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.5" }, "engines": { "node": ">= 10.13.0" @@ -2988,9 +3010,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "dev": true, "funding": [ { @@ -3080,9 +3102,9 @@ } }, "node_modules/webpack": { - "version": "5.74.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", - "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", + "version": "5.77.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz", + "integrity": "sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==", "dev": true, "peer": true, "dependencies": { @@ -3260,9 +3282,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.13.1.tgz", + "integrity": "sha512-5tWg00bnWbYgkN+pd5yISQKDejRBYGEw15RaEEslH+zdbNDxxaZvEAO2WulaSaFKb5n3YG8JXsGaDsut1D0xdA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", @@ -3284,6 +3306,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -3293,7 +3316,7 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -3309,6 +3332,9 @@ "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { + "webpack": { + "optional": true + }, "webpack-cli": { "optional": true } @@ -3441,9 +3467,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz", - "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "engines": { "node": ">=10.0.0" @@ -3514,14 +3540,14 @@ "peer": true }, "@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", "dev": true, "peer": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "@leichtgewicht/ip-codec": { @@ -3569,9 +3595,9 @@ } }, "@types/eslint": { - "version": "8.4.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz", - "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz", + "integrity": "sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==", "dev": true, "peer": true, "requires": { @@ -3621,9 +3647,9 @@ } }, "@types/http-proxy": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", - "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "version": "1.17.10", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz", + "integrity": "sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==", "dev": true, "requires": { "@types/node": "*" @@ -3642,9 +3668,9 @@ "dev": true }, "@types/node": { - "version": "18.7.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz", - "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==", + "version": "18.15.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", + "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==", "dev": true }, "@types/qs": { @@ -3675,9 +3701,9 @@ } }, "@types/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz", + "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==", "dev": true, "requires": { "@types/mime": "*", @@ -3911,9 +3937,9 @@ } }, "acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true, "peer": true }, @@ -4044,9 +4070,9 @@ } }, "bonjour-service": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz", - "integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz", + "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==", "dev": true, "requires": { "array-flatten": "^2.1.2", @@ -4075,16 +4101,16 @@ } }, "browserslist": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", - "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "dev": true, "peer": true, "requires": { - "caniuse-lite": "^1.0.30001370", - "electron-to-chromium": "^1.4.202", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.5" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" } }, "buffer-from": { @@ -4111,9 +4137,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001378", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz", - "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==", + "version": "1.0.30001473", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz", + "integrity": "sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==", "dev": true, "peer": true }, @@ -4301,9 +4327,9 @@ "dev": true }, "dns-packet": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz", - "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.5.0.tgz", + "integrity": "sha512-USawdAUzRkV6xrqTjiAEp6M9YagZEzWcSUaZTcIFAiyQWW1SoI6KyId8y2+/71wbgHKQAKd+iupLv4YvEwYWvA==", "dev": true, "requires": { "@leichtgewicht/ip-codec": "^2.0.1" @@ -4316,9 +4342,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.225", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz", - "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw==", + "version": "1.4.345", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.345.tgz", + "integrity": "sha512-znGhOQK2TUYLICgS25uaM0a7pHy66rSxbre7l762vg9AUoCcJK+Bu+HCPWpjL/U/kK8/Hf+6E0szAUJSyVYb3Q==", "dev": true, "peer": true }, @@ -4329,9 +4355,9 @@ "dev": true }, "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, "peer": true, "requires": { @@ -4638,9 +4664,9 @@ "peer": true }, "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "handle-thing": { @@ -4684,9 +4710,9 @@ }, "dependencies": { "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -4833,9 +4859,9 @@ } }, "is-core-module": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", - "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", + "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", "dev": true, "requires": { "has": "^1.0.3" @@ -4948,6 +4974,16 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, + "launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "requires": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -5085,9 +5121,9 @@ "dev": true }, "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", "dev": true, "peer": true }, @@ -5152,9 +5188,9 @@ } }, "open": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz", - "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "requires": { "define-lazy-prop": "^2.0.0", @@ -5236,8 +5272,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true, - "peer": true + "dev": true }, "picomatch": { "version": "2.3.1", @@ -5279,9 +5314,9 @@ } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true }, "qs": { @@ -5330,9 +5365,9 @@ } }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -5480,9 +5515,9 @@ } }, "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "peer": true, "requires": { @@ -5584,6 +5619,12 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shell-quote": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz", + "integrity": "sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==", + "dev": true + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -5736,9 +5777,9 @@ "peer": true }, "terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.16.8", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.8.tgz", + "integrity": "sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==", "dev": true, "peer": true, "requires": { @@ -5749,17 +5790,17 @@ } }, "terser-webpack-plugin": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz", - "integrity": "sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz", + "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==", "dev": true, "peer": true, "requires": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.5" } }, "thunky": { @@ -5800,9 +5841,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "dev": true, "peer": true, "requires": { @@ -5864,9 +5905,9 @@ } }, "webpack": { - "version": "5.74.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", - "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", + "version": "5.77.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz", + "integrity": "sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==", "dev": true, "peer": true, "requires": { @@ -5979,9 +6020,9 @@ } }, "webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.13.1.tgz", + "integrity": "sha512-5tWg00bnWbYgkN+pd5yISQKDejRBYGEw15RaEEslH+zdbNDxxaZvEAO2WulaSaFKb5n3YG8JXsGaDsut1D0xdA==", "dev": true, "requires": { "@types/bonjour": "^3.5.9", @@ -6003,6 +6044,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -6012,7 +6054,7 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "dependencies": { "ajv": { @@ -6112,9 +6154,9 @@ "dev": true }, "ws": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz", - "integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "requires": {} } diff --git a/composer.json b/composer.json index 00c492b19..f0d6d04af 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "issues": "https://support.buckaroo.nl/contact" }, "homepage": "https://www.buckaroo.nl", - "version" : "3.6.1", + "version" : "3.7.0", "minimum-stability": "stable", "config": { "allow-plugins": { diff --git a/gateway-buckaroo-afterpay.php b/gateway-buckaroo-afterpay.php index e5be3b56a..3e3758dd6 100644 --- a/gateway-buckaroo-afterpay.php +++ b/gateway-buckaroo-afterpay.php @@ -21,7 +21,7 @@ public function __construct() $this->title = 'Riverty | AfterPay'; $this->has_fields = false; $this->method_title = 'Buckaroo Riverty | AfterPay'; - $this->setIcon('afterpay.png', 'svg/AfterPay.svg'); + $this->setIcon('afterpay.png', 'svg/afterpay.svg'); $this->setCountry(); parent::__construct(); @@ -262,11 +262,12 @@ public function validate_fields() } $birthdate = $this->parseDate($this->request('buckaroo-afterpay-birthdate')); - if (!$this->validateDate($birthdate, 'd-m-Y')) { + $b2b = $this->request("buckaroo-afterpay-b2b"); + if (!$this->validateDate($birthdate, 'd-m-Y') && $b2b != 'ON') { wc_add_notice(__("Please enter correct birthdate date", 'wc-buckaroo-bpe-gateway'), 'error'); } - - if ($this->request("buckaroo-afterpay-b2b") == 'ON') { + + if ($b2b == 'ON') { if ($this->request("buckaroo-afterpay-CompanyCOCRegistration") === null) { wc_add_notice(__("Company registration number is required (KvK)", 'wc-buckaroo-bpe-gateway'), 'error'); } diff --git a/gateway-buckaroo-afterpaynew.php b/gateway-buckaroo-afterpaynew.php index 2f298415f..76d059186 100644 --- a/gateway-buckaroo-afterpaynew.php +++ b/gateway-buckaroo-afterpaynew.php @@ -25,7 +25,7 @@ public function __construct() $this->title = 'Riverty | AfterPay (by Buckaroo)'; $this->has_fields = false; $this->method_title = 'Buckaroo Riverty | AfterPay New'; - $this->setIcon('afterpay.png', 'svg/AfterPay.svg'); + $this->setIcon('afterpay.png', 'svg/afterpay.svg'); $this->setCountry(); parent::__construct(); diff --git a/gateway-buckaroo-applepay.php b/gateway-buckaroo-applepay.php index f0ceadcfa..4fbcfe0ac 100644 --- a/gateway-buckaroo-applepay.php +++ b/gateway-buckaroo-applepay.php @@ -22,7 +22,7 @@ public function __construct() $this->has_fields = true; $this->method_title = "Buckaroo Apple Pay"; $this->CustomerCardName = ''; - $this->setIcon('svg/ApplePay.svg', 'svg/ApplePay.svg'); + $this->setIcon('svg/applepay.svg', 'svg/applepay.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-belfius.php b/gateway-buckaroo-belfius.php index 4042d1da6..56d023725 100644 --- a/gateway-buckaroo-belfius.php +++ b/gateway-buckaroo-belfius.php @@ -14,7 +14,7 @@ public function __construct() $this->title = 'Belfius'; $this->has_fields = false; $this->method_title = "Buckaroo Belfius"; - $this->setIcon('24x24/belfius.png', 'svg/Belfius.svg'); + $this->setIcon('24x24/belfius.png', 'svg/belfius.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-billink.php b/gateway-buckaroo-billink.php index fd7d679d3..99cbde20a 100755 --- a/gateway-buckaroo-billink.php +++ b/gateway-buckaroo-billink.php @@ -20,7 +20,7 @@ public function __construct() $this->title = 'Billink - postpay'; $this->has_fields = true; $this->method_title = 'Buckaroo Billink'; - $this->setIcon('24x24/billink.png', 'svg/Billink.svg'); + $this->setIcon('24x24/billink.png', 'svg/billink.svg'); $this->setCountry(); parent::__construct(); diff --git a/gateway-buckaroo-creditcard.php b/gateway-buckaroo-creditcard.php index 5b8c66d36..5f552d724 100644 --- a/gateway-buckaroo-creditcard.php +++ b/gateway-buckaroo-creditcard.php @@ -38,7 +38,7 @@ public function setParameters() */ public function setCreditcardIcon() { - $this->setIcon('24x24/cc.gif', 'svg/Creditcards.svg'); + $this->setIcon('24x24/cc.gif', 'svg/creditcards.svg'); } /** @inheritDoc */ protected function setProperties() diff --git a/gateway-buckaroo-eps.php b/gateway-buckaroo-eps.php index aa2b09f0f..7d2061de8 100644 --- a/gateway-buckaroo-eps.php +++ b/gateway-buckaroo-eps.php @@ -14,7 +14,7 @@ public function __construct() $this->title = 'EPS'; $this->has_fields = false; $this->method_title = "Buckaroo EPS"; - $this->setIcon('24x24/eps.png', 'svg/EPS.svg'); + $this->setIcon('24x24/eps.png', 'svg/eps.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-giftcard.php b/gateway-buckaroo-giftcard.php index 5e89732ce..2d974fc48 100644 --- a/gateway-buckaroo-giftcard.php +++ b/gateway-buckaroo-giftcard.php @@ -16,7 +16,7 @@ public function __construct() $this->title = 'Giftcards'; $this->has_fields = false; $this->method_title = "Buckaroo Giftcards"; - $this->setIcon('24x24/giftcard.gif', 'svg/Giftcards.svg'); + $this->setIcon('24x24/giftcard.gif', 'svg/giftcards.svg'); parent::__construct(); //disabled refunds by request see BP-1337 diff --git a/gateway-buckaroo-giropay.php b/gateway-buckaroo-giropay.php index a11ad2c5a..0b77ee280 100644 --- a/gateway-buckaroo-giropay.php +++ b/gateway-buckaroo-giropay.php @@ -14,11 +14,11 @@ public function __construct() $this->title = 'Giropay'; $this->has_fields = true; $this->method_title = "Buckaroo Giropay"; - $this->setIcon('24x24/giropay.gif', 'svg/Giropay.svg'); - $this->addRefundSupport(); + $this->setIcon('24x24/giropay.gif', 'svg/giropay.svg'); parent::__construct(); - + $this->addRefundSupport(); + apply_filters('buckaroo_init_payment_class', $this); } /** @@ -59,6 +59,12 @@ public function process_payment($order_id) /** @var BuckarooGiropay */ $giropay = $this->createDebitRequest($order); $giropay->bic = $this->request('buckaroo-giropay-bancaccount'); + + $response = $this->apply_filters_or_error('buckaroo_before_payment_request', $order, $giropay); + if ($response) { + return $response; + } + $response = $giropay->Pay(); return fn_buckaroo_process_response($this, $response); } diff --git a/gateway-buckaroo-ideal.php b/gateway-buckaroo-ideal.php index 7984c0a71..2e6da2192 100644 --- a/gateway-buckaroo-ideal.php +++ b/gateway-buckaroo-ideal.php @@ -9,16 +9,17 @@ class WC_Gateway_Buckaroo_Ideal extends WC_Gateway_Buckaroo { const PAYMENT_CLASS = BuckarooIDeal::class; - function __construct() + public function __construct() { $this->id = 'buckaroo_ideal'; $this->title = 'iDEAL'; $this->has_fields = true; $this->method_title = "Buckaroo iDEAL"; - $this->setIcon('24x24/ideal.png', 'svg/iDEAL.svg'); + $this->setIcon('24x24/ideal.png', 'svg/ideal.svg'); parent::__construct(); $this->addRefundSupport(); + apply_filters('buckaroo_init_payment_class', $this); } /** * Can the order be refunded @@ -64,6 +65,12 @@ function process_payment($order_id) /** @var BuckarooIDeal */ $ideal = $this->createDebitRequest($order); $ideal->issuer = $this->request('buckaroo-ideal-issuer'); + + $response = $this->apply_filters_or_error('buckaroo_before_payment_request', $order, $ideal); + if ($response) { + return $response; + } + $response = $ideal->Pay(); return fn_buckaroo_process_response($this, $response); } diff --git a/gateway-buckaroo-in3.php b/gateway-buckaroo-in3.php index 8b7783476..6161d3f49 100644 --- a/gateway-buckaroo-in3.php +++ b/gateway-buckaroo-in3.php @@ -18,7 +18,7 @@ public function __construct() $this->title = 'in3'; $this->has_fields = false; $this->method_title = 'Buckaroo in3'; - $this->setIcon('24x24/in3.png', 'svg/In3.svg'); + $this->setIcon('24x24/in3.png', 'svg/in3.svg'); $this->setCountry(); @@ -52,26 +52,15 @@ public function process_refund($order_id, $amount = null, $reason = '', $line_it */ public function validate_fields() { - $orderAs = $this->request("buckaroo-in3-orderas"); - if (!in_array($orderAs, ["Debtor", "SoleProprietor", "Company"])) { - wc_add_notice(__("Unknown order as type", 'wc-buckaroo-bpe-gateway'), 'error'); - } + $birthdate = $this->request('buckaroo-in3-birthdate'); $country = $this->request('billing_country'); if ($country === null) { $country = $this->country; } - if ($country === 'NL') { - if (strtolower($this->request('buckaroo-in3-orderas')) != 'debtor') { - if ($this->request('buckaroo-in3-coc') === null) { - wc_add_notice(__("Please enter CoC number", 'wc-buckaroo-bpe-gateway'), 'error'); - } - - if ($this->request('buckaroo-in3-companyname') === null) { - wc_add_notice(__("Please enter company name", 'wc-buckaroo-bpe-gateway'), 'error'); - } - } + if ($country === 'NL' && !$this->validateDate($birthdate, 'd-m-Y')) { + wc_add_notice(__("Please enter correct birthdate date", 'wc-buckaroo-bpe-gateway'), 'error'); } parent::validate_fields(); @@ -90,88 +79,22 @@ public function process_payment($order_id) $order = getWCOrder($order_id); /** @var BuckarooIn3 */ $in3 = $this->createDebitRequest($order); - $in3->CustomerType = $this->request("buckaroo-in3-orderas"); - if (strtolower($in3->CustomerType) != 'debtor') { - $in3->cocNumber = $this->request("buckaroo-in3-coc"); - $in3->companyName = $this->request("buckaroo-in3-companyname"); - } $order_details = new Buckaroo_Order_Details($order); - $birthdate = $this->request('buckaroo-in3-birthdate'); - if ($this->validateDate($birthdate, 'd-m-Y')) { - $birthdate = date('Y-m-d', strtotime($birthdate)); - } elseif (in_array($order_details->getBilling('country'), ['NL'])) { - wc_add_notice(__("Please enter correct birthdate date", 'wc-buckaroo-bpe-gateway'), 'error'); - return; - } - - $shippingCosts = $order->get_total_shipping(); - $shippingCostsTax = $order->get_shipping_tax(); - if (floatval($shippingCosts) > 0) { - $in3->ShippingCosts = number_format($shippingCosts, 2) + number_format($shippingCostsTax, 2); - } - if (floatval($shippingCostsTax) > 0) { - $in3->ShippingCostsTax = number_format(($shippingCostsTax * 100) / $shippingCosts); - } + $birthdate = date('Y-m-d', strtotime($this->request('buckaroo-in3-birthdate'))); $in3 = $this->getBillingInfo($order_details, $in3, $birthdate); - $in3->InvoiceDate = date("d-m-Y"); + $in3->InvoiceDate = date("d-m-Y"); $in3->CustomerIPAddress = getClientIpBuckaroo(); $in3->Accept = 'TRUE'; - $products = array(); - $items = $order->get_items(); - $itemsTotalAmount = 0; - - foreach ($items as $item) { - $tmp["ArticleDescription"] = $item['name']; - $tmp["ArticleId"] = $item['product_id']; - $tmp["ArticleQuantity"] = $item["qty"]; - $tmp["ArticleUnitprice"] = number_format(number_format($item["line_total"] + $item["line_tax"], 4) / $item["qty"], 2); - $itemsTotalAmount += number_format($tmp["ArticleUnitprice"] * $item["qty"], 2); - - $products['product'][] = $tmp; - } - - $fees = $order->get_fees(); - foreach ($fees as $key => $item) { - $tmp["ArticleDescription"] = $item['name']; - $tmp["ArticleId"] = $key; - $tmp["ArticleQuantity"] = 1; - $tmp["ArticleUnitprice"] = number_format(($item["line_total"] + $item["line_tax"]), 2); - $itemsTotalAmount += $tmp["ArticleUnitprice"]; - $products['fee'] = $tmp; - } - if (!empty($in3->ShippingCosts)) { - $itemsTotalAmount += $in3->ShippingCosts; - } + $in3->returnUrl = $this->notify_url; - if ($in3->amountDedit != $itemsTotalAmount) { - if (number_format($in3->amountDedit - $itemsTotalAmount, 2) >= 0.01) { - $tmp["ArticleDescription"] = 'Remaining Price'; - $tmp["ArticleId"] = 'remaining_price'; - $tmp["ArticleQuantity"] = 1; - $tmp["ArticleUnitprice"] = number_format($in3->amountDedit - $itemsTotalAmount, 2); - - $products['product'][] = $tmp; - $itemsTotalAmount += 0.01; - } elseif (number_format($itemsTotalAmount - $in3->amountDedit, 2) >= 0.01) { - $tmp["ArticleDescription"] = 'Remaining Price'; - $tmp["ArticleId"] = 'remaining_price'; - $tmp["ArticleQuantity"] = 1; - $tmp["ArticleUnitprice"] = number_format($in3->amountDedit - $itemsTotalAmount, 2); - - $products['product'][] = $tmp; - $itemsTotalAmount -= 0.01; - } - } - - $in3->returnUrl = $this->notify_url; - $in3->in3Version = $this->settings['in3version']; - $action = 'PayInInstallments'; - - $response = $in3->PayIn3($products, $action); + $response = $in3->PayIn3( + $this->get_products_for_payment($order_details), + 'PayInInstallments' + ); return fn_buckaroo_process_response($this, $response, $this->mode); } /** @@ -194,20 +117,4 @@ protected function getBillingInfo($order_details, $method, $birthdate) return $method; } - /** - * Add fields to the form_fields() array, specific to this page. - * - * @access public - */ - public function init_form_fields() - { - parent::init_form_fields(); - - $this->form_fields['in3version'] = array( - 'title' => __('In3 version', 'wc-buckaroo-bpe-gateway'), - 'type' => 'select', - 'description' => __('Choose In3 version', 'wc-buckaroo-bpe-gateway'), - 'options' => array('false' => 'In3 Flexible', 'true' => 'In3 Garant'), - 'default' => 'pay'); - } } diff --git a/gateway-buckaroo-kbc.php b/gateway-buckaroo-kbc.php index 218634453..d8f174eb0 100644 --- a/gateway-buckaroo-kbc.php +++ b/gateway-buckaroo-kbc.php @@ -14,10 +14,11 @@ public function __construct() $this->title = 'KBC'; $this->has_fields = false; $this->method_title = "Buckaroo KBC"; - $this->setIcon('24x24/kbc.png', 'svg/KBC.svg'); - + $this->setIcon('24x24/kbc.png', 'svg/kbc.svg'); + parent::__construct(); $this->addRefundSupport(); + apply_filters('buckaroo_init_payment_class', $this); } /** @@ -44,6 +45,12 @@ public function process_payment($order_id) $order = getWCOrder($order_id); /** @var BuckarooKBC */ $kbc = $this->createDebitRequest($order); + + $response = $this->apply_filters_or_error('buckaroo_before_payment_request', $order, $kbc); + if ($response) { + return $response; + } + $response = $kbc->Pay(); return fn_buckaroo_process_response($this, $response); } diff --git a/gateway-buckaroo-klarna.php b/gateway-buckaroo-klarna.php index ca41f1f9b..30622dcca 100644 --- a/gateway-buckaroo-klarna.php +++ b/gateway-buckaroo-klarna.php @@ -16,7 +16,7 @@ public function __construct() { $this->has_fields = true; $this->type = 'klarna'; - $this->setIcon('24x24/klarna.svg', 'svg/Klarna.svg'); + $this->setIcon('24x24/klarna.svg', 'svg/klarna.svg'); $this->setCountry(); parent::__construct(); diff --git a/gateway-buckaroo-klarnakp.php b/gateway-buckaroo-klarnakp.php index 19e389a3d..47bb097b3 100644 --- a/gateway-buckaroo-klarnakp.php +++ b/gateway-buckaroo-klarnakp.php @@ -14,7 +14,7 @@ public function __construct() $this->method_title = 'Buckaroo Klarna Pay later (authorize/capture)'; $this->has_fields = true; $this->type = 'klarnakp'; - $this->setIcon('24x24/klarna.svg', 'svg/Klarna.svg'); + $this->setIcon('24x24/klarna.svg', 'svg/klarna.svg'); $this->setCountry(); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-mastersettings.php b/gateway-buckaroo-mastersettings.php index 68ece917a..1d897b7a4 100644 --- a/gateway-buckaroo-mastersettings.php +++ b/gateway-buckaroo-mastersettings.php @@ -134,6 +134,8 @@ public function init_form_fields() 'default' => '' ); + $this->apply_filter_or_error('append_subscription_configurationCode_in_setting_field', $this); + $this->form_fields['usenewicons'] = array( 'title' => __('Use new icons', 'wc-buckaroo-bpe-gateway'), 'type' => 'select', diff --git a/gateway-buckaroo-mistercash.php b/gateway-buckaroo-mistercash.php index 11ce9fe37..25e19563f 100644 --- a/gateway-buckaroo-mistercash.php +++ b/gateway-buckaroo-mistercash.php @@ -14,11 +14,12 @@ public function __construct() $this->title = 'Bancontact'; $this->has_fields = false; $this->method_title = 'Buckaroo Bancontact'; - $this->setIcon('24x24/mistercash.png', 'svg/Bancontact.svg'); - $this->migrateOldSettings('woocommerce_buckaroo_mistercash_settings'); + $this->setIcon('24x24/mistercash.png', 'svg/bancontact.svg'); parent::__construct(); + $this->migrateOldSettings('woocommerce_buckaroo_mistercash_settings'); $this->addRefundSupport(); + apply_filters('buckaroo_init_payment_class', $this); } /** @@ -44,6 +45,12 @@ public function process_payment($order_id) $order = getWCOrder($order_id); /** @var BuckarooMisterCash */ $mistercash = $this->createDebitRequest($order); + + $response = $this->apply_filters_or_error('buckaroo_before_payment_request', $order, $mistercash); + if ($response) { + return $response; + } + $response = $mistercash->Pay(); return fn_buckaroo_process_response($this, $response); } diff --git a/gateway-buckaroo-p24.php b/gateway-buckaroo-p24.php index cab156b39..f28ba01b7 100755 --- a/gateway-buckaroo-p24.php +++ b/gateway-buckaroo-p24.php @@ -14,7 +14,7 @@ public function __construct() $this->title = 'Przelewy24'; $this->has_fields = false; $this->method_title = "Buckaroo Przelewy24"; - $this->setIcon('24x24/p24.png', 'svg/Przelewy24.svg'); + $this->setIcon('24x24/p24.png', 'svg/przelewy24.svg'); $this->migrateOldSettings('woocommerce_buckaroo_p24_settings'); parent::__construct(); diff --git a/gateway-buckaroo-payconiq.php b/gateway-buckaroo-payconiq.php index 8d4a04d68..bcf736f44 100644 --- a/gateway-buckaroo-payconiq.php +++ b/gateway-buckaroo-payconiq.php @@ -14,7 +14,7 @@ public function __construct() $this->title = 'Payconiq'; $this->has_fields = false; $this->method_title = "Buckaroo Payconiq"; - $this->setIcon('24x24/payconiq.png', 'svg/Payconiq.svg'); + $this->setIcon('24x24/payconiq.png', 'svg/payconiq.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-paypal.php b/gateway-buckaroo-paypal.php index a5877548c..329fd3db9 100644 --- a/gateway-buckaroo-paypal.php +++ b/gateway-buckaroo-paypal.php @@ -19,7 +19,7 @@ public function __construct() $this->title = 'PayPal'; $this->has_fields = false; $this->method_title = "Buckaroo PayPal"; - $this->setIcon('24x24/paypal.gif', 'svg/PayPal.svg'); + $this->setIcon('24x24/paypal.gif', 'svg/paypal.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-payperemail.php b/gateway-buckaroo-payperemail.php index 8966b9961..d6dbec922 100644 --- a/gateway-buckaroo-payperemail.php +++ b/gateway-buckaroo-payperemail.php @@ -15,7 +15,7 @@ public function __construct() $this->title = 'PayPerEmail'; $this->has_fields = true; $this->method_title = "Buckaroo PayPerEmail"; - $this->setIcon('payperemail.png', 'svg/PayPerEmail.svg'); + $this->setIcon('payperemail.png', 'svg/payperemail.svg'); parent::__construct(); } diff --git a/gateway-buckaroo-sepadirectdebit.php b/gateway-buckaroo-sepadirectdebit.php index 79ed6fecf..03134f854 100644 --- a/gateway-buckaroo-sepadirectdebit.php +++ b/gateway-buckaroo-sepadirectdebit.php @@ -14,7 +14,7 @@ public function __construct() $this->title = 'SEPA Direct Debit'; $this->has_fields = false; $this->method_title = 'Buckaroo SEPA Direct Debit'; - $this->setIcon('24x24/directdebit.png', 'svg/SEPAdirectdebit.svg'); + $this->setIcon('24x24/directdebit.png', 'svg/sepa-directdebit.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo-sofort.php b/gateway-buckaroo-sofort.php index 55117a8a9..57af42ef7 100644 --- a/gateway-buckaroo-sofort.php +++ b/gateway-buckaroo-sofort.php @@ -14,12 +14,12 @@ public function __construct() $this->title = 'Sofort'; $this->has_fields = false; $this->method_title = "Buckaroo Sofort"; - $this->setIcon('24x24/sofort.png', 'svg/Sofort.svg'); - - $this->migrateOldSettings('woocommerce_buckaroo_sofortbanking_settings'); + $this->setIcon('24x24/sofort.png', 'svg/sofort.svg'); + parent::__construct(); + $this->migrateOldSettings('woocommerce_buckaroo_sofortbanking_settings'); $this->addRefundSupport(); - + apply_filters('buckaroo_init_payment_class', $this); } /** @@ -45,8 +45,13 @@ public function process_payment($order_id) $order = getWCOrder($order_id); /** @var BuckarooSofortbanking */ $sofortbanking = $this->createDebitRequest($order); - $response = $sofortbanking->Pay(); + $response = $this->apply_filters_or_error('buckaroo_before_payment_request', $order, $sofortbanking); + if ($response) { + return $response; + } + + $response = $sofortbanking->Pay(); return fn_buckaroo_process_response($this, $response); } diff --git a/gateway-buckaroo-transfer.php b/gateway-buckaroo-transfer.php index ca5dd1392..749c7d296 100644 --- a/gateway-buckaroo-transfer.php +++ b/gateway-buckaroo-transfer.php @@ -17,7 +17,7 @@ public function __construct() $this->title = 'Bank Transfer'; $this->has_fields = false; $this->method_title = 'Buckaroo Bank Transfer'; - $this->setIcon('24x24/transfer.jpg', 'svg/SEPACreditTransfer.svg'); + $this->setIcon('24x24/transfer.jpg', 'svg/sepa-credittransfer.svg'); parent::__construct(); $this->addRefundSupport(); diff --git a/gateway-buckaroo.php b/gateway-buckaroo.php index fd6ff860f..b812eaf8e 100644 --- a/gateway-buckaroo.php +++ b/gateway-buckaroo.php @@ -669,7 +669,6 @@ public function validate_fields() */ protected function setOrderCapture($order_id, $paymentName, $paymentType = null) { - update_post_meta($order_id, '_wc_order_selected_payment_method', $paymentName); $this->setOrderIssuer($order_id, $paymentType); } @@ -1230,6 +1229,10 @@ public function get_product_data(Buckaroo_Order_Item $item) 'vatPercentage' => $item->get_vat() ]; + if($this->id === 'buckaroo_afterpay') { + $product[] = $item->get_type(); + } + if($this->get_option('vattype') !== null) { $product['vatCategory'] = $this->get_option('vattype'); } @@ -1390,4 +1393,35 @@ protected function create_capture_error($message) ] ]; } + + /** + * Return properly filter if exists or null + * + * @param $tag + * @param $value + * @param mixed ...$args + * @return array | null + */ + function apply_filters_or_error($tag, $value, ...$args) { + if (!has_filter($tag)) { + return null; + } + $response = apply_filters($tag, $value, ...$args); + + return (isset($response['result']) && $response['result'] === 'no_subscription') ? null : $response; + } + + /** + * Return properly filter if exists or null + * + * @param string $message + * + * @return array | null + */ + function apply_filter_or_error($tag, $value) { + if (has_filter($tag)) { + return apply_filters($tag, $value); + } + return null; + } } diff --git a/gateways-creditcard/gateway-buckaroo-creditcard-single.php b/gateways-creditcard/gateway-buckaroo-creditcard-single.php index 54df58f94..ce5f3042d 100644 --- a/gateways-creditcard/gateway-buckaroo-creditcard-single.php +++ b/gateways-creditcard/gateway-buckaroo-creditcard-single.php @@ -19,7 +19,12 @@ public function __construct() { /** @inheritDoc */ public function setCreditcardIcon() { - $icon = "creditcards/".str_replace("buckaroo_creditcard_", "", $this->id).".svg"; + $name = str_replace("buckaroo_creditcard_", "", $this->id); + if($name === 'cartebleuevisa') { + $name = 'cartebleue'; + } + + $icon = "creditcards/{$name}.svg"; $this->setIcon($icon, $icon); } /** diff --git a/index.php b/index.php index bde9d52b8..b9bb1f0c5 100644 --- a/index.php +++ b/index.php @@ -5,7 +5,7 @@ Author: Buckaroo Author URI: http://www.buckaroo.nl Description: Buckaroo payment system plugin for WooCommerce. -Version: 3.6.1 +Version: 3.7.0 Text Domain: wc-buckaroo-bpe-gateway License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/languages/wc-buckaroo-bpe-gateway-de_DE.po b/languages/wc-buckaroo-bpe-gateway-de_DE.po index 7b848d4a6..a365163af 100644 --- a/languages/wc-buckaroo-bpe-gateway-de_DE.po +++ b/languages/wc-buckaroo-bpe-gateway-de_DE.po @@ -128,6 +128,14 @@ msgstr "" msgid "Button on product page" msgstr "" +#: gateway-buckaroo-mastersettings.php:140 +msgid "By Buckaroo generated code. This needs to be sendBy Buckaroo generated code. This needs to be send for creating new subscriptions.
Leave empty if you don`t want to use subscriptions." +msgstr "" + +#: gateway-buckaroo-mastersettings.php:141 +msgid "Please fill in your personal Buckaroo “Configurationcode” if you want to use the Buckaroo Subscription service together with WooCommerce Subscriptions.
You can find the Configurationcode in Buckaroo → Configuration → Subscriptions → Configurations." +msgstr "" + #: gateway-buckaroo-mastersettings.php:220 msgid "By turning on this setting age verification with iDIN will be in use" msgstr "" @@ -353,11 +361,11 @@ msgstr "" msgid "Identification Number" msgstr "" -#: gateway-buckaroo-mastersettings.php:218 +#: gateway-buckaroo-mastersettings.php:154 msgid "iDIN mode" msgstr "Modus iDIN" -#: gateway-buckaroo-mastersettings.php:232 +#: gateway-buckaroo-mastersettings.php:168 msgid "iDIN specific product categories" msgstr "" @@ -647,7 +655,7 @@ msgstr "" msgid "Select certificate" msgstr "" -#: gateway-buckaroo-mastersettings.php:235 +#: gateway-buckaroo-mastersettings.php:171 msgid "" "Select for what product categories iDIN verification should be applied. " "Don't select anything if want to apply iDIN to any product" @@ -893,6 +901,10 @@ msgstr "" msgid "Transaction description" msgstr "" +#: gateway-buckaroo-mastersettings.php:138 +msgid "Subscription ConfigurationCode" +msgstr "" + #: gateway-buckaroo.php:410 msgid "Transaction mode" msgstr "" @@ -913,7 +925,7 @@ msgstr "" msgid "Use master settings" msgstr "" -#: gateway-buckaroo-mastersettings.php:210 +#: gateway-buckaroo-mastersettings.php:146 msgid "Use new icons" msgstr "Verwenden sie neue symbole" diff --git a/languages/wc-buckaroo-bpe-gateway-fr_FR.po b/languages/wc-buckaroo-bpe-gateway-fr_FR.po index da4250261..4da548abd 100644 --- a/languages/wc-buckaroo-bpe-gateway-fr_FR.po +++ b/languages/wc-buckaroo-bpe-gateway-fr_FR.po @@ -128,12 +128,20 @@ msgstr "" msgid "Button on product page" msgstr "" +#: gateway-buckaroo-mastersettings.php:140 +msgid "By Buckaroo generated code. This needs to be sendBy Buckaroo generated code. This needs to be send for creating new subscriptions.
Leave empty if you don`t want to use subscriptions." +msgstr "" + +#: gateway-buckaroo-mastersettings.php:141 +msgid "Please fill in your personal Buckaroo “Configurationcode” if you want to use the Buckaroo Subscription service together with WooCommerce Subscriptions.
You can find the Configurationcode in Buckaroo → Configuration → Subscriptions → Configurations." +msgstr "" + #: gateway-buckaroo-mastersettings.php:220 msgid "By turning on this setting age verification with iDIN will be in use" msgstr "" "En activant ce paramètre, la vérification de l'âge avec iDIN sera utilisée" -#: gateway-buckaroo-mastersettings.php:212 +#: gateway-buckaroo-mastersettings.php:148 msgid "" "By turning on this setting in checkout new payment method icons will be in " "use" @@ -894,6 +902,10 @@ msgstr "" msgid "Transaction description" msgstr "" +#: gateway-buckaroo-mastersettings.php:138 +msgid "Subscription ConfigurationCode" +msgstr "" + #: gateway-buckaroo.php:410 msgid "Transaction mode" msgstr "" diff --git a/languages/wc-buckaroo-bpe-gateway-nl_NL.po b/languages/wc-buckaroo-bpe-gateway-nl_NL.po index 5d3f37cd8..4f49ea467 100755 --- a/languages/wc-buckaroo-bpe-gateway-nl_NL.po +++ b/languages/wc-buckaroo-bpe-gateway-nl_NL.po @@ -132,6 +132,14 @@ msgstr "Knop op checkout pagina" msgid "Button on product page" msgstr "Knop op product pagina " +#: gateway-buckaroo-mastersettings.php:140 +msgid "By Buckaroo generated code. This needs to be sendBy Buckaroo generated code. This needs to be send for creating new subscriptions.
Leave empty if you don`t want to use subscriptions." +msgstr "" + +#: gateway-buckaroo-mastersettings.php:141 +msgid "Please fill in your personal Buckaroo “Configurationcode” if you want to use the Buckaroo Subscription service together with WooCommerce Subscriptions.
You can find the Configurationcode in Buckaroo → Configuration → Subscriptions → Configurations." +msgstr "Vul je persoonlijke Buckaroo “Configuratiecode” in als je gebruik wilt maken van de Buckaroo Subscription service samen met WooCommerce Subscriptions.
Je vindt de Configuratiecode in Buckaroo → Configuratie → Abonnementen → Configuraties." + #: gateway-buckaroo-mastersettings.php:148 msgid "By turning on this setting age verification with iDIN will be in use" msgstr "" @@ -480,11 +488,11 @@ msgstr "IBAN:" msgid "Identification Number" msgstr "Identificatienummer" -#: gateway-buckaroo-mastersettings.php:146 +#: gateway-buckaroo-mastersettings.php:154 msgid "iDIN mode" msgstr "iDIN modus" -#: gateway-buckaroo-mastersettings.php:160 +#: gateway-buckaroo-mastersettings.php:168 msgid "iDIN specific product categories" msgstr "iDIN specifieke productcategorieën" @@ -774,7 +782,7 @@ msgstr "Kies Riverty | AfterPay service" msgid "Select Certificate" msgstr "Kies certificaat" -#: gateway-buckaroo-mastersettings.php:163 +#: gateway-buckaroo-mastersettings.php:171 msgid "" "Select for what product categories iDIN verification should be applied. " "Don't select anything if want to apply iDIN to any product" @@ -1053,6 +1061,10 @@ msgstr "Schakel de debug modus aan/uit" msgid "Transaction description" msgstr "Beschrijving van transactie" +#: gateway-buckaroo-mastersettings.php:138 +msgid "Subscription ConfigurationCode" +msgstr "Subscription ConfigurationCode" + #: gateway-buckaroo.php:306 msgid "Transaction mode" msgstr "Transactie modus" @@ -1074,7 +1086,7 @@ msgstr "" msgid "Upload certificate" msgstr "Certificaat uploaden" -#: gateway-buckaroo-mastersettings.php:138 +#: gateway-buckaroo-mastersettings.php:146 msgid "Use new icons" msgstr "Nieuwe icons gebruiken" diff --git a/languages/wc-buckaroo-bpe-gateway.pot b/languages/wc-buckaroo-bpe-gateway.pot index 10c0b356e..17009f556 100755 --- a/languages/wc-buckaroo-bpe-gateway.pot +++ b/languages/wc-buckaroo-bpe-gateway.pot @@ -131,11 +131,19 @@ msgstr "" msgid "Button on product page" msgstr "" +#: gateway-buckaroo-mastersettings.php:140 +msgid "By Buckaroo generated code. This needs to be sendBy Buckaroo generated code. This needs to be send for creating new subscriptions.
Leave empty if you don`t want to use subscriptions." +msgstr "" + +#: gateway-buckaroo-mastersettings.php:141 +msgid "Please fill in your personal Buckaroo “Configurationcode” if you want to use the Buckaroo Subscription service together with WooCommerce Subscriptions.
You can find the Configurationcode in Buckaroo → Configuration → Subscriptions → Configurations." +msgstr "" + #: gateway-buckaroo-mastersettings.php:148 msgid "By turning on this setting age verification with iDIN will be in use" msgstr "" -#: gateway-buckaroo-mastersettings.php:140 +#: gateway-buckaroo-mastersettings.php:148 msgid "" "By turning on this setting in checkout new payment method icons will be in " "use" @@ -461,11 +469,11 @@ msgstr "" msgid "Identification Number" msgstr "" -#: gateway-buckaroo-mastersettings.php:146 +#: gateway-buckaroo-mastersettings.php:154 msgid "iDIN mode" msgstr "" -#: gateway-buckaroo-mastersettings.php:160 +#: gateway-buckaroo-mastersettings.php:168 msgid "iDIN specific product categories" msgstr "" @@ -755,7 +763,7 @@ msgstr "" msgid "Select Certificate" msgstr "" -#: gateway-buckaroo-mastersettings.php:163 +#: gateway-buckaroo-mastersettings.php:171 msgid "" "Select for what product categories iDIN verification should be applied. " "Don't select anything if want to apply iDIN to any product" @@ -1012,6 +1020,10 @@ msgstr "" msgid "Transaction description" msgstr "" +#: gateway-buckaroo-mastersettings.php:138 +msgid "Subscription ConfigurationCode" +msgstr "" + #: gateway-buckaroo.php:306 msgid "Transaction mode" msgstr "" @@ -1033,7 +1045,7 @@ msgstr "" msgid "Upload certificate" msgstr "" -#: gateway-buckaroo-mastersettings.php:138 +#: gateway-buckaroo-mastersettings.php:146 msgid "Use new icons" msgstr "" diff --git a/library/api/paymentmethods/afterpay/afterpay.php b/library/api/paymentmethods/afterpay/afterpay.php index daaadd04e..dfb7823b4 100644 --- a/library/api/paymentmethods/afterpay/afterpay.php +++ b/library/api/paymentmethods/afterpay/afterpay.php @@ -70,7 +70,7 @@ public function PayOrAuthorizeAfterpay($products, $action) { $this->data['customVars'][$this->type]['BillingInitials'] = $this->BillingInitials; $this->data['customVars'][$this->type]['BillingLastName'] = $this->BillingLastName; - $this->data['customVars'][$this->type]['BillingBirthDate'] = $this->BillingBirthDate; + $this->data['customVars'][$this->type]['BillingBirthDate'] = ($this->B2B) ? '01-01-1900' : $this->BillingBirthDate; $this->data['customVars'][$this->type]['BillingStreet'] = $this->BillingStreet; $this->data['customVars'][$this->type]['BillingHouseNumber'] = isset($this->BillingHouseNumber) ? $this->BillingHouseNumber . ' ' : $this->BillingHouseNumber; $this->data['customVars'][$this->type]['BillingHouseNumberSuffix'] = $this->BillingHouseNumberSuffix; @@ -102,6 +102,10 @@ public function PayOrAuthorizeAfterpay($products, $action) $this->data['customVars'][$this->type]['Accept'] = $this->Accept; foreach ($products as $pos => $product) { + if(isset($product['type']) && $product['type'] === 'shipping') { + continue; + } + $this->setDefaultProductParams($product, $pos); } diff --git a/library/api/paymentmethods/afterpaynew/afterpaynew.php b/library/api/paymentmethods/afterpaynew/afterpaynew.php index 1dbde99c3..88d8f45f7 100644 --- a/library/api/paymentmethods/afterpaynew/afterpaynew.php +++ b/library/api/paymentmethods/afterpaynew/afterpaynew.php @@ -193,7 +193,7 @@ public function AfterPayRefund($products, $issuer) ); foreach (array_values($products) as $pos => $product) { - $this->setDefaultProductParams($product, $pos); + $this->setDefaultProductArticleParams($product, $pos); $this->setCustomVarAtPosition( 'RefundType', ($product["ArticleId"] == BuckarooConfig::SHIPPING_SKU ? "Refund" : "Return"), @@ -220,29 +220,51 @@ public function Capture($customVars = array(), $products = array()) ); foreach (array_values($products) as $pos => $product) { - $this->setDefaultProductParams($product, $pos); + $this->setDefaultProductArticleParams($product, $pos); } return $this->CaptureGlobal(); } - private function setDefaultProductParams($product, $position) - { + private function setDefaultProductParams($product, $position){ $productData = [ - 'Description' => $product["description"], - 'Identifier' => $product["identifier"], - 'Quantity' => $product["quantity"], - 'GrossUnitprice' => $product["price"], + 'Description' => $product['description'], + 'Identifier' => $product['identifier'], + 'Quantity' => $product['quantity'], + 'GrossUnitprice' => $product['price'], 'VatPercentage' => $product['vatPercentage'], + ]; + + if (isset($product['url']) && !empty(trim($product['url']))) { + $productData['Url'] = $product['url']; + } + + if (isset($product['imgUrl']) && !empty($product['imgUrl'])) { + $productData['ImageUrl'] = $product['imgUrl']; + } + $this->setCustomVarsAtPosition( + $productData, + $position, + 'Article' + ); + } + + private function setDefaultProductArticleParams($product, $position){ + $productData = [ + 'Description' => $product['ArticleDescription'], + 'Identifier' => $product['ArticleId'], + 'Quantity' => $product['ArticleQuantity'], + 'GrossUnitprice' => $product['ArticleUnitprice'], + 'VatPercentage' => $product['ArticleVatcategory'], ]; - if (isset($product["url"]) && !empty(trim($product["url"]))) { - $productData['Url'] = $product["url"]; + if (isset($product['url']) && !empty(trim($product['url']))) { + $productData['Url'] = $product['url']; } - if (isset($product["imgUrl"]) && !empty($product["imgUrl"])) { - $productData['ImageUrl'] = $product["imgUrl"]; + if (isset($product['imgUrl']) && !empty($product['imgUrl'])) { + $productData['ImageUrl'] = $product['imgUrl']; } $this->setCustomVarsAtPosition( diff --git a/library/api/paymentmethods/ideal/ideal.php b/library/api/paymentmethods/ideal/ideal.php index a6cb8a991..4079da236 100644 --- a/library/api/paymentmethods/ideal/ideal.php +++ b/library/api/paymentmethods/ideal/ideal.php @@ -25,7 +25,7 @@ public function __construct() { public function Pay($customVars = array()) { $this->setCustomVar( 'issuer', - $this->_getIssuer($this->issuer) + $this->issuer ); return parent::Pay(); } @@ -36,104 +36,55 @@ public function Pay($customVars = array()) { */ public static function getIssuerList() { $issuerArray = array( - 'ABNAMRO' => array( + 'ABNANL2A' => array( 'name' => 'ABN AMRO', - 'logo' => 'logo_abn_s.gif', + 'logo' => 'abnamro.svg', ), - 'ASNBANK' => array( + 'ASNBNL21' => array( 'name' => 'ASN Bank', - 'logo' => 'logo_asn.gif', + 'logo' => 'asnbank.svg', ), - 'INGBANK' => array( + 'INGBNL2A' => array( 'name' => 'ING', - 'logo' => 'logo_ing_s.gif', + 'logo' => 'ing.svg', ), - 'RABOBANK' => array( + 'RABONL2U' => array( 'name' => 'Rabobank', - 'logo' => 'logo_rabo_s.gif', + 'logo' => 'rabobank.svg', ), - 'SNSBANK' => array( + 'SNSBNL2A' => array( 'name' => 'SNS Bank', - 'logo' => 'logo_sns_s.gif', + 'logo' => 'sns.svg', ), - 'SNSREGIO' => array( + 'RBRBNL21' => array( 'name' => 'RegioBank', - 'logo' => 'regiobanklogo.png', + 'logo' => 'regiobank.svg', ), - 'TRIODOS' => array( + 'TRIONL2U' => array( 'name' => 'Triodos Bank', - 'logo' => 'logo_triodos.gif', + 'logo' => 'triodos.svg', ), - 'LANSCHOT' => array( + 'FVLBNL22' => array( 'name' => 'Van Lanschot', - 'logo' => 'logo_lanschot_s.gif', + 'logo' => 'vanlanschot.svg', ), - 'KNAB' => array( + 'KNABNL2H' => array( 'name' => 'Knab', - 'logo' => 'logo_knab_s.gif', + 'logo' => 'knab.svg', ), - 'BUNQ' => array( + 'BUNQNL2A' => array( 'name' => 'bunq', - 'logo' => 'logo_bunq.png', + 'logo' => 'bunq.svg', ), - 'REVOLUT' => array( + 'REVOLT21' => array( 'name' => 'Revolut', - 'logo' => 'logo_revolutbanken.png', + 'logo' => 'revolut.svg', ), - 'YOURSAFE' => array( + 'BITSNL2A' => array( 'name' => 'Yoursafe', - 'logo' => 'YourSafe.png', + 'logo' => 'yoursafe.svg', ), ); return $issuerArray; } - - /** - * @access public - * @param string $issuer - * @return array $issuerCode - */ - protected function _getIssuer($issuer) { - $issuerCode = ''; - switch ($issuer) { - case 'ABNAMRO': - $issuerCode = 'ABNANL2A'; - break; - case 'ASNBANK': - $issuerCode = 'ASNBNL21'; - break; - case 'INGBANK': - $issuerCode = 'INGBNL2A'; - break; - case 'RABOBANK': - $issuerCode = 'RABONL2U'; - break; - case 'SNSBANK': - $issuerCode = 'SNSBNL2A'; - break; - case 'SNSREGIO': - $issuerCode = 'RBRBNL21'; - break; - case 'TRIODOS': - $issuerCode = 'TRIONL2U'; - break; - case 'LANSCHOT': - $issuerCode = 'FVLBNL22'; - break; - case 'KNAB': - $issuerCode = 'KNABNL2H'; - break; - case 'BUNQ': - $issuerCode = 'BUNQNL2A'; - break; - case 'REVOLUT': - $issuerCode = 'REVOLT21'; - break; - case 'YOURSAFE': - $issuerCode = 'BITSNL2A'; - break; - } - - return $issuerCode; - } } \ No newline at end of file diff --git a/library/api/paymentmethods/in3/in3.php b/library/api/paymentmethods/in3/in3.php index 8dd2d42b9..e0e669eae 100644 --- a/library/api/paymentmethods/in3/in3.php +++ b/library/api/paymentmethods/in3/in3.php @@ -19,15 +19,11 @@ class BuckarooIn3 extends BuckarooPaymentMethod public $BillingPhoneNumber; public $BillingLanguage; public $IdentificationNumber; - public $ShippingCosts; - public $ShippingCostsTax; public $CustomerIPAddress; public $Accept; public $InvoiceDate; - public $CustomerType; public $cocNumber; public $companyName; - public $in3Version; public $orderId; /** @@ -58,7 +54,7 @@ public function Pay($customVars = array()) public function PayIn3($products, $action) { $this->setParameter("customParameters", ["order_id" => $this->getRealOrderId()]); - $this->setCustomVar("CustomerType", ["value" => $this->CustomerType]); + $this->setCustomVar("CustomerType", ["value" => "Debtor"]); $this->setCustomVar("InvoiceDate", ["value" => $this->InvoiceDate]); $this->setCustomVar( @@ -87,70 +83,28 @@ public function PayIn3($products, $action) $this->setCustomVar("Phone", $this->BillingPhoneNumber, 'Phone'); $this->setCustomVar("Email", $this->BillingEmail, 'Email'); - // Merge products with same SKU - $mergedProducts = array(); - foreach ($products['product'] as $product) { - if (!isset($mergedProducts[$product['ArticleId']])) { - $mergedProducts[$product['ArticleId']] = $product; - } else { - $mergedProducts[$product['ArticleId']]["ArticleQuantity"] += 1; - } + foreach ($products as $pos => $product) { + $this->setDefaultProductParams($product, $pos); } + return parent::$action(); + } - $products['product'] = $mergedProducts; - - foreach (array_values($products['product']) as $pos => $p) { - $this->setCustomVarsAtPosition( - [ - "Name" => $p["ArticleDescription"], - "Code" => $p["ArticleId"], - "Quantity" => $p["ArticleQuantity"], - "Price" =>$p["ArticleUnitprice"] - ], - $pos, - 'ProductLine' - ); - } - $i = count($products['product']); - if (!empty($products['fee'])) { - - $this->setCustomVarsAtPosition( - [ - "Name" => __('Payment fee', 'wc-buckaroo-bpe-gateway'), - "Code" => $products['fee']["ArticleId"], - "Quantity" => $products['fee']["ArticleQuantity"], - "Price" => $products['fee']["ArticleUnitprice"] - ], - $i, - 'ProductLine' - ); - $i++; - } + private function setDefaultProductParams($product, $position) + { - if (!empty($this->cocNumber)) { - $this->setCustomVar("ChamberOfCommerce", $this->cocNumber, 'Company'); - } + $productData = [ + 'Name' => $product["description"], + 'Code' => $product["identifier"], + 'Quantity' => $product["quantity"], + 'Price' => $product["price"], + ]; - if (!empty($this->companyName)) { - $this->setCustomVarAtPosition( - "Name", $this->companyName, $i, 'Company' - ); - $i++; - } + $this->setCustomVarsAtPosition( - [ - "Name" => __('Shipping cost', 'wc-buckaroo-bpe-gateway'), - "Code" => __('Shipping', 'wc-buckaroo-bpe-gateway'), - "Quantity" => '1', - "Price" => (!empty($this->ShippingCosts) ? $this->ShippingCosts : '0') - ], - $i, - 'SubtotalLine' + $productData, + $position, + 'ProductLine' ); - - $this->setCustomVar("IsInThreeGuarantee", $this->in3Version, ''); - - return parent::$action(); } /** diff --git a/library/api/soap.php b/library/api/soap.php index aca0304d5..4c6a3c6c3 100644 --- a/library/api/soap.php +++ b/library/api/soap.php @@ -379,7 +379,7 @@ protected function _error($client = false) { } private function isArticleField($field) { - $articleFields = array('Description', 'Identifier', 'Quantity', 'GrossUnitprice', 'VatPercentage', 'Url', 'ImageUrl'); + $articleFields = array('Description', 'Identifier', 'Quantity', 'GrossUnitprice', 'VatPercentage', 'Url', 'ImageUrl', 'RefundType'); return in_array($field, $articleFields); } diff --git a/library/buckaroo_images/ajax-loader.gif b/library/buckaroo_images/ajax-loader.gif deleted file mode 100644 index 3d37d4393..000000000 Binary files a/library/buckaroo_images/ajax-loader.gif and /dev/null differ diff --git a/library/buckaroo_images/belfius.png b/library/buckaroo_images/belfius.png deleted file mode 100644 index 1671d6220..000000000 Binary files a/library/buckaroo_images/belfius.png and /dev/null differ diff --git a/library/buckaroo_images/billink.png b/library/buckaroo_images/billink.png deleted file mode 100644 index 0b2049d73..000000000 Binary files a/library/buckaroo_images/billink.png and /dev/null differ diff --git a/library/buckaroo_images/buckaroo_large.png b/library/buckaroo_images/buckaroo_large.png deleted file mode 100644 index feef0fce0..000000000 Binary files a/library/buckaroo_images/buckaroo_large.png and /dev/null differ diff --git a/library/buckaroo_images/byjuno.png b/library/buckaroo_images/byjuno.png deleted file mode 100644 index 939be24e1..000000000 Binary files a/library/buckaroo_images/byjuno.png and /dev/null differ diff --git a/library/buckaroo_images/cashticket.png b/library/buckaroo_images/cashticket.png deleted file mode 100644 index 6b4ce7fd6..000000000 Binary files a/library/buckaroo_images/cashticket.png and /dev/null differ diff --git a/library/buckaroo_images/cc.gif b/library/buckaroo_images/cc.gif deleted file mode 100644 index f16f0a93a..000000000 Binary files a/library/buckaroo_images/cc.gif and /dev/null differ diff --git a/library/buckaroo_images/creditcards/cartebleuevisa.svg b/library/buckaroo_images/creditcards/cartebleue.svg similarity index 100% rename from library/buckaroo_images/creditcards/cartebleuevisa.svg rename to library/buckaroo_images/creditcards/cartebleue.svg diff --git a/library/buckaroo_images/directdebit.png b/library/buckaroo_images/directdebit.png deleted file mode 100644 index 0a9a93750..000000000 Binary files a/library/buckaroo_images/directdebit.png and /dev/null differ diff --git a/library/buckaroo_images/emaestro.png b/library/buckaroo_images/emaestro.png deleted file mode 100644 index 67f2d37eb..000000000 Binary files a/library/buckaroo_images/emaestro.png and /dev/null differ diff --git a/library/buckaroo_images/empayment.png b/library/buckaroo_images/empayment.png deleted file mode 100644 index 2085a9d9c..000000000 Binary files a/library/buckaroo_images/empayment.png and /dev/null differ diff --git a/library/buckaroo_images/giftcard.gif b/library/buckaroo_images/giftcard.gif deleted file mode 100644 index b3573f117..000000000 Binary files a/library/buckaroo_images/giftcard.gif and /dev/null differ diff --git a/library/buckaroo_images/giropay.gif b/library/buckaroo_images/giropay.gif deleted file mode 100644 index a2f07d152..000000000 Binary files a/library/buckaroo_images/giropay.gif and /dev/null differ diff --git a/library/buckaroo_images/icon_asn.gif b/library/buckaroo_images/icon_asn.gif deleted file mode 100644 index bf21847ae..000000000 Binary files a/library/buckaroo_images/icon_asn.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal.gif b/library/buckaroo_images/ideal.gif deleted file mode 100644 index 6b5a5d783..000000000 Binary files a/library/buckaroo_images/ideal.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal.png b/library/buckaroo_images/ideal.png deleted file mode 100644 index b3954d8dd..000000000 Binary files a/library/buckaroo_images/ideal.png and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_abn_s.gif b/library/buckaroo_images/ideal/logo_abn_s.gif deleted file mode 100644 index 6d26e8ae6..000000000 Binary files a/library/buckaroo_images/ideal/logo_abn_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_asn.gif b/library/buckaroo_images/ideal/logo_asn.gif deleted file mode 100644 index bf21847ae..000000000 Binary files a/library/buckaroo_images/ideal/logo_asn.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_bunq.png b/library/buckaroo_images/ideal/logo_bunq.png deleted file mode 100644 index 9d2cafff7..000000000 Binary files a/library/buckaroo_images/ideal/logo_bunq.png and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_fortis_s.gif b/library/buckaroo_images/ideal/logo_fortis_s.gif deleted file mode 100644 index f3bc2fdd0..000000000 Binary files a/library/buckaroo_images/ideal/logo_fortis_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_friesland_s.gif b/library/buckaroo_images/ideal/logo_friesland_s.gif deleted file mode 100644 index db0261550..000000000 Binary files a/library/buckaroo_images/ideal/logo_friesland_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_ing_s.gif b/library/buckaroo_images/ideal/logo_ing_s.gif deleted file mode 100644 index 82be96bd8..000000000 Binary files a/library/buckaroo_images/ideal/logo_ing_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_knab_s.gif b/library/buckaroo_images/ideal/logo_knab_s.gif deleted file mode 100644 index 898f3b854..000000000 Binary files a/library/buckaroo_images/ideal/logo_knab_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_lanschot.gif b/library/buckaroo_images/ideal/logo_lanschot.gif deleted file mode 100644 index 66298e6bb..000000000 Binary files a/library/buckaroo_images/ideal/logo_lanschot.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_lanschot_s.gif b/library/buckaroo_images/ideal/logo_lanschot_s.gif deleted file mode 100644 index 9046b9e0e..000000000 Binary files a/library/buckaroo_images/ideal/logo_lanschot_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_moneyou.png b/library/buckaroo_images/ideal/logo_moneyou.png deleted file mode 100644 index 6c88ea1e8..000000000 Binary files a/library/buckaroo_images/ideal/logo_moneyou.png and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_rabo_s.gif b/library/buckaroo_images/ideal/logo_rabo_s.gif deleted file mode 100644 index 0fc7dd064..000000000 Binary files a/library/buckaroo_images/ideal/logo_rabo_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_revolutbanken.png b/library/buckaroo_images/ideal/logo_revolutbanken.png deleted file mode 100644 index 5a826fd31..000000000 Binary files a/library/buckaroo_images/ideal/logo_revolutbanken.png and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_sns_s.gif b/library/buckaroo_images/ideal/logo_sns_s.gif deleted file mode 100644 index b18c4c1f4..000000000 Binary files a/library/buckaroo_images/ideal/logo_sns_s.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/logo_triodos.gif b/library/buckaroo_images/ideal/logo_triodos.gif deleted file mode 100644 index dfcde8bb3..000000000 Binary files a/library/buckaroo_images/ideal/logo_triodos.gif and /dev/null differ diff --git a/library/buckaroo_images/ideal/regiobanklogo.png b/library/buckaroo_images/ideal/regiobanklogo.png deleted file mode 100644 index 2a43b4b9e..000000000 Binary files a/library/buckaroo_images/ideal/regiobanklogo.png and /dev/null differ diff --git a/library/buckaroo_images/in3.png b/library/buckaroo_images/in3.png deleted file mode 100644 index f69982ad5..000000000 Binary files a/library/buckaroo_images/in3.png and /dev/null differ diff --git a/library/buckaroo_images/kbc.png b/library/buckaroo_images/kbc.png deleted file mode 100644 index 491a303d7..000000000 Binary files a/library/buckaroo_images/kbc.png and /dev/null differ diff --git a/library/buckaroo_images/mistercash.png b/library/buckaroo_images/mistercash.png deleted file mode 100644 index 84fbdb63f..000000000 Binary files a/library/buckaroo_images/mistercash.png and /dev/null differ diff --git a/library/buckaroo_images/payconiqlogo.png b/library/buckaroo_images/payconiqlogo.png deleted file mode 100644 index d40160f27..000000000 Binary files a/library/buckaroo_images/payconiqlogo.png and /dev/null differ diff --git a/library/buckaroo_images/paypal.gif b/library/buckaroo_images/paypal.gif deleted file mode 100644 index 5147da17d..000000000 Binary files a/library/buckaroo_images/paypal.gif and /dev/null differ diff --git a/library/buckaroo_images/requesttopay.png b/library/buckaroo_images/requesttopay.png deleted file mode 100644 index 2b7f5c74b..000000000 Binary files a/library/buckaroo_images/requesttopay.png and /dev/null differ diff --git a/library/buckaroo_images/sofort.png b/library/buckaroo_images/sofort.png deleted file mode 100644 index 8e1c01cdb..000000000 Binary files a/library/buckaroo_images/sofort.png and /dev/null differ diff --git a/library/buckaroo_images/svg/Alipay.svg b/library/buckaroo_images/svg/Alipay.svg deleted file mode 100644 index e967179ad..000000000 --- a/library/buckaroo_images/svg/Alipay.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/ApplePay.svg b/library/buckaroo_images/svg/ApplePay.svg deleted file mode 100644 index 2726172d6..000000000 --- a/library/buckaroo_images/svg/ApplePay.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/Bancontact.svg b/library/buckaroo_images/svg/Bancontact.svg deleted file mode 100644 index 676114595..000000000 --- a/library/buckaroo_images/svg/Bancontact.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/CBC.svg b/library/buckaroo_images/svg/CBC.svg deleted file mode 100644 index f633558af..000000000 --- a/library/buckaroo_images/svg/CBC.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - diff --git a/library/buckaroo_images/svg/Creditcards.svg b/library/buckaroo_images/svg/Creditcards.svg deleted file mode 100644 index 5cd99e3c5..000000000 --- a/library/buckaroo_images/svg/Creditcards.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - diff --git a/library/buckaroo_images/svg/Giftcards.svg b/library/buckaroo_images/svg/Giftcards.svg deleted file mode 100644 index 2c8bd0c67..000000000 --- a/library/buckaroo_images/svg/Giftcards.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - -GIFT -CARD - - diff --git a/library/buckaroo_images/svg/Giropay.svg b/library/buckaroo_images/svg/Giropay.svg deleted file mode 100644 index 460f302f4..000000000 --- a/library/buckaroo_images/svg/Giropay.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/INGHomePay.svg b/library/buckaroo_images/svg/INGHomePay.svg deleted file mode 100644 index ade21b981..000000000 --- a/library/buckaroo_images/svg/INGHomePay.svg +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - -Pay -Home - - diff --git a/library/buckaroo_images/svg/SEPACreditTransfer.svg b/library/buckaroo_images/svg/SEPACreditTransfer.svg deleted file mode 100644 index e904a166a..000000000 --- a/library/buckaroo_images/svg/SEPACreditTransfer.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/SEPAdirectdebit.svg b/library/buckaroo_images/svg/SEPAdirectdebit.svg deleted file mode 100644 index ec6f19034..000000000 --- a/library/buckaroo_images/svg/SEPAdirectdebit.svg +++ /dev/null @@ -1,800 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -TRANSFER -OVERBOEKING - - diff --git a/library/buckaroo_images/svg/Tinka.svg b/library/buckaroo_images/svg/Tinka.svg deleted file mode 100644 index b78f4ba7a..000000000 --- a/library/buckaroo_images/svg/Tinka.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/Trustly.svg b/library/buckaroo_images/svg/Trustly.svg deleted file mode 100644 index d3fab7b02..000000000 --- a/library/buckaroo_images/svg/Trustly.svg +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - diff --git a/library/buckaroo_images/svg/WeChatPay.svg b/library/buckaroo_images/svg/WeChatPay.svg deleted file mode 100644 index b52da5fbb..000000000 --- a/library/buckaroo_images/svg/WeChatPay.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/library/buckaroo_images/svg/AfterPay.svg b/library/buckaroo_images/svg/afterpay.svg similarity index 71% rename from library/buckaroo_images/svg/AfterPay.svg rename to library/buckaroo_images/svg/afterpay.svg index 7e8c1f905..2b28dc73d 100644 --- a/library/buckaroo_images/svg/AfterPay.svg +++ b/library/buckaroo_images/svg/afterpay.svg @@ -1,150 +1,166 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/applepay.svg b/library/buckaroo_images/svg/applepay.svg new file mode 100644 index 000000000..aa46a6973 --- /dev/null +++ b/library/buckaroo_images/svg/applepay.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/bancontact.svg b/library/buckaroo_images/svg/bancontact.svg new file mode 100644 index 000000000..cca76be73 --- /dev/null +++ b/library/buckaroo_images/svg/bancontact.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/Belfius.svg b/library/buckaroo_images/svg/belfius.svg similarity index 100% rename from library/buckaroo_images/svg/Belfius.svg rename to library/buckaroo_images/svg/belfius.svg diff --git a/library/buckaroo_images/svg/Billink.svg b/library/buckaroo_images/svg/billink.svg similarity index 100% rename from library/buckaroo_images/svg/Billink.svg rename to library/buckaroo_images/svg/billink.svg diff --git a/library/buckaroo_images/svg/creditcards.svg b/library/buckaroo_images/svg/creditcards.svg new file mode 100644 index 000000000..0026d72c1 --- /dev/null +++ b/library/buckaroo_images/svg/creditcards.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/CreditClick.svg b/library/buckaroo_images/svg/creditclick.svg similarity index 100% rename from library/buckaroo_images/svg/CreditClick.svg rename to library/buckaroo_images/svg/creditclick.svg diff --git a/library/buckaroo_images/svg/EPS.svg b/library/buckaroo_images/svg/eps.svg similarity index 100% rename from library/buckaroo_images/svg/EPS.svg rename to library/buckaroo_images/svg/eps.svg diff --git a/library/buckaroo_images/svg/giftcards.svg b/library/buckaroo_images/svg/giftcards.svg new file mode 100644 index 000000000..d633121e4 --- /dev/null +++ b/library/buckaroo_images/svg/giftcards.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/giropay.svg b/library/buckaroo_images/svg/giropay.svg new file mode 100644 index 000000000..603f201e8 --- /dev/null +++ b/library/buckaroo_images/svg/giropay.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/iDEAL.svg b/library/buckaroo_images/svg/ideal.svg similarity index 100% rename from library/buckaroo_images/svg/iDEAL.svg rename to library/buckaroo_images/svg/ideal.svg diff --git a/library/buckaroo_images/svg/In3.svg b/library/buckaroo_images/svg/in3.svg similarity index 100% rename from library/buckaroo_images/svg/In3.svg rename to library/buckaroo_images/svg/in3.svg diff --git a/library/buckaroo_images/svg/KBC.svg b/library/buckaroo_images/svg/kbc.svg similarity index 100% rename from library/buckaroo_images/svg/KBC.svg rename to library/buckaroo_images/svg/kbc.svg diff --git a/library/buckaroo_images/svg/Klarna.svg b/library/buckaroo_images/svg/klarna.svg similarity index 100% rename from library/buckaroo_images/svg/Klarna.svg rename to library/buckaroo_images/svg/klarna.svg diff --git a/library/buckaroo_images/svg/Payconiq.svg b/library/buckaroo_images/svg/payconiq.svg similarity index 100% rename from library/buckaroo_images/svg/Payconiq.svg rename to library/buckaroo_images/svg/payconiq.svg diff --git a/library/buckaroo_images/svg/PayPal.svg b/library/buckaroo_images/svg/paypal.svg similarity index 100% rename from library/buckaroo_images/svg/PayPal.svg rename to library/buckaroo_images/svg/paypal.svg diff --git a/library/buckaroo_images/svg/PayPerEmail.svg b/library/buckaroo_images/svg/payperemail.svg similarity index 100% rename from library/buckaroo_images/svg/PayPerEmail.svg rename to library/buckaroo_images/svg/payperemail.svg diff --git a/library/buckaroo_images/svg/Przelewy24.svg b/library/buckaroo_images/svg/przelewy24.svg similarity index 100% rename from library/buckaroo_images/svg/Przelewy24.svg rename to library/buckaroo_images/svg/przelewy24.svg diff --git a/library/buckaroo_images/svg/readme.txt b/library/buckaroo_images/svg/readme.txt deleted file mode 100644 index 6607d340c..000000000 --- a/library/buckaroo_images/svg/readme.txt +++ /dev/null @@ -1 +0,0 @@ -important note: this directory is autopopulated by github actions from external repository upon each commit ! \ No newline at end of file diff --git a/library/buckaroo_images/svg/sepa-credittransfer.svg b/library/buckaroo_images/svg/sepa-credittransfer.svg new file mode 100644 index 000000000..fd1ea6190 --- /dev/null +++ b/library/buckaroo_images/svg/sepa-credittransfer.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/sepa-directdebit.svg b/library/buckaroo_images/svg/sepa-directdebit.svg new file mode 100644 index 000000000..4473b2858 --- /dev/null +++ b/library/buckaroo_images/svg/sepa-directdebit.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/buckaroo_images/svg/Sofort.svg b/library/buckaroo_images/svg/sofort.svg similarity index 100% rename from library/buckaroo_images/svg/Sofort.svg rename to library/buckaroo_images/svg/sofort.svg diff --git a/library/buckaroo_images/transfer.gif b/library/buckaroo_images/transfer.gif deleted file mode 100644 index 23c04e9d4..000000000 Binary files a/library/buckaroo_images/transfer.gif and /dev/null differ diff --git a/library/buckaroo_images/transfer.jpg b/library/buckaroo_images/transfer.jpg deleted file mode 100644 index c3a67d073..000000000 Binary files a/library/buckaroo_images/transfer.jpg and /dev/null differ diff --git a/library/buckaroo_images/transfergarant.png b/library/buckaroo_images/transfergarant.png deleted file mode 100644 index 2123543b9..000000000 Binary files a/library/buckaroo_images/transfergarant.png and /dev/null differ diff --git a/library/config.php b/library/config.php index 37d4c9b3f..eb16f1354 100644 --- a/library/config.php +++ b/library/config.php @@ -7,7 +7,7 @@ class BuckarooConfig extends BuckarooConfigCore { const NAME = 'buckaroo3'; const PLUGIN_NAME = 'Buckaroo BPE 3.0 official plugin'; - const VERSION = '3.6.1'; + const VERSION = '3.7.0'; const SHIPPING_SKU = "WC8888"; private static $idinCategories; diff --git a/library/css/buckaroo-custom.css b/library/css/buckaroo-custom.css index 9d34ce668..89152c977 100644 --- a/library/css/buckaroo-custom.css +++ b/library/css/buckaroo-custom.css @@ -187,9 +187,6 @@ label[for^="payment_method_buckaroo_"] img { max-height: 25px; max-width: auto; } -label[for^="payment_method_buckaroo_creditcard"] img { - max-height: 72px; -} .buckaroo-paypal-express { margin: 10px 0; max-width: 200px; diff --git a/readme.txt b/readme.txt index b06836afd..9f6e80878 100644 --- a/readme.txt +++ b/readme.txt @@ -3,8 +3,8 @@ Contributors: buckaroosupport Author: Buckaroo Tags: WooCommerce, payments, Buckaroo Requires at least: 4.4.10 -Tested up to: 6.2 -Stable tag: 3.6.1 +Tested up to: 6.2.2 +Stable tag: 3.7.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -97,6 +97,16 @@ Please contact support@buckaroo.nl if you need help installing the WooCommerce p == Changelog == += 3.7.0 = +Add support for Wordpress 6.2.2 +Add support for WooCommerce 7.8.0 +- Update payment method logo's [BP-2446] +- In3 method version changes [BP-2294] +- Preparation for adding support for Buckaroo Subscriptions [BP-2323] +- Riverty/AfterPay (old) shipping cost bug fix [BP-2559] +- Riverty/AfterPay Separate Capture and Refund fix [BP-2486] +- Riverty | Afterpay (old) B2B and B2C fix [BP-2493] + = 3.6.1 = - Fix Tested up to tag to correct wp version = 3.6.0 = diff --git a/templates/gateways/in3.php b/templates/gateways/in3.php index a7bfb5d7f..c5bb091b9 100644 --- a/templates/gateways/in3.php +++ b/templates/gateways/in3.php @@ -22,59 +22,5 @@ getPaymentTemplate('partial_birth_field'); ?> -

- - -

- - - - -

- * -

\ No newline at end of file