diff --git a/modules/ppcp-onboarding/src/Endpoint/PayUponInvoiceEndpoint.php b/modules/ppcp-onboarding/src/Endpoint/PayUponInvoiceEndpoint.php
index 6700236df..1793f84c8 100644
--- a/modules/ppcp-onboarding/src/Endpoint/PayUponInvoiceEndpoint.php
+++ b/modules/ppcp-onboarding/src/Endpoint/PayUponInvoiceEndpoint.php
@@ -65,7 +65,7 @@ class PayUponInvoiceEndpoint implements EndpointInterface {
}
/**
- * * Handles the request.
+ * Handles the request.
*
* @return bool
* @throws NotFoundException When order not found or handling failed.
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php
index 39d3401e2..437d54ec7 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php
@@ -266,9 +266,8 @@ class PayUponInvoice {
* Set configuration JSON for FraudNet integration.
*/
public function add_parameter_block(): void {
- $sandbox = $this->environment->current_environment_is( Environment::SANDBOX ) ? '"sandbox":true,' : '';
?>
-
+
true,
+ 'f' => $this->fraud_net->session_id(),
+ 's' => $this->fraud_net->source_website_id(),
+ );
+
+ if ( ! $this->environment->current_environment_is( Environment::SANDBOX ) ) {
+ unset( $config['sandbox'] );
+ }
+
+ $encoded = wp_json_encode( $config );
+ if ( false === $encoded ) {
+ return '';
+ }
+
+ return $encoded;
+ }
}