diff --git a/services/nginx/app/classes/email.php b/services/nginx/app/classes/email.php index d3e4bb9e..3853cc7a 100644 --- a/services/nginx/app/classes/email.php +++ b/services/nginx/app/classes/email.php @@ -8,6 +8,7 @@ require_once WD . '/modules/email/templates/email_template_footer.php'; require_once WD . '/modules/email/templates/email_template_head.php'; require_once WD . '/modules/email/templates/email_template_stripe_invoice.php'; require_once WD . '/modules/email/templates/email_template_booking_confirmation.php'; +require_once WD . '/modules/email/templates/email_template_booking_notification.php'; require_once WD . '/modules/email/templates/email_template_wash_certificate.php'; use email\email_c; diff --git a/services/nginx/app/classes/gatewayapi.php b/services/nginx/app/classes/gatewayapi.php index ed130144..7bad0856 100644 --- a/services/nginx/app/classes/gatewayapi.php +++ b/services/nginx/app/classes/gatewayapi.php @@ -36,7 +36,7 @@ class gatewayapi implements gatewayapi_i $data = [ "recipients" => array_map(function ($recipient) { return [ - 'msisdn' => (int)$recipient, + 'msisdn' => $recipient, ]; }, $to), 'message' => $message, diff --git a/services/nginx/app/objects/bookings_o.php b/services/nginx/app/objects/bookings_o.php index 0729e505..6e43e27f 100644 --- a/services/nginx/app/objects/bookings_o.php +++ b/services/nginx/app/objects/bookings_o.php @@ -303,11 +303,11 @@ class bookings_o extends db $department_array = $department->asArray(); $customer_array = $customer->asArray(); // Define delivery methods - $deliverSlack = !empty($department->slack_webhook->value()); + $deliverSlack = (boolean)!empty($department->slack_webhook->value()); $deliverSMS = ( !empty($branding->phone_country_code->value()) && !empty($branding->phone->value()) && - !$deliverSlack // Only send SMS if slack is not available + ((int)$branding->phone->value() > 0) ); $deliverEmail = ( !empty($this->contact_email->value()) && @@ -336,11 +336,14 @@ class bookings_o extends db )); } - if (!$deliverSMS) { + if ($deliverSMS) { // Send an SMS notification to the department $gatewayapi = new gatewayapi(); + $phone = '' . $branding->phone_country_code->value() . $branding->phone->value(); $gatewayapi->send( - [$branding->phone_country_code->value() . $branding->phone->value()], + [ + $phone, + ], 'New booking from ' . $customer->getCustomerName($customer_array['customer_number']) . ' (' . $this->id . ')', ); }