Merge branch 'next' into bugfix-zms-3253-3466-3415-1891-validation-op…

…ening-hours-of-the-same-appointment-type-must-not-overlap
it-at-m · Feb 17, 2025 · 48e1fba · 48e1fba
2 parents c4164cb + 972ed05
commit 48e1fba
Show file tree

Hide file tree

Showing 38 changed files with 391 additions and 400 deletions.
diff --git a/README.md b/README.md
@@ -122,6 +122,7 @@ To run Checks locally in your local docker container:
 
 0. Run all at once:
 - `ddev exec "./cli modules loop 'vendor/bin/phpcs --standard=psr12 src/'"`
+- `ddev exec "./cli modules loop 'vendor/bin/phpcbf --standard=psr12 src/'"`
 
 1. **Enter the container** (if using DDEV or Docker):
 - `ddev ssh`

diff --git a/zmsapi/src/Zmsapi/ProcessConfirmationMail.php b/zmsapi/src/Zmsapi/ProcessConfirmationMail.php
@@ -22,7 +22,7 @@ class ProcessConfirmationMail extends BaseController
 {
     /**
      * @SuppressWarnings(Param)
-     * @return String
+     * @return string
      */
     public function readResponse(
         \Psr\Http\Message\RequestInterface $request,

diff --git a/zmsapi/src/Zmsapi/ProcessDeleteMail.php b/zmsapi/src/Zmsapi/ProcessDeleteMail.php
@@ -22,7 +22,7 @@ class ProcessDeleteMail extends BaseController
 {
     /**
      * @SuppressWarnings(Param)
-     * @return String
+     * @return string
      */
     public function readResponse(
         \Psr\Http\Message\RequestInterface $request,

diff --git a/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php b/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php
@@ -22,7 +22,7 @@ class ProcessPreconfirmationMail extends BaseController
 {
     /**
      * @SuppressWarnings(Param)
-     * @return String
+     * @return string
      */
     public function readResponse(
         \Psr\Http\Message\RequestInterface $request,

diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php
@@ -12,31 +12,34 @@
 class ThinnedScope extends Entity implements JsonSerializable
 {
     public static $schema = 'citizenapi/thinnedScope.json';
-/** @var int */
+    /** @var int */
     public int $id;
-/** @var ThinnedProvider|null */
+    /** @var ThinnedProvider|null */
     public ?ThinnedProvider $provider;
-/** @var string|null */
+    /** @var string|null */
     public ?string $shortName;
-/** @var bool|null */
+    /** @var string|null */
+    public ?string $emailFrom;
+    /** @var bool|null */
     public ?bool $telephoneActivated;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $telephoneRequired;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $customTextfieldActivated;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $customTextfieldRequired;
-/** @var string|null */
+    /** @var string|null */
     public ?string $customTextfieldLabel;
-/** @var bool|null */
+    /** @var bool|null */
     public ?bool $captchaActivatedRequired;
-/** @var string|null */
+    /** @var string|null */
     public ?string $displayInfo;
-    public function __construct(int $id = 0, ?ThinnedProvider $provider = null, ?string $shortName = null, ?bool $telephoneActivated = null, ?bool $telephoneRequired = null, ?bool $customTextfieldActivated = null, ?bool $customTextfieldRequired = null, ?string $customTextfieldLabel = null, ?bool $captchaActivatedRequired = null, ?string $displayInfo = null)
+    public function __construct(int $id = 0, ?ThinnedProvider $provider = null, ?string $shortName = null, ?string $emailFrom = null, ?bool $telephoneActivated = null, ?bool $telephoneRequired = null, ?bool $customTextfieldActivated = null, ?bool $customTextfieldRequired = null, ?string $customTextfieldLabel = null, ?bool $captchaActivatedRequired = null, ?string $displayInfo = null)
     {
         $this->id = $id;
         $this->provider = $provider;
         $this->shortName = $shortName;
+        $this->emailFrom = $emailFrom;
         $this->telephoneActivated = $telephoneActivated;
         $this->telephoneRequired = $telephoneRequired;
         $this->customTextfieldActivated = $customTextfieldActivated;
@@ -64,6 +67,11 @@ public function getShortName(): ?string
         return $this->shortName;
     }
 
+    public function getEmailFrom(): ?string
+    {
+        return $this->emailFrom;
+    }
+
     public function getTelephoneActivated(): ?bool
     {
         return $this->telephoneActivated;
@@ -105,6 +113,7 @@ public function toArray(): array
             'id' => $this->id,
             'provider' => $this->provider,
             'shortName' => $this->shortName,
+            'emailFrom' => $this->emailFrom,
             'telephoneActivated' => $this->telephoneActivated,
             'telephoneRequired' => $this->telephoneRequired,
             'customTextfieldActivated' => $this->customTextfieldActivated,

diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php
@@ -33,7 +33,6 @@ public function processCancel(array $body): ThinnedProcess|array
             ]];
         }
 
-        // Send cancellation email before cancelling the appointment
         $this->sendCancellationEmail($process);
         return $this->cancelProcess($process);
     }
@@ -80,6 +79,6 @@ private function cancelProcess(ThinnedProcess $process): ThinnedProcess|array
     private function sendCancellationEmail(ThinnedProcess $process): void
     {
         $processEntity = MapperService::thinnedProcessToProcess($process);
-        ZmsApiFacadeService::sendCancelationEmail($processEntity);
+        ZmsApiFacadeService::sendCancellationEmail($processEntity);
     }
 }