fix: estimate and agreement copy (resolves #2204) (#2206)

* fix: estimate and agreement copy

* fix: regulated organization contact info not displayed on public page

fix: regulated organization contact info not displayed on public page

Author: jobara

app/Notifications/AgreementReceived.php

@@ -20,7 +20,7 @@ public function __construct(Project $project)
     public function toMail(Project $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->subject(__('Your agreement has been received'))
+            ->subject(__('Your signed agreement has been received'))
             ->markdown(
                 'mail.agreement-received',
                 [

app/Notifications/EstimateReturned.php

@@ -20,7 +20,7 @@ public function __construct(Project $project)
     public function toMail(Project $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->subject(__('Your estimate has been returned'))
+            ->subject(__('Engagement estimate has been submitted for your approval'))
             ->markdown(
                 'mail.estimate-returned',
                 [

app/View/Components/Notification/AgreementReceived.php

@@ -14,11 +14,11 @@ class AgreementReceived extends Notification
     public function __construct(DatabaseNotification $notification)
     {
         $this->project = Project::find($notification->data['project_id']);
-        $this->title = __('Your agreement has been received');
+        $this->title = __('Your signed agreement has been received');
         $this->body = safe_markdown('Your agreement has been received for **:project**. You can now publish your project page and engagement details.', [
             'project' => $this->project->getTranslation('name', locale()),
         ]);
-        $this->interpretation = __('Your agreement has been received', [], 'en');
+        $this->interpretation = __('Your signed agreement has been received', [], 'en');
 
         parent::__construct($notification);
     }

app/View/Components/Notification/EstimateReturned.php

@@ -14,12 +14,12 @@ class EstimateReturned extends Notification
     public function __construct(DatabaseNotification $notification)
     {
         $this->project = Project::find($notification->data['project_id']);
-        $this->title = __('Your estimate has been returned');
+        $this->title = __('Engagement estimate has been submitted for your approval');
         $this->body = safe_markdown('Your estimate for **:project**, along with a project agreement for you to sign, has been sent to <:contact>.', [
             'project' => $this->project->getTranslation('name', locale()),
             'contact' => $this->project->contact_person_email,
         ]);
-        $this->interpretation = __('Your estimate has been returned', [], 'en');
+        $this->interpretation = __('Engagement estimate has been submitted for your approval', [], 'en');
 
         parent::__construct($notification);
     }

database/seeders/data/Interpretations.json

@@ -1418,7 +1418,7 @@
                 "namespace": "notification_message"
             },
             {
-                "name": "Your agreement has been received",
+                "name": "Your signed agreement has been received",
                 "namespace": "notification_message",
                 "video": {
                     "lsq": "https://vimeo.com/850176147/a4656f355b"
@@ -1441,7 +1441,7 @@
                 }
             },
             {
-                "name": "Your estimate has been returned",
+                "name": "Engagement estimate has been submitted for your approval",
                 "namespace": "notification_message",
                 "video": {
                     "lsq": "https://vimeo.com/850176184/57b6fadba7"
@@ -4066,6 +4066,9 @@
                     "asl": "https://vimeo.com/845049912/2baed11817",
                     "lsq": "https://vimeo.com/871137322/b78435aef9"
                 }
+            },
+            {
+                "name": "About"
             }
         ]
     },
@@ -4077,6 +4080,19 @@
                     "asl": "https://vimeo.com/845049953/a83136dada",
                     "lsq": "https://vimeo.com/850176016/d00dbf674f"
                 }
+            },
+            {
+                "name": "Projects"
+            }
+        ]
+    },
+    "regulated-organizations.show-contact-information": {
+        "interpretations": [
+            {
+                "name": "Contact information"
+            },
+            {
+                "name": "contact person"
             }
         ]
     },

resources/lang/en.json

@@ -151,6 +151,7 @@
     "Agreement pending": "Agreement pending",
     "Agreement received": "Agreement received",
     "Agreements": "Agreements",
+    "Agreement signed and received": "Agreement signed and received",
     "Agreement status": "Agreement status",
     "Alberta": "Alberta",
     "All": "All",
@@ -569,6 +570,7 @@
     "engagement description": "engagement description",
     "engagement description (English)": "engagement description (English)",
     "engagement description (French)": "engagement description (French)",
+    "Engagement estimate has been submitted for your approval": "Engagement estimate has been submitted for your approval",
     "engagement format": "engagement format",
     "Engagement materials": "Engagement materials",
     "Engagement meetings": "Engagement meetings",
@@ -587,6 +589,7 @@
     "English author name": "English author name",
     "Enter your collaboration preferences": "Enter your collaboration preferences",
     "Episodic and invisible disabilities": "Episodic and invisible disabilities",
+    "Estimate and agreement have been sent": "Estimate and agreement have been sent",
     "Estimate approved": "Estimate approved",
     "Estimate requested": "Estimate requested",
     "Estimate returned": "Estimate returned",
@@ -890,9 +893,7 @@
     "Manage project": "Manage project",
     "Manage this project": "Manage this project",
     "Manitoba": "Manitoba",
-    "Mark agreement as received": "Mark agreement as received",
     "Mark as read": "Mark as read",
-    "Mark estimate as returned": "Mark estimate as returned",
     "Mark the estimate as \"returned\" by visiting the link below and searching for :projectable.": "Mark the estimate as \"returned\" by visiting the link below and searching for :projectable.",
     "match you to their projects or engagements": "match you to their projects or engagements",
     "Materials": "Materials",
@@ -2069,7 +2070,6 @@
     "Your account on the Accessibility Exchange has been suspended.": "Your account on the Accessibility Exchange has been suspended.",
     "Your account on the Accessibility Exchange is no longer suspended.": "Your account on the Accessibility Exchange is no longer suspended.",
     "Your account suspension has been lifted": "Your account suspension has been lifted",
-    "Your agreement has been received": "Your agreement has been received",
     "Your agreement has been received for **:project**. You can now publish your project page and engagement details.": "Your agreement has been received for **:project**. You can now publish your project page and engagement details.",
     "Your agreement has been received for :project. You can now publish your project page and engagement details. Sign in to your account at https:\/\/accessibilityexchange.ca to continue.": "Your agreement has been received for :project. You can now publish your project page and engagement details. Sign in to your account at https:\/\/accessibilityexchange.ca to continue.",
     "Your areas of interest have been updated.": "Your areas of interest have been updated.",
@@ -2083,7 +2083,6 @@
     "Your engagement has been updated.": "Your engagement has been updated.",
     "Your engagement translations have been updated.": "Your engagement translations have been updated.",
     "Your estimate for **:project**, along with a project agreement for you to sign, has been sent to <:contact>.": "Your estimate for **:project**, along with a project agreement for you to sign, has been sent to <:contact>.",
-    "Your estimate has been returned": "Your estimate has been returned",
     "Your estimate has been returned for :project, along with a project agreement for you to sign. Sign in to your account at https:\/\/accessibilityexchange.ca for further details.": "Your estimate has been returned for :project, along with a project agreement for you to sign. Sign in to your account at https:\/\/accessibilityexchange.ca for further details.",
     "Your federally regulated organization has been deleted.": "Your federally regulated organization has been deleted.",
     "Your federally regulated organization has been updated.": "Your federally regulated organization has been updated.",
@@ -2126,6 +2125,7 @@
     "your public profile will be removed from the platform": "your public profile will be removed from the platform",
     "Your regulated organization, :name, will be deleted and cannot be recovered. If you still want to delete your regulated organization, please enter your current password to proceed.": "Your regulated organization, :name, will be deleted and cannot be recovered. If you still want to delete your regulated organization, please enter your current password to proceed.",
     "Your roles have been saved.": "Your roles have been saved.",
+    "Your signed agreement has been received": "Your signed agreement has been received",
     "your support person, :name": "your support person, :name",
     "Your support person’s name is required if they are your preferred contact person.": "Your support person’s name is required if they are your preferred contact person.",
     "Your website accessibility preferences have been updated.": "Your website accessibility preferences have been updated.",

resources/lang/fr.json

@@ -151,6 +151,7 @@
     "Agreement pending": "Entente en attente",
     "Agreement received": "Entente reçue",
     "Agreements": "Ententes",
+    "Agreement signed and received": "",
     "Agreement status": "Statut de l’entente",
     "Alberta": "Alberta",
     "All": "Tous",
@@ -569,6 +570,7 @@
     "engagement description": "description de la consultation",
     "engagement description (English)": "description de la consultation (anglais)",
     "engagement description (French)": "description de la consultation (français)",
+    "Engagement estimate has been submitted for your approval": "",
     "engagement format": "format de la consultation",
     "Engagement materials": "Documents de consultation",
     "Engagement meetings": "Réunions de la consultation",
@@ -587,6 +589,7 @@
     "English author name": "Nom de l’auteur en anglais",
     "Enter your collaboration preferences": "Entrez vos préférences de collaboration",
     "Episodic and invisible disabilities": "Incapacités épisodiques et invisibles",
+    "Estimate and agreement have been sent": "",
     "Estimate approved": "Devis approuvé",
     "Estimate requested": "Devis demandé",
     "Estimate returned": "Devis retourné",
@@ -890,9 +893,7 @@
     "Manage project": "Gérer le projet",
     "Manage this project": "Gérer ce projet",
     "Manitoba": "Manitoba",
-    "Mark agreement as received": "Marquer l’entente comme reçue",
     "Mark as read": "Marquer comme lu",
-    "Mark estimate as returned": "Marquer le devis comme retourné",
     "Mark the estimate as \"returned\" by visiting the link below and searching for :projectable.": "Marquez le devis comme « retourné » en visitant le lien ci-dessous et en recherchant :projectable.",
     "match you to their projects or engagements": "vous jumeler à leurs projets ou consultations",
     "Materials": "Matériels",
@@ -2069,7 +2070,6 @@
     "Your account on the Accessibility Exchange has been suspended.": "Votre compte sur le Connecteur pour l’accessibilité a été suspendu.",
     "Your account on the Accessibility Exchange is no longer suspended.": "Votre compte sur le Connecteur pour l’accessibilité a été réinstauré.",
     "Your account suspension has been lifted": "La suspension de votre compte a été levée",
-    "Your agreement has been received": "Votre entente a été reçue",
     "Your agreement has been received for **:project**. You can now publish your project page and engagement details.": "Votre entente a été reçue pour **:project**. Vous pouvez maintenant publier votre page de projet et les détails de votre consultation.",
     "Your agreement has been received for :project. You can now publish your project page and engagement details. Sign in to your account at https:\/\/accessibilityexchange.ca to continue.": "Votre entente a été reçue pour :project. Vous pouvez maintenant publier votre page de projet et les détails de votre consultation. Connectez-vous à votre compte sur https:\/\/accessibilityexchange.ca pour continuer.",
     "Your areas of interest have been updated.": "Vos centres d’intérêt ont été mis à jour.",
@@ -2083,7 +2083,6 @@
     "Your engagement has been updated.": "Votre consultation a été mise à jour.",
     "Your engagement translations have been updated.": "Les traductions de vos consultations ont été mises à jour.",
     "Your estimate for **:project**, along with a project agreement for you to sign, has been sent to <:contact>.": "Votre devis pour **:project**, ainsi qu’une entente à signer ont été envoyés à <:contact>.",
-    "Your estimate has been returned": "Votre devis a été retourné",
     "Your estimate has been returned for :project, along with a project agreement for you to sign. Sign in to your account at https:\/\/accessibilityexchange.ca for further details.": "Votre devis a été renvoyé pour le projet :project, ainsi qu’une etente de projet à signer. Connectez-vous à votre compte sur https:\/\/accessibilityexchange.ca pour plus de détails.",
     "Your federally regulated organization has been deleted.": "Votre organisation sous réglementation fédérale a été supprimée.",
     "Your federally regulated organization has been updated.": "Votre organisation sous réglementation fédérale a été mise à jour.",
@@ -2126,6 +2125,7 @@
     "your public profile will be removed from the platform": "votre profil public sera supprimé de la plateforme",
     "Your regulated organization, :name, will be deleted and cannot be recovered. If you still want to delete your regulated organization, please enter your current password to proceed.": "Votre organisme réglementé, :name, sera supprimé et ne pourra pas être récupéré. Si vous souhaitez toujours supprimer votre organisme réglementé, veuillez saisir votre mot de passe actuel pour continuer.",
     "Your roles have been saved.": "Vos rôles ont été enregistrés.",
+    "Your signed agreement has been received": "",
     "your support person, :name": "la personne vous apportant du soutien, :name",
     "Your support person’s name is required if they are your preferred contact person.": "Le nom de la personne vous apportant du soutien est requis s’il s’agit de votre personne de contact.",
     "Your website accessibility preferences have been updated.": "Vos préférences en matière d’accessibilité pour le site Internet ont été mises à jour.",

resources/views/livewire/admin-estimates-and-agreements.blade.php

@@ -83,12 +83,12 @@
                     <td>
                         @if ($project->estimate_returned_at && !$project->agreement_received_at)
                             <button class="secondary"
-                                wire:click="markAgreementReceived({{ $project->id }})">{{ __('Mark agreement as received') }}
+                                wire:click="markAgreementReceived({{ $project->id }})">{{ __('Agreement signed and received') }}
                                 <span class="sr-only">{{ __('for :project', ['project' => $project->name]) }}</span>
                             </button>
                         @elseif(!$project->estimate_returned_at)
                             <button class="secondary"
-                                wire:click="markEstimateReturned({{ $project->id }})">{{ __('Mark estimate as returned') }}
+                                wire:click="markEstimateReturned({{ $project->id }})">{{ __('Estimate and agreement have been sent') }}
                                 <span class="sr-only">{{ __('for :project', ['project' => $project->name]) }}</span>
                             </button>
                         @endif

resources/views/regulated-organizations/partials/contact-information.blade.php

@@ -0,0 +1,11 @@
+<h3>{{ $regulatedOrganization->contact_person_name }}</h3>
+<x-interpretation name="{{ __('contact person', [], 'en') }}" />
+
+@if ($regulatedOrganization->contact_person_email)
+    <x-contact-point type="email" :value="$regulatedOrganization->contact_person_email" :preferred="$regulatedOrganization->preferred_contact_method === 'email' &&
+        $regulatedOrganization->contact_person_phone" />
+@endif
+@if ($regulatedOrganization->contact_person_phone)
+    <x-contact-point type="phone" :value="$regulatedOrganization->contact_person_phone" :preferred="$regulatedOrganization->preferred_contact_method === 'phone' &&
+        $regulatedOrganization->contact_person_email" :vrs="$regulatedOrganization->contact_person_vrs" />
+@endif

resources/views/regulated-organizations/show.blade.php

@@ -116,19 +116,31 @@
                 <li>
                     <x-nav-link :href="localized_route('regulated-organizations.show-projects', $regulatedOrganization)" :active="request()->localizedRouteIs('regulated-organizations.show-projects')">{{ __('Projects') }}</x-nav-link>
                 </li>
+                <li>
+                    <x-nav-link :href="localized_route(
+                        'regulated-organizations.show-contact-information',
+                        $regulatedOrganization,
+                    )" :active="request()->localizedRouteIs('regulated-organizations.show-contact-information')">{{ __('Contact information') }}</x-nav-link>
+                </li>
             </ul>
         </nav>
         <div class="stack">
             @if (request()->localizedRouteIs('regulated-organizations.show'))
                 <x-section-heading :name="__('About')" :model="$regulatedOrganization" :href="localized_route('regulated-organizations.edit', $regulatedOrganization)" />
+                <x-interpretation name="{{ __('About', [], 'en') }}" />
                 @include('regulated-organizations.partials.about')
             @elseif(request()->localizedRouteIs('regulated-organizations.show-projects'))
                 <h2 class="repel">{{ __('Projects') }} @can('update', $regulatedOrganization)
                         <a class="cta secondary"
                             href="{{ $regulatedOrganization->projects->count() > 0 ? localized_route('projects.show-context-selection') : localized_route('projects.show-language-selection') }}">{{ __('Create a project') }}</a>
                     @endcan
                 </h2>
+                <x-interpretation name="{{ __('Projects', [], 'en') }}" />
                 @include('regulated-organizations.partials.projects')
+            @elseif(request()->localizedRouteIs('regulated-organizations.show-contact-information'))
+                <x-section-heading :name="__('Contact information')" :model="$regulatedOrganization" :href="localized_route('regulated-organizations.edit', $regulatedOrganization)" />
+                <x-interpretation name="{{ __('Contact information', [], 'en') }}" />
+                @include('regulated-organizations.partials.contact-information')
             @endif
         </div>
     </div>

routes/regulated-organizations.php

@@ -41,6 +41,10 @@
             ->middleware(['auth', 'can:view,regulatedOrganization'])
             ->name('show');
 
+        Route::multilingual('/{regulatedOrganization}/contact-information', 'show')
+            ->middleware(['auth', 'can:view,regulatedOrganization'])
+            ->name('show-contact-information');
+
         Route::multilingual('/{regulatedOrganization}/projects', 'show')
             ->middleware(['auth', 'can:view,regulatedOrganization'])
             ->name('show-projects');