← All changes
|
includes/Core/Integration/ZohoSheet/ZohoSheetHandler.php
+21
-4
-3.0.1
→
V3.3.2
View file →
| @@ -295,17 +295,34 @@ | ||
| 295 | 295 | if ((int) $queryParams->headerRow < 1) { |
| 296 | 296 | $queryParams->headerRow = 1; |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | - $worksheetHeadersMetaApiEndpoint = "https://sheet.zoho.{$queryParams->dataCenter}/api/v2/{$queryParams->workbook}?method=worksheet.records.fetch&worksheet_name={$queryParams->worksheet}&count=1&header_row={$queryParams->headerRow}"; | |
| 299 | + $baseUrl = "https://sheet.zoho.{$queryParams->dataCenter}/api/v2/{$queryParams->workbook}"; | |
| 300 | 300 | |
| 301 | + $params = http_build_query([ | |
| 302 | + 'method' => 'range.content.get', | |
| 303 | + 'worksheet_name' => $queryParams->worksheet, | |
| 304 | + 'start_row' => $queryParams->headerRow, | |
| 305 | + 'end_row' => $queryParams->headerRow, | |
| 306 | + 'start_column' => 1, | |
| 307 | + 'end_column' => 100 | |
| 308 | + ]); | |
| 309 | + | |
| 310 | + $worksheetHeadersMetaApiEndpoint = "{$baseUrl}?{$params}"; | |
| 311 | + | |
| 301 | 312 | $authorizationHeader['Authorization'] = "Zoho-oauthtoken {$queryParams->tokenDetails->access_token}"; |
| 302 | 313 | $worksheetHeadersMetaResponse = HttpHelper::get($worksheetHeadersMetaApiEndpoint, null, $authorizationHeader); |
| 303 | 314 | |
| 304 | - // wp_send_json_success($worksheetHeadersMetaResponse, 200); | |
| 305 | - | |
| 306 | 315 | if (!is_wp_error($worksheetHeadersMetaResponse)) { |
| 307 | - $allHeaders = array_diff(array_keys((array) $worksheetHeadersMetaResponse->records[0]), ['row_index']); | |
| 316 | + $rowDetails = $worksheetHeadersMetaResponse->range_details[0]->row_details ?? []; | |
| 317 | + $allHeaders = is_array($rowDetails) | |
| 318 | + ? array_map( | |
| 319 | + function ($rowDetail) { | |
| 320 | + return isset($rowDetail->content) ? (string) $rowDetail->content : null; | |
| 321 | + }, | |
| 322 | + $rowDetails | |
| 323 | + ) | |
| 324 | + : []; | |
| 308 | 325 | |
| 309 | 326 | usort($allHeaders, 'strnatcasecmp'); |
| 310 | 327 | $response['worksheet_headers'] = $allHeaders; |
| 311 | 328 | } else { |