Rename page id to orders root (#479)

* Renamed page ID variable to orders root ID

* Renamed page ID variable to orders root ID

Author: zlik

app/code/Meta/BusinessExtension/Helper/GraphAPIAdapter.php

@@ -566,13 +566,13 @@ public function graphAPIBatchRequest(array $requests)
     /**
      * Get orders
      *
-     * @param mixed $pageId
+     * @param mixed $ordersRootId Commerce Account ID or Page ID
      * @param false|string $cursorAfter
      * @param string $filterType
      * @return array
      * @throws GuzzleException
      */
-    public function getOrders($pageId, $cursorAfter = false, $filterType = "")
+    public function getOrders($ordersRootId, $cursorAfter = false, $filterType = "")
     {
         $requestFields = [
             'id',
@@ -609,7 +609,7 @@ public function getOrders($pageId, $cursorAfter = false, $filterType = "")
         if ($cursorAfter) {
             $request['after'] = $cursorAfter;
         }
-        $response = $this->callApi('GET', "{$pageId}/commerce_orders", $request);
+        $response = $this->callApi('GET', "{$ordersRootId}/commerce_orders", $request);
         return json_decode($response->getBody()->__toString(), true);
     }
 
@@ -683,20 +683,20 @@ public function getOrderItems($fbOrderId)
     /**
      * Acknowledge orders
      *
-     * @param mixed $pageId
+     * @param mixed $ordersRootId Commerce Account ID or Page ID
      * @param array $orderIds
      * @return mixed
      * @throws GuzzleException
      */
-    public function acknowledgeOrders($pageId, array $orderIds)
+    public function acknowledgeOrders($ordersRootId, array $orderIds)
     {
         $request = [];
         foreach ($orderIds as $magentoOrderId => $fbOrderId) {
             $request[] = ['id' => $fbOrderId, 'merchant_order_reference' => $magentoOrderId];
         }
         $response = $this->callApi(
             'POST',
-            "{$pageId}/acknowledge_orders",
+            "{$ordersRootId}/acknowledge_orders",
             [
                 'access_token' => $this->accessToken,
                 'idempotency_key' => $this->getUniqId(),

app/code/Meta/Sales/Helper/CommerceHelper.php

@@ -115,11 +115,11 @@ public function __construct(
      */
     public function pullOrders(int $storeId, $cursorAfter = false)
     {
-        $ordersRootId = $this->systemConfig->getCommerceAccountId($storeId) ?: $this->systemConfig->getPageId($storeId);
         $this->graphAPIAdapter
             ->setDebugMode($this->systemConfig->isDebugMode($storeId))
             ->setAccessToken($this->systemConfig->getAccessToken($storeId));
 
+        $ordersRootId = $this->systemConfig->getCommerceAccountId($storeId) ?: $this->systemConfig->getPageId($storeId);
         $ordersData = $this->graphAPIAdapter->getOrders($ordersRootId, $cursorAfter);
 
         $this->ordersPulledTotal += count($ordersData['data']);
@@ -158,14 +158,14 @@ public function pullOrders(int $storeId, $cursorAfter = false)
      * @return array Associative array containing the refund details with Facebook Order IDs as keys.
      * @throws GuzzleException
      */
-    public function pullRefundOrders(int $storeId)
+    public function pullRefundOrders(int $storeId): array
     {
-        $ordersRootId = $this->systemConfig->getCommerceAccountId($storeId) ?: $this->systemConfig->getPageId($storeId);
         $this->graphAPIAdapter
             ->setDebugMode($this->systemConfig->isDebugMode($storeId))
             ->setAccessToken($this->systemConfig->getAccessToken($storeId));
 
         // Pull orders with refunds
+        $ordersRootId = $this->systemConfig->getCommerceAccountId($storeId) ?: $this->systemConfig->getPageId($storeId);
         $ordersWithRefunds = $this->graphAPIAdapter->getOrders(
             $ordersRootId,
             false,
@@ -202,14 +202,14 @@ public function pullRefundOrders(int $storeId)
      * @return array Associative array containing the cancellation details with Facebook Order IDs as keys.
      * @throws GuzzleException
      */
-    public function pullCancelledOrders(int $storeId)
+    public function pullCancelledOrders(int $storeId): array
     {
-        $ordersRootId = $this->systemConfig->getCommerceAccountId($storeId) ?: $this->systemConfig->getPageId($storeId);
         $this->graphAPIAdapter
             ->setDebugMode($this->systemConfig->isDebugMode($storeId))
             ->setAccessToken($this->systemConfig->getAccessToken($storeId));
 
         // Pull orders with cancellations
+        $ordersRootId = $this->systemConfig->getCommerceAccountId($storeId) ?: $this->systemConfig->getPageId($storeId);
         $ordersWithCancellations = $this->graphAPIAdapter->getOrders(
             $ordersRootId,
             false,