From 5175dc91f442211935eb9788ac890b65d469a0dc Mon Sep 17 00:00:00 2001 From: andrew-irwin Date: Fri, 10 Jul 2020 11:23:22 -0500 Subject: [PATCH 1/3] updated layouts, working menu items --- .../default/classes/getRecommendations.cls | 4 +- .../flows/Send_Referral_Flow.flow-meta.xml | 26 ++++++- .../multiselectPicklist.html | 4 +- .../multiselectPicklist.js | 2 +- .../serviceRecommendation.css | 9 +++ .../serviceRecommendation.html | 68 +++++++++++++++---- .../serviceRecommendation.js | 61 +++++++++++++++-- .../serviceRecommendations.html | 16 ++--- .../serviceRecommendations.js | 2 +- .../default/lwc/starRating/starRating.css | 1 - .../default/lwc/starRating/starRating.html | 7 +- .../main/default/staticresources/mapModal.css | 4 ++ 12 files changed, 165 insertions(+), 39 deletions(-) diff --git a/force-app/main/default/classes/getRecommendations.cls b/force-app/main/default/classes/getRecommendations.cls index 2368f3b6..9372a5e2 100644 --- a/force-app/main/default/classes/getRecommendations.cls +++ b/force-app/main/default/classes/getRecommendations.cls @@ -184,10 +184,12 @@ public with sharing class getRecommendations { rec.ServiceId ); if (exclusions != null && exclusions.size() > 0) { - rec.Hidden = true; + for (Service_Exclusion__c exclusion : exclusions) { if (exclusion.Contact__c == null) { rec.HiddenAll = true; + }else{ + rec.Hidden = true; } } } diff --git a/force-app/main/default/flows/Send_Referral_Flow.flow-meta.xml b/force-app/main/default/flows/Send_Referral_Flow.flow-meta.xml index 148723fd..05f0876d 100644 --- a/force-app/main/default/flows/Send_Referral_Flow.flow-meta.xml +++ b/force-app/main/default/flows/Send_Referral_Flow.flow-meta.xml @@ -137,7 +137,7 @@ 172 false - Screen_1_Referral_Confirmation + Get_Service Id @@ -150,6 +150,26 @@ Contact true + + Get_Service + + 276 + 175 + false + + Screen_1_Referral_Confirmation + + + Id + EqualTo + + serviceId + + + true + Service__c + true + fault_screen @@ -179,7 +199,7 @@ Confirm - <p><br></p><p><br></p><p>Confirm Contact Information:</p><p><br></p><p>{!Get_Contact.FirstName} {!Get_Contact.LastName}</p><p><br></p><p>Phone: {!Get_Contact.MobilePhone}</p><p>Email: {!Get_Contact.Email}</p> + <p><span style="font-size: 20px;">Share This Service<span class="ql-cursor"></span></span></p><p><br></p><p>Send To:</p><p><br></p><p>{!Get_Contact.FirstName} {!Get_Contact.LastName}</p><p>Phone: {!Get_Contact.MobilePhone}</p><p>Email: {!Get_Contact.Email}</p> DisplayText @@ -187,7 +207,7 @@ Email SMS String - Preferred Method of Contact + Send to Client Via: MultiSelectCheckboxes false diff --git a/force-app/main/default/lwc/multiselectPicklist/multiselectPicklist.html b/force-app/main/default/lwc/multiselectPicklist/multiselectPicklist.html index ef2385b7..4bce1cfe 100644 --- a/force-app/main/default/lwc/multiselectPicklist/multiselectPicklist.html +++ b/force-app/main/default/lwc/multiselectPicklist/multiselectPicklist.html @@ -1,10 +1,10 @@