INTERIM: hc setting update

Author: Chloe070196

code/web/Drivers/AbstractIlsDriver.php

@@ -922,4 +922,8 @@ public function loadLibraries() : array {
 	public function hasIlsConsentSupport(): bool {
 		return false;
 	}
+
+	public function hasAdditionalFields(): bool {
+		return false;
+	}
 }

code/web/Drivers/Koha.php

@@ -3080,31 +3080,46 @@ public function getAdditionalFieldValuesByTable(string $tableName) {
 		return $values;
 	}
 
-	public function getAdditionalFieldsNamesByTable(string $tableName, string $category = null): array {
+	public function getAdditionalFieldNames(string|null $tableName, string|null $category): array {
 		$fieldNamesList = [];
-		foreach($this->getAdditionalFieldsByTable($tableName, $category) as $fields) {
+		foreach($this->getAdditionalFields($tableName, $category) as $fields) {
 			$fieldNamesList[] = $fields['name'];
 		}
 		return $fieldNamesList;
 	}
 
-	private function getAdditionalFieldsByTable(string $tableName, string $category = null): array {
+	private function getAdditionalFields(string|null $tableName, string|null $category): array {
 		// TODO: refactor to send a GET request to the api/v1/extended_attribute_types endpoint instead
 		$this->initDatabaseConnection();
 		/** @noinspection SqlResolve */
-		$query = "SELECT * FROM additional_fields WHERE tablename = '" . mysqli_escape_string($this->dbConnection, $tableName) . "'";
+		$query = "SELECT * FROM additional_fields";
+
+		if ($tableName) {
+			$query .= " WHERE tablename =?";
+		}
+
 		if ($category) {
-			$query .= " AND authorised_value_category='" . mysqli_escape_string($this->dbConnection, $category) . "'";
+			$query .= " AND authorised_value_category=?";
+		}
+
+		$stmt = $this->dbConnection->prepare($query);
+
+		if ($tableName && $category) {
+			$stmt->bind_param("ss", $tableName, $category);
+		} else if ($tableName) {
+			$stmt->bind_param("s", $tableName);
 		}
 
-		$additionalFieldsResponse = mysqli_query($this->dbConnection, $query);
+		$stmt->execute();
+		$additionalFieldsResponse = $stmt->get_result();
 		$additionalFields = [];
+
 		if ($additionalFieldsResponse->num_rows > 0) {
 			while ($allAdditionalFieldsRow = $additionalFieldsResponse->fetch_assoc()) {
 				$additionalFields[] = $allAdditionalFieldsRow;
 			}
 		}
-		$additionalFieldsResponse->close();
+		$stmt->close();
 		return $additionalFields;
 	}
 
@@ -8781,4 +8796,8 @@ private function getConsentTypes(): array {
 	public function hasIlsConsentSupport(): bool {
 		return true;
 	}
+
+	public function hasAdditionalFields(): bool {
+		return true;
+	}
 }

code/web/sys/ECommerce/HeyCentricSetting.php

@@ -79,35 +79,6 @@ static function getObjectStructure($context = ''): array {
 				'description' => 'The HeyCentric Private Key for your site',
 				'maxLength' => 50,
 			],
-			'client' => [
-				'property' => 'client',
-				'type' => 'text',
-				'label' => 'Client',
-				'description' => '',
-			],
-			'till' => [
-				'property' => 'till',
-				'type' => 'text',
-				'label' => 'Till',
-				'description' => '',
-				'maxLength' => 10,
-			],
-			'area' => [
-				'property' => 'area',
-				'type' => 'text',
-				'label' => 'Area',
-				'description' => '',
-				'maxLength' => 50,
-			],
-			'rurl' => [
-				'property' => 'rurl',
-				'type' => 'hidden',
-				'hideInLists' => true,
-				'label' => 'Return URL',
-				'description' => 'the URL to return the patron to once the payment has been processed',
-				'maxLength' => 50,
-				'default' => ROOT_DIR . '/MyAccount/AJAX?method=completeHeyCentricOrder'
-			],
 			'urlParameters' => [
 				'property' => 'urlParameters',
 				'type' => 'section',

code/web/sys/ECommerce/HeyCentricUrlParameterSettings.php

@@ -17,15 +17,15 @@ static function getObjectStructure($context = ''): array {
 		$accountProfile = $library->getAccountProfile();
 		$catalogDriverName = trim($accountProfile->driver);
 		$catalogDriver = CatalogFactory::getCatalogConnectionInstance($catalogDriverName, $accountProfile);
-		$additionaFields = $catalogDriver->getAdditionalFieldsNamesByTable('account_debit_types');
-		array_unshift($additionaFields, '');
+		$additionalFields = $catalogDriver->hasAdditionalFields() ? $catalogDriver->getAdditionalFieldNames(null, null) : null;
+		array_unshift($additionalFields, null);
 
 		$structure = [
 			'value' => [
 				'property' => 'value',
 				'type' => 'text',
 				'label' => 'Parameter value',
-				'description' => 'If the parameter value is know and can be tied to a setting, please enter it here.',
+				'description' => 'If the parameter value is known and can be tied to a setting, please enter it here.',
 				'hideInLists' => false,
 				'default' => false,
 			], 
@@ -45,44 +45,21 @@ static function getObjectStructure($context = ''): array {
 				'hideInLists' => false,
 				'default' => false,
 			],
-			// Should be drop down?
-			'dbTableName' => [
-				'property' => 'dbTableName',
-				'type' => 'text',
-				'label' => 'Name of the matching ILS database table',
-				'description' => 'The name of the ILS database table where the parameter value is stored',
-				'hideInLists' => false,
-				'default' => null,
-			],
-			// Should be drop down?
-			'dbTableFieldName' => [
-				'property' => 'dbTableFieldName',
-				'type' => 'text',
-				'label' => 'Name of the matching ILS database field',
-				'description' => 'The name of the ILS database field where the parameter value is stored',
-				'hideInLists' => false,
-				'default' => null,
-			],
-			'isKohaAdditionalField' => [
-				'property' => 'valueIsKohaAdditionalField',
-				'type' => 'checkbox',
-				'label' => 'Is Koha Additional Field',
-				'description' => 'Whether this ILS database field in a Koha additional field',
-				'hideInLists' => false,
-				'default' => false,
-			],
-			// TODO: toggle based on isKohaAdditionalField value
-			'valueIsFromKohaAdditionalField' => [
-				'property' => 'valueIsFromKohaAdditionalField',
+			'kohaAdditionalFieldName' => [
+				'property' => 'kohaAdditionalFieldName',
 				'type' => 'enum',
 				'label' => 'Name of the matching Koha additional field if any',
-				'description' => 'The name of the additional field in Koha where the parameter value is stored',
-				'values' => $additionaFields,
+				'description' => 'If the value to be used for this parameter is stored in a Koha additional field, select its name here. Otherwise, please leave this blank.',
+				'values' => $additionalFields,
 				'hideInLists' => false,
 				'default' => null,
 			],
 		];
 
+		if (!$additionalFields) {
+			unset($structure['kohaAdditionalFieldName']);
+		}
+
 		return $structure;
 	}
 }