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.

Sign up for GitHub

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

Fix/piwoo 502 notices #920

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Fix/piwoo 502 notices #920

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a78768d
Check if string before preg_match
mmaymo Jun 28, 2024
b63cce4
Fix PHP notice in MollieObject
mmaymo Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Payment/MollieObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ protected function setOrderPaidAndProcessed(WC_Order $order)
protected function isOrderPaymentStartedByOtherGateway(WC_Order $order)
{
// Get the current payment method id for the order
$payment_method_id = $order->get_meta('_payment_method', true);
$payment_method_id = $order->get_payment_method();
// If the current payment method id for the order is not Mollie, return true
return strpos($payment_method_id, 'mollie') === false;
}
Expand Down Expand Up @@ -1079,7 +1079,7 @@ protected function getFormatedPhoneNumber(string $phone)
$phone = transformPhoneToNLFormat($phone);

//check that $phone is in E164 format or can be changed by api
if (preg_match('/^\+[1-9]\d{10,13}$|^[1-9]\d{9,13}$/', $phone)) {
if (is_string($phone) && preg_match('/^\+[1-9]\d{10,13}$|^[1-9]\d{9,13}$/', $phone)) {
return $phone;
}
return null;
Expand Down
Loading