|
@@ -157,8 +157,12 @@ class Pro extends Model
|
|
|
return VisitTemplate::where('is_active' , true)->get();
|
|
|
}
|
|
|
|
|
|
+ $allAccessibleVisitTemplatesIDs = VisitTemplate::where('is_accessible_to_all', true)->where('is_active', true)->pluck('id')->toArray();
|
|
|
$accesses = VisitTemplateAccess::where('pro_id', $this->id)->where('is_active', true)->pluck('visit_template_id')->toArray();
|
|
|
- return VisitTemplate::whereIn('id', $accesses)->get();
|
|
|
+
|
|
|
+ $allAllowedVisitTemplatesIDs = array_unique(array_merge($allAccessibleVisitTemplatesIDs, $accesses));
|
|
|
+
|
|
|
+ return VisitTemplate::whereIn('id', $allAllowedVisitTemplatesIDs)->get();
|
|
|
}
|
|
|
|
|
|
public function currentWork() {
|