diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index 3899dbf76620..6eb974f33161 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -136,7 +136,7 @@ class EmailController extends BaseController $mo->email_template_body = $request->input('template'); $mo->email_template_subject = str_replace("template", "subject", $request->input('template')); - if ($request->has('cc_email')) { + if ($request->has('cc_email') && $request->cc_email) { $mo->cc[] = new Address($request->cc_email); } diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php index c6d16d54c604..66a80e3f61eb 100644 --- a/app/Http/Requests/Email/SendEmailRequest.php +++ b/app/Http/Requests/Email/SendEmailRequest.php @@ -43,7 +43,7 @@ class SendEmailRequest extends Request 'template' => 'bail|required', 'entity' => 'bail|required', 'entity_id' => 'bail|required', - 'cc_email' => 'bail|sometimes|email', + 'cc_email' => 'bail|sometimes|email|nullable', ]; } diff --git a/app/PaymentDrivers/GoCardless/ACH.php b/app/PaymentDrivers/GoCardless/ACH.php index f84b319e9199..10e0adc34639 100644 --- a/app/PaymentDrivers/GoCardless/ACH.php +++ b/app/PaymentDrivers/GoCardless/ACH.php @@ -175,7 +175,8 @@ class ACH implements MethodInterface try { $payment = $this->go_cardless->gateway->payments()->create([ 'params' => [ - 'amount' => $request->amount, + // 'amount' => $request->amount, + 'amount' => (int)rtrim(round($request->amount),0), 'currency' => $request->currency, 'description' => $description, 'metadata' => [ diff --git a/app/PaymentDrivers/GoCardless/DirectDebit.php b/app/PaymentDrivers/GoCardless/DirectDebit.php index 4de93dc8dfc8..3705db72e4b2 100644 --- a/app/PaymentDrivers/GoCardless/DirectDebit.php +++ b/app/PaymentDrivers/GoCardless/DirectDebit.php @@ -179,7 +179,8 @@ class DirectDebit implements MethodInterface try { $payment = $this->go_cardless->gateway->payments()->create([ 'params' => [ - 'amount' => $request->amount, + // 'amount' => $request->amount, + 'amount' => (int)rtrim(round($request->amount),0), 'currency' => $request->currency, 'description' => $description, 'metadata' => [ diff --git a/app/PaymentDrivers/GoCardless/SEPA.php b/app/PaymentDrivers/GoCardless/SEPA.php index c4950314d491..eac4fd81fa88 100644 --- a/app/PaymentDrivers/GoCardless/SEPA.php +++ b/app/PaymentDrivers/GoCardless/SEPA.php @@ -175,7 +175,7 @@ class SEPA implements MethodInterface try { $payment = $this->go_cardless->gateway->payments()->create([ 'params' => [ - 'amount' => $request->amount, + 'amount' => (int)rtrim(round($request->amount),0), 'currency' => $request->currency, 'description' => $description, 'metadata' => [