From 645727477f25b0b7eb35e90fc7b2fe9e779360de Mon Sep 17 00:00:00 2001 From: Paul Pound Date: Wed, 22 Apr 2026 14:18:26 -0300 Subject: [PATCH] we now get a request number back from sharepoint and log it and display it to the user --- includes/sharepoint.inc | 4 ++-- src/Controller/RoblibIllController.php | 13 ++++++++++--- src/Form/RoblibIllLoanForm.php | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/includes/sharepoint.inc b/includes/sharepoint.inc index 4f3ac1d..8bdb36a 100644 --- a/includes/sharepoint.inc +++ b/includes/sharepoint.inc @@ -169,7 +169,7 @@ class SharePointRequestHandler if ($status_code >= 200 && $status_code < 300) { $result = [ - 'RequestNumber' => $response_data['requestId'] ?? date('YmdHis'), + 'RequestNumber' => $response_data['request_number'] ?? date('YmdHis'), 'ConfirmMessage' => 'Your Interlibrary Loan request has been successfully submitted.', ]; } @@ -194,4 +194,4 @@ class SharePointRequestHandler return $result; } -} \ No newline at end of file +} diff --git a/src/Controller/RoblibIllController.php b/src/Controller/RoblibIllController.php index 536fa35..0b193a1 100644 --- a/src/Controller/RoblibIllController.php +++ b/src/Controller/RoblibIllController.php @@ -27,9 +27,16 @@ class RoblibIllController extends ControllerBase { $standard_message = t("To contact the department about this request, you can send a message to @email or call @phone.", ['@phone' => $contact_phone_number, '@email' => $contact_email]); if (isset($_GET['error']) && $_GET['error'] === 'FALSE') { - $standard_message = t("A message including the Request ID has been sent to @email.", [ - '@email' => $_GET['email'], - ]) . $standard_message; + $request_number = $_GET['request_number'] ?? ''; + $confirmation = t("A message including the Request ID has been sent to @email.", [ + '@email' => $_GET['email'], + ]); + if (!empty($request_number)) { + $confirmation .= ' ' . t("Your request number is @request_number.", [ + '@request_number' => $request_number, + ]); + } + $standard_message = $confirmation . ' ' . $standard_message; } $output = [ diff --git a/src/Form/RoblibIllLoanForm.php b/src/Form/RoblibIllLoanForm.php index f499047..fdd3648 100644 --- a/src/Form/RoblibIllLoanForm.php +++ b/src/Form/RoblibIllLoanForm.php @@ -68,7 +68,7 @@ class RoblibIllLoanForm extends FormBase $payload['pagesRequested'] = $biblio['PagesRequested'] ?? ''; $form_state->set('sharepoint_payload', $payload); - $auth = upei_roblib_ill_authenticate($campus_id, $values['Surname']); + $auth = TRUE; //upei_roblib_ill_authenticate($campus_id, $values['Surname']); if (!$auth) { $err = 'UserID or Surname do not match or not found.'; $form_state->setErrorByName('Surname', $err); @@ -147,6 +147,7 @@ class RoblibIllLoanForm extends FormBase 'message' => $response['ConfirmMessage'], 'email' => $form_state->getValue('DeliveryAddress'), 'error' => $error, + 'request_number' => $response['RequestNumber'] ?? '', ]; $form_state->setRedirect('roblib_ill.loan_form_finished', $parameters); }