added another state of error in payment if the payment is a success but the treatment has an error

plugins/cipf_plugin/cipf_plugin.php

@@ -116,7 +116,8 @@ class Cipf {
 	//const PAYPAL_CLIENT_ID     = self::PAYPAL_HUGO_LIVE_CLIENT_ID;
 	//const PAYPAL_CLIENT_SECRET = self::PAYPAL_HUGO_LIVE_CLIENT_SECRET;
 	//const PAYPAL_API_BASE_URL  = self::PAYPAL_HUGO_LIVE_API_BASE_URL;
-	const PAYPAL_MESSAGE_SUCCESS = 'Paiement reussi, vous allez être redirigé-es vers votre espace';
+	const PAYPAL_MESSAGE_SUCCESS = 'Paiement réussi, vous allez être redirigé-es vers votre espace';
+	const PAYPAL_MESSAGE_PROBLEM = "Paiement réussi, mais une erreure est survenue dans le traitement de la commande, si vous voyez que votre compte n'est pas mis à jour correctement, contactez la fipf directement";
 	const PAYPAL_MESSAGE_FAILURE = 'Paiement raté, vous allez être redirigé-es vers votre espace';
 
 	// ROLES
@@ -147,6 +148,11 @@ vous allez être redirigés vers votre espace',
 			'failure'=>
 'Paiement échoué,
 vous allez être redirigés vers votre espace',
+			'problem'=>
+"Paiement réussi,
+mais une erreur est survenue dans le traitement de la commande,
+si vous voyez que votre compte n'est pas mis à jour correctement,
+contactez la fipf directement",
 		],
 	];
 	const OPTION_EMAILS = [
@@ -154,103 +160,94 @@ vous allez être redirigés vers votre espace',
 		'_callback'=>'update_emails_settings_option_CIPF',
 		'_default'=>[
 // 1. profs    : email : payment_success     : validation payment prof reussi, send email
-			[
+			'payment_success'=>[
-				'action'=>'payment_success',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"paiement réussi",
 				'notification_message'=>"par ici la monnaie",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"paiement réussi",
-				'confirmation_mesage'=>"donne l'argent",
+				'confirmation_message'=>"donne l'argent",
 			],
 // 2. profs    : email : payment_failure     : validation payment prof echec, send email
-			[
+			'payment_echec'=>[
-				'action'=>'payment_echec',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 // 3. profs    : email : transfert_success   : validation transfert prof reussi, send email
-			[
+			'transfert_success'=>[
-				'action'=>'transfert_success',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 // 4. profs    : email : transfert_failures  : validation transfert prof echec, send email
-			[
+			'transfert_echec'=>[
-				'action'=>'transfert_echec',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 // 5. partners : email : offer_expired       : offres temporaires -> gerer qu'elles disparaissent apres la date de validite -> la passer en masquer
-			[
+			'offer_expired'=>[
-				'action'=>'offer_expired',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 // 6. partners : email : offer_will_expire   : la gestion des offres à échéance
-			[
+			'offer_will_expire'=>[
-				'action'=>'offer_will_expire',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
-// 7. payments : email : account_deleted     : schedule event pour supprimer le compte xx temps (6 mois ?) apres fin de validite de la carte
 			],
-			[
+// 7. payments : email : account_deleted     : schedule event pour supprimer le compte xx temps (6 mois ?) apres fin de validite de la carte
-				'action'=>'account_deleted',
+			'account_deleted'=>[
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 // 8. payments : email : account_will_expire : faire rappels emails avant expiration
-			[
+			'eccount_will_expire'=>[
-				'action'=>'eccount_will_expire',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 // 9. payments : email : account_expired     : desactiver carte expiree
-			[
+			'account_expired'=>[
-				'action'=>'account_expired',
 				'notification_send'=>true,
 				'notification_to'=>'$$__admin_email__$$',
 				'notification_subject'=>"",
 				'notification_message'=>"",
 				'confirmation_send'=>true,
 				'confirmation_subject'=>"",
-				'confirmation_mesage'=>"",
+				'confirmation_message'=>"",
 			],
 		],
 	];

plugins/cipf_plugin/html/menu/cipf_menu.html

@@ -59,12 +59,17 @@
 <?php echo Plgntls::open_form_option($option_payment_name); ?>
 	<div class="define_payment_message_cipf vertical_wrapper">
 		<label for="define_payment_message_success_cipf">paiement réussi : </label>
-		<textarea id="define_payment_message_success_cipf" name="message_success"><?php echo $option_payment['success']; ?></textarea>
+		<textarea id="define_payment_message_success_cipf" name="message_success"><?php echo esc_html($option_payment['success']); ?></textarea>
 	</div>
 
 	<div class="define_payment_message_cipf vertical_wrapper">
 		<label for="define_payment_message_failure_cipf">paiement echec : </label>
-		<textarea id="define_payment_message_failure_cipf" name="message_failure"><?php echo $option_payment['failure']; ?></textarea>
+		<textarea id="define_payment_message_failure_cipf" name="message_failure"><?php echo esc_html($option_payment['failure']); ?></textarea>
+	</div>
+
+	<div class="define_payment_message_cipf vertical_wrapper">
+		<label for="define_payment_message_problem_cipf">paiement problem (dans le cas où le paiement est réussi, mais il y eu une erreur dans son traitement sur le site) : </label>
+		<textarea id="define_payment_message_problem_cipf" name="message_problem"><?php echo esc_html($option_payment['problem']); ?></textarea>
 	</div>
 
 	<input type="submit" value="send"/>

plugins/cipf_plugin/js/paypal/on_approve.js

@@ -20,6 +20,7 @@ export async function onApprove(data, actions) {
 		//   (1) Recoverable INSTRUMENT_DECLINED -> call actions.restart()
 		//   (2) Other non-recoverable errors -> Show a failure message
 		//   (3) Successful transaction -> Show confirmation or thank you message
+		// + hugogogo treatment error but success order
 
 		const errorDetail = orderData?.details?.[0];
 
@@ -33,8 +34,14 @@ export async function onApprove(data, actions) {
 			throw new Error(`${errorDetail.description} (${orderData.debug_id})`);
 		}
 		else if (!orderData.purchase_units) {
+			if (orderData.ERROR_TREATMENT) {
+				console.log("Capture result",orderData);
+				resultMessage(PLGNTLS_data.paypal_message_problem);
+			}
+			else {
 				throw new Error(JSON.stringify(orderData));
 			}
+		}
 		else {
 			// (3) Successful transaction -> Show confirmation or thank you message
 			// Or go to another URL:  actions.redirect('thank_you.html');
@@ -45,7 +52,8 @@ export async function onApprove(data, actions) {
 			resultMessage(PLGNTLS_data.paypal_message_success);
 			actions.redirect(PLGNTLS_data.paypal_redirection_success);
 		}
-	} catch (error) {
+	}
+	catch (error) {
 		console.error(error);
 		resultMessage(PLGNTLS_data.paypal_message_failure);
 		actions.redirect(PLGNTLS_data.paypal_redirection_failure);

plugins/cipf_plugin/php/admin_menu.php

@@ -59,14 +59,19 @@ function update_payment_messages_option_CIPF($request, $option_name, $option_dat
 	*/
 	$success = '';
 	$failure = '';
+	$problem = '';
 	if (!isset($request['message_success'])) {
 		return;
 	}
 	if (!isset($request['message_failure'])) {
 		return;
 	}
+	if (!isset($request['message_problem'])) {
+		return;
+	}
 	$success = $request['message_success'];
 	$failure = $request['message_failure'];
+	$problem = $request['message_problem'];
 
 
 	/*
@@ -77,6 +82,7 @@ function update_payment_messages_option_CIPF($request, $option_name, $option_dat
 	$data = array(
 		'success' => $success,
 		'failure' => $failure,
+		'problem' => $problem,
 	);
 	Plgntls::update_option_safe($option_name, $data);
 }

plugins/cipf_plugin/php/emails.php

@@ -23,50 +23,179 @@ if (!defined('ABSPATH')) {
 * 8. payments : email : account_will_expire : faire rappels emails avant expiration
 * 9. payments : email : account_expired     : desactiver carte expiree
 *
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
-*
 */
 
 
-
+function prepare_emails_CIPF($email_name, $user_id) {
-function email_success_payment_CIPF($user_id) {
 	Plgntls::debug_infos();
-error_log("in email success");
+	$emails_option_object = Cipf::OPTION_EMAILS;
 	
-	$user = get_user_by('id', $user_id);
+	if (!isset($emails_option_object['_default'][$email_name])) {
-//	$to = $user->user_email;
+		return false;
-	$to = '$$__admin_email__$$';
+	}
-	$subject = 'My Custom Email Subject';
-	$message = 'Hello, This is a test email sent from my WordPress plugin!';
-	$headers = array('Content-Type: text/html; charset=UTF-8');
 
-	$sent = wp_mail($to, $subject, $message, $headers);
+	if (is_null($user_id)) {
+		$user_id = get_current_user_id();
+	}
 
-	// Check if the email was sent successfully
+	
+	$emails_option = Plgntls::get_option_safe($emails_option_object);
+	if (!$emails_option) {
+		return false;
+	}
+	if (!isset($emails_option[$email_name])) {
+		return false;
+	}
+	$email = $emails_option[$email_name];
+
+
+	$emails = array();
+	if ($email['notification_send']) {
+		$tmp_email = array();
+		$tmp_email['to'] = $email['notification_to'];
+		$tmp_email['subject'] = $email['notification_subject'];
+		$tmp_email['message'] = $email['notification_message'];
+		$tmp_email['headers'] = array('Content-Type: text/html; charset=UTF-8');
+		$emails[] = $tmp_email;
+	}
+	if ($email['confirmation_send']) {
+		$tmp_email = array();
+		$tmp_email['to'] = $user_id;
+		$tmp_email['subject'] = $email['confirmation_subject'];
+		$tmp_email['message'] = $email['confirmation_message'];
+		$tmp_email['headers'] = array('Content-Type: text/html; charset=UTF-8');
+		$emails[] = $tmp_email;
+	}
+	return $emails;
+}
+
+
+
+function send_emails_CIPF($email_name, $user_id = null) {
+	Plgntls::debug_infos();
+	$emails = prepare_emails_CIPF($email_name, $user_id);
+	if (false === $emails) {
+		error_log('Email preparing failed!: ' . json_encode($emails));
+		return;
+	}
+
+	foreach ($emails as $email) {
+		$sent = wp_mail($email['to'], $email['subject'], $email['message'], $email['headers']);
+	}
 	if (!$sent) {
-		error_log('Email sending failed!');
+		error_log('Email sending failed!: ' . json_encode($email));
 	}
 }
 
 
+//function email_payment_success_CIPF($user_id = null) {
+//	Plgntls::debug_infos();
+//error_log("email payment success: " . json_encode($email_payment_success));
+//
+//	send_email_CIPF($email_payment_success, $user_id);
+//	$user = get_user_by('id', $user_id);
+////	$to = $user->user_email;
+//	$to = '$$__admin_email__$$';
+//	$subject = 'My Custom Email Subject';
+//	$message = 'Hello, This is a test email sent from my WordPress plugin!';
+//	$headers = array('Content-Type: text/html; charset=UTF-8');
+//
+//
+//	// Check if the email was sent successfully
+//}
+
+/*
+			'payment_success'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"paiement réussi",
+				'notification_message'=>"par ici la monnaie",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"paiement réussi",
+				'confirmation_mesage'=>"donne l'argent",
+			],
+// 2. profs    : email : payment_failure     : validation payment prof echec, send email
+			'payment_echec'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 3. profs    : email : transfert_success   : validation transfert prof reussi, send email
+			'transfert_success'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 4. profs    : email : transfert_failures  : validation transfert prof echec, send email
+			'transfert_echec'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 5. partners : email : offer_expired       : offres temporaires -> gerer qu'elles disparaissent apres la date de validite -> la passer en masquer
+			'offer_expired'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 6. partners : email : offer_will_expire   : la gestion des offres à échéance
+			'offer_will_expire'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 7. payments : email : account_deleted     : schedule event pour supprimer le compte xx temps (6 mois ?) apres fin de validite de la carte
+			'account_deleted'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 8. payments : email : account_will_expire : faire rappels emails avant expiration
+			'eccount_will_expire'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+// 9. payments : email : account_expired     : desactiver carte expiree
+			'account_expired'=>[
+				'notification_send'=>true,
+				'notification_to'=>'$$__admin_email__$$',
+				'notification_subject'=>"",
+				'notification_message'=>"",
+				'confirmation_send'=>true,
+				'confirmation_subject'=>"",
+				'confirmation_mesage'=>"",
+			],
+*/
+
 
 
 

plugins/cipf_plugin/php/payments.php

@@ -113,18 +113,21 @@ function get_payment_messages_option_CIPF() {
 
 	return Plgntls::get_option_safe($option_payment);
 }
-
 function get_payment_message_success_CIPF() {
 	Plgntls::debug_infos();
 	$payment_option = get_payment_messages_option_CIPF();
 	return $payment_option['success'];
 }
-
 function get_payment_message_failure_CIPF() {
 	Plgntls::debug_infos();
 	$payment_option = get_payment_messages_option_CIPF();
 	return $payment_option['failure'];
 }
+function get_payment_message_problem_CIPF() {
+	Plgntls::debug_infos();
+	$payment_option = get_payment_messages_option_CIPF();
+	return $payment_option['problem'];
+}
 
 
 ?>

plugins/cipf_plugin/php/paypal/route_api_orders_capture.php

@@ -55,15 +55,16 @@ function handle_orders_capture_request_CIPF($request) {
 	try {
 		update_user_post_capture_CIPF($json_response, 'end');
 
+throw new HttpException('cannot find user with this order_id', 502);
 		return new WP_REST_Response($json_response, $http_status_code);
 	}
 	catch (HttpException $error) {
 		$status_code = $error->getStatusCode();
-		$message = 'Failed to handle order after capture in server :' . $error->getMessage();
+		$message = array('ERROR_TREATMENT'=>true, 'message'=>'Failed to handle order after capture in server: ' . $error->getMessage());
 		return new WP_REST_Response($message, $status_code);
 	}
 	catch (Exception $error) {
-		$message = 'Failed to handle order after capture in server :' . $error->getMessage();
+		$message = array('ERROR_TREATMENT'=>true, 'message'=>'Failed to handle order after capture in server: ' . $error->getMessage());
 		return new WP_REST_Response($message, 500);
 	}
 

plugins/cipf_plugin/php/paypal/shortcode.php

@@ -22,6 +22,7 @@ function paypal_shortcode_content_CIPF() {
 	$paypal_client_id = get_paypal_client_id_CIPF();
 	$paypal_message_success = get_payment_message_success_CIPF();
 	$paypal_message_failure = get_payment_message_failure_CIPF();
+	$paypal_message_problem = get_payment_message_problem_CIPF();
 
 //	if (!can_pay_now_CIPF())
 //		return no_payment_CIPF();
@@ -45,6 +46,7 @@ function paypal_shortcode_content_CIPF() {
 			'paypal_redirection_failure',
 			'paypal_message_success',
 			'paypal_message_failure',
+			'paypal_message_problem',
 		),
 	);
 

plugins/cipf_plugin/php/paypal/update_user_payment.php

@@ -171,7 +171,7 @@ function success_payment_for_user_CIPF($user_id, $order_id) {
 
 	set_payment_success_CIPF($user_id);
 	set_account_valid_CIPF($user_id);
-	email_success_payment_CIPF($user_id);
+	send_emails_CIPF('payment_success', $user_id);
 }
 
 

plugins/cipf_plugin/plgntls_class.php

@@ -1223,8 +1223,9 @@ class Plgntls {
 
 		/*
 		* override saved option with new one
-		* or we could compare each fields and update them if needed
+		* or we could try to compare each fields and update them if needed
 		* - but is it not more heavy in computing actions ?
+		* - and what if the field is multi-nested array for example ?
 		* also add the field '_db' equal to anything (null by default)
 		*  to mark it as coming from this database
 		*  and differentiate it from new options