Skip to content

Commit 3e10184

Browse files
committed
Merge remote-tracking branch 'origin/master' into v4
# Conflicts: # includes/classes/PPMFWC/Gateways.php # includes/classes/PPMFWC/Helper/Data.php # readme.txt # woocommerce-payment-paynl.php
2 parents fcd436e + a017285 commit 3e10184

17 files changed

Lines changed: 255 additions & 1 deletion

assets/logos/408.png

2.71 KB
Loading

assets/logos/411.png

2.61 KB
Loading

assets/logos/414.png

5.04 KB
Loading

assets/logos/423.png

4.32 KB
Loading

assets/logos/426.png

2.69 KB
Loading

assets/logos/429.png

1.54 KB
Loading

assets/logos/432.png

1.95 KB
Loading

includes/classes/PPMFWC/Gateway/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ public function is_available()
491491
}
492492
}
493493

494-
if (is_array($arrShippingAllowed) && !in_array('all', $arrShippingAllowed)) {
494+
if (is_array($arrShippingAllowed) && !in_array('all', $arrShippingAllowed) && !empty($shippingMethods)) {
495495
foreach ($shippingMethods as $shippingMethod) {
496496
if (!in_array($shippingMethod, $arrShippingAllowed)) {
497497
return false;
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
/**
4+
* @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
5+
* @phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
6+
* @phpcs:disable PSR1.Methods.CamelCapsMethodName
7+
* @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
8+
*/
9+
10+
class PPMFWC_Gateway_Babycadeaubon extends PPMFWC_Gateway_Abstract
11+
{
12+
/**
13+
* @return string
14+
*/
15+
public static function getId()
16+
{
17+
return 'pay_gateway_babycadeaubon';
18+
}
19+
20+
/**
21+
* @return string
22+
*/
23+
public static function getName()
24+
{
25+
return 'Babycadeaubon';
26+
}
27+
28+
/**
29+
* @return integer
30+
*/
31+
public static function getOptionId()
32+
{
33+
return 4416;
34+
}
35+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
/**
4+
* @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
5+
* @phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps
6+
* @phpcs:disable PSR1.Methods.CamelCapsMethodName
7+
*/
8+
9+
class PPMFWC_Gateway_Boekencadeau extends PPMFWC_Gateway_Abstract
10+
{
11+
/**
12+
* @return string
13+
*/
14+
public static function getId()
15+
{
16+
return 'pay_gateway_boekencadeau';
17+
}
18+
19+
/**
20+
* @return string
21+
*/
22+
public static function getName()
23+
{
24+
return 'Boeken Cadeau';
25+
}
26+
27+
/**
28+
* @return integer
29+
*/
30+
public static function getOptionId()
31+
{
32+
return 4749;
33+
}
34+
}

0 commit comments

Comments
 (0)