From 1b020696171f09a0ffaaf5cdfba9a2939f3f534c Mon Sep 17 00:00:00 2001
From: Ray Magauran <ophthal@users.noreply.github.com>
Date: Tue, 10 Sep 2019 03:46:26 -0400
Subject: [PATCH] Weno Validate Fix (#2657)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* Weno Validate Fix

Weno Validate was not pulling the default facility.  It was using the first facility which may not be correct…  Swicth to use PrimaryBillingLocation.  If you need/want Rx’s from a specific facility, or always from the facility where encounter occurred, then more adjustments needed…

Signed-off-by: ophthal <magauran@ophthal.org>
---
 interface/weno/validate.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/interface/weno/validate.php b/interface/weno/validate.php
index c6f50f6fc..5fdd09cc8 100644
--- a/interface/weno/validate.php
+++ b/interface/weno/validate.php
@@ -17,12 +17,15 @@ require_once("$srcdir/patient.inc");
 
 use OpenEMR\Common\Csrf\CsrfUtils;
 use OpenEMR\Rx\Weno\TransmitData;
+use OpenEMR\Services\FacilityService;
 
 if (!CsrfUtils::verifyCsrfToken($_GET["csrf_token_form"])) {
     CsrfUtils::csrfNotVerified();
 }
+    
+$facilityService = new FacilityService();
+$facility = $facilityService->getPrimaryBillingLocation();
 
-$facility = getFacilities($first = '');
 $pid = $GLOBALS['pid'];
 $uid = $_SESSION['authUserID'];
 
@@ -31,37 +34,37 @@ $validation = new TransmitData();
 $patient = $validation->validatePatient($pid);
 $pharmacy = $validation->patientPharmacyInfo($pid);
 
-if (empty($facility[0]['name']) || $facility[0]['name'] == "Your clinic name here") {
+if (empty($facility['name']) || $facility['name'] == "Your clinic name here") {
     print xlt("Please fill out facility name properly");
     exit;
 }
 
-if (empty($facility[0]['phone'])) {
+if (empty($facility['phone'])) {
     print xlt("Please fill out facility phone properly");
     exit;
 }
 
-if (empty($facility[0]['fax'])) {
+if (empty($facility['fax'])) {
     print xlt("Please fill out facility fax properly");
     exit;
 }
 
-if (empty($facility[0]['street'])) {
+if (empty($facility['street'])) {
     print xlt("Please fill out facility street properly");
     exit;
 }
 
-if (empty($facility[0]['city'])) {
+if (empty($facility['city'])) {
     print xlt("Please fill out facility city properly");
     exit;
 }
 
-if (empty($facility[0]['state'])) {
+if (empty($facility['state'])) {
     print xlt("Please fill out facility state properly");
     exit;
 }
 
-if (empty($facility[0]['postal_code'])) {
+if (empty($facility['postal_code'])) {
     print xlt("Please fill out facility postal code properly");
     exit;
 }
-- 
2.11.4.GIT