Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update, test & release (1.49.3) #1030

Merged
merged 9 commits into from
Aug 28, 2024
Merged
7 changes: 5 additions & 2 deletions Controller/Redirect/Process.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,11 @@ protected function redirectFailure()
/**
* @noinspection PhpUndefinedMethodInspection
*/
$url = $this->accountConfig->getFailureRedirect($store);

if($this->hasPostData('add_service_action_from_magento', 'payfastcheckout')) {
$url = 'checkout/cart';
} else {
$url = $this->accountConfig->getFailureRedirect($store);
}
return $this->handleProcessedResponse($url);
}

Expand Down
2 changes: 1 addition & 1 deletion Model/Push.php
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ private function extractAddress($addressType)

// Add the addition (like 'A') if it exists
if (isset($address['addition'])) {
$address['street'] .= $address['addition'];
$address['street'] .= ' ' .$address['addition'];
unset($address['addition']);
}
unset($address['housenumber']);
Expand Down
2 changes: 1 addition & 1 deletion Service/Software/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Data
const MODULE_CODE = 'Buckaroo_Magento2';

/** Version of Module */
const BUCKAROO_VERSION = '1.49.2';
const BUCKAROO_VERSION = '1.49.3';

/** @var ProductMetadataInterface */
private $productMetadata;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"docs": "https://docs.buckaroo.io/"
},
"homepage": "https://www.buckaroo.nl",
"version" : "v1.49.2",
"version" : "v1.49.3",
"minimum-stability": "stable",
"autoload": {
"files": [
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system/account.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@

<field id="failure_redirect" translate="label comment" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Redirect url after 'Failure'</label>
<comment><![CDATA[Redirect after failed payments.]]></comment>
<comment><![CDATA[Redirect after failed payments.<br>Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.]]></comment>
<config_path>buckaroo_magento2/account/failure_redirect</config_path>
</field>

Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Buckaroo_Magento2:etc/buckaroo_module.xsd">
<module name="Buckaroo_Magento2" setup_version="1.49.2" build_number="1769" stability="stable">
<module name="Buckaroo_Magento2" setup_version="1.49.3" build_number="1769" stability="stable">
<sequence>
<module name="Magento_Payment"/>
<module name="Magento_ReleaseNotification"/>
Expand Down
2 changes: 1 addition & 1 deletion i18n/de_DE.csv
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"Redirect url after 'Success'","Umleitungs-URL nach 'Erfolg'"
"Redirect after successful payments.","Weiterleitung nach erfolgreicher Zahlung."
"Redirect url after 'Failure'","Umleitungs-URL nach 'Fehler'"
"Redirect after failed payments.","Weiterleitung nach fehlgeschlagenen Zahlungen."
"Redirect after failed payments.<br>Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Weiterleitung nach fehlgeschlagenen Zahlungen.<br>Bitte beachten Sie, dass diese Einstellung nicht für alle Express-Zahlungsmethoden gilt, wie zum Beispiel die iDEAL-Schnellkasse."
"'Canceled' state on failed payment","'Status 'Storniert' bei fehlgeschlagener Zahlung"
"Orders will stay open after failed payments.","Bestellungen bleiben nach fehlgeschlagenen Zahlungen offen."
"Debug email","E-Mail debuggen"
Expand Down
2 changes: 1 addition & 1 deletion i18n/fr_FR.csv
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"Redirect url after 'Success'","URL de redirection après 'Succès'"
"Redirect after successful payments.","Rediriger après des paiements réussis."
"Redirect url after 'Failure'","URL de redirection après 'Échec'"
"Redirect after failed payments.","Rediriger après des paiements échoués."
"Redirect after failed payments.<br>Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Rediriger après des paiements échoués.<br>Veuillez noter que ce paramètre ne s'applique pas à toutes les méthodes de paiement express, telles que le paiement rapide iDEAL."
"'Canceled' state on failed payment","'Canceled' status bij mislukte betalingen"
"Orders will stay open after failed payments.","État 'Annulé' en cas d'échec de paiement"
"Debug email","E-mail de débogage"
Expand Down
2 changes: 1 addition & 1 deletion i18n/nl_BE.csv
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"Redirect url after 'Success'","Redirect url na 'Success'"
"Redirect after successful payments.","Redirect URL na een geaccepteerde betaling."
"Redirect url after 'Failure'","Redirect url na 'Failure'"
"Redirect after failed payments.","Redirect URL na een afgeweze betaling."
"Redirect after failed payments.<br>Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Redirect URL na een afgewezen betaling.<br>Let op: deze instelling is niet van toepassing op alle express betaalmethoden, zoals iDEAL snel bestellen."
"'Canceled' state on failed payment","'Canceled' status bij mislukte betalingen"
"Orders will stay open after failed payments.","Orders worden niet geannuleerd na een afgewezen betaling."
"Debug email","Debug e-mail"
Expand Down
2 changes: 1 addition & 1 deletion i18n/nl_NL.csv
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"Redirect url after 'Success'","Redirect url na 'Success'"
"Redirect after successful payments.","Redirect URL na een geaccepteerde betaling."
"Redirect url after 'Failure'","Redirect url na 'Failure'"
"Redirect after failed payments.","Redirect URL na een afgeweze betaling."
"Redirect after failed payments.<br>Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Redirect URL na een afgewezen betaling.<br>Let op: deze instelling is niet van toepassing op alle express betaalmethoden, zoals iDEAL snel bestellen."
"'Canceled' state on failed payment","'Canceled' status bij mislukte betalingen"
"Orders will stay open after failed payments.","Orders worden niet geannuleerd na een afgewezen betaling."
"Debug email","Debug e-mail"
Expand Down
Loading