fix on shortcode for 3, 12 times payments

Author: emnbdx

block/helloasso-woocommerce-blocks.php

@@ -46,18 +46,22 @@ public function get_payment_method_data()
 		$multi_12_enabled = isset($this->settings['multi_12_enabled']) && $this->settings['multi_12_enabled'] === 'yes';
 
 		$payment_choices = ['one_time'];
-		if ($multi_3_enabled) {
+
+		$current_day = (int) current_time('j');
+		$can_show_multi_payment = $current_day <= 28;
+
+		if ($multi_3_enabled && $can_show_multi_payment) {
 			$payment_choices[] = 'three_times';
 		}
-		if ($multi_12_enabled) {
+		if ($multi_12_enabled && $can_show_multi_payment) {
 			$payment_choices[] = 'twelve_times';
 		}
 
 		return [
 			'title' => $this->gateway->title,
 			'description' => $this->gateway->description,
-			'multi_3_enabled' => $multi_3_enabled,
-			'multi_12_enabled' => $multi_12_enabled,
+			'multi_3_enabled' => $multi_3_enabled && $can_show_multi_payment,
+			'multi_12_enabled' => $multi_12_enabled && $can_show_multi_payment,
 			'payment_choices' => $payment_choices
 		];
 	}

cron/helloasso-woocommerce-cron.php

@@ -5,8 +5,8 @@ function hello_asso_cron_refresh_token()
 	helloasso_refresh_token_asso();
 }
 
-if (!wp_next_scheduled('hello_asso_cron_refresh_token__hook')) {
-	wp_schedule_event(strtotime('00:00:00'), 'daily', 'hello_asso_cron_refresh_token__hook');
+if (!wp_next_scheduled('hello_asso_cron_refresh_token_hook')) {
+	wp_schedule_event(strtotime('00:00:00'), 'daily', 'hello_asso_cron_refresh_token_hook');
 }
 
 function helloasso_refresh_token_asso()
@@ -56,4 +56,4 @@ function helloasso_refresh_token_asso()
 	}
 }
 
-add_action('cron_refresh_token_hello_asso__hook', 'cron_refresh_token_hello_asso');
+add_action('hello_asso_cron_refresh_token_hook', 'hello_asso_cron_refresh_token');

helloasso-woocommerce-gateway.php

@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       HelloAsso Payments for WooCommerce
  * Description:       Recevez 100% de vos paiements gratuitement. HelloAsso est la seule solution de paiement gratuite du secteur associatif. Nous sommes financés librement par la solidarité de celles et ceux qui choisissent de laisser une contribution volontaire au moment du paiement à une association.
- * Version:           1.0.9
+ * Version:           1.0.10
  * Requires at least: 5.0
  * WC requires at least: 7.7
  * Requires PHP:      7.2.34
@@ -142,6 +142,48 @@ public function __construct()
 			add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
 		}
 
+		public function payment_fields()
+		{
+			if ($this->description) {
+				echo '<div style="display: flex; align-items: center;">';
+				echo '<img style="max-width: 50px; height:auto; margin-right: 16px;" src="/wp-content/plugins/helloasso-payments-for-woocommerce/assets/logo-ha.png" alt="HelloAsso Logo" />';
+				echo '<p>' . wp_kses_post($this->description) . '</p>';
+				echo '</div>';
+			}
+
+			$multi_3_enabled = $this->get_option('multi_3_enabled') === 'yes';
+			$multi_12_enabled = $this->get_option('multi_12_enabled') === 'yes';
+
+			$current_day = (int) current_time('j');
+			$can_show_multi_payment = $current_day <= 28;
+
+			if (($multi_3_enabled || $multi_12_enabled) && $can_show_multi_payment) {
+				echo '<div id="helloasso-payment-options">';
+				echo '<p><strong>Choisissez votre mode de paiement:</strong></p>';
+
+				echo '<label style="display: block; margin-bottom: 8px;">';
+				echo '<input type="radio" name="helloasso_payment_type" value="one_time" checked="checked" style="margin-right: 5px;" />';
+				echo 'Paiement comptant';
+				echo '</label>';
+
+				if ($multi_3_enabled) {
+					echo '<label style="display: block; margin-bottom: 8px;">';
+					echo '<input type="radio" name="helloasso_payment_type" value="three_times" style="margin-right: 5px;" />';
+					echo 'Paiement en 3 fois sans frais';
+					echo '</label>';
+				}
+
+				if ($multi_12_enabled) {
+					echo '<label style="display: block; margin-bottom: 8px;">';
+					echo '<input type="radio" name="helloasso_payment_type" value="twelve_times" style="margin-right: 5px;" />';
+					echo 'Paiement en 12 fois sans frais';
+					echo '</label>';
+				}
+
+				echo '</div>';
+			}
+		}
+
 		public function admin_options()
 		{
 			// Check if we have helloasso_access_token_asso in the options

readme.txt

@@ -3,9 +3,9 @@ Contributors: helloasso
 Donate link: https://helloasso.com
 Tags: helloasso, payment, association, don, billetterie
 Requires at least: 5.0
-Tested up to: 6.8
+Tested up to: 6.8.1
 Requires PHP: 7.2.34
-Stable tag: 1.0.9
+Stable tag: 1.0.10
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -96,6 +96,11 @@ Please report security bugs found in the source code of the helloasso plugin thr
 
 == Changelog ==
 
+= 1.0.10 =
+* Affichage du paiement en trois et douze fois même avec le shortcode
+* Le paiement en trois et douze fois n'est plus proposé si le jour est > supérieur à 28
+* Correction sur le cron
+
 = 1.0.9 =
 * Ajout du paiement en trois et douze fois