Send Magento shipment ID to Meta during fulfillment (#551)

* Send Magento shipment ID to Meta during fulfillment

* reformat

---------

Co-authored-by: Sean Winard <[email protected]>

Author: swinard-meta

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

@@ -711,15 +711,17 @@ public function acknowledgeOrders($ordersRootId, array $orderIds)
      *
      * @param mixed $fbOrderId
      * @param array $items
+     * @param string $magentoShipmentId
      * @param array $trackingInfo
      * @param array $fulfillmentAddressData
      * @return mixed|\Psr\Http\Message\ResponseInterface
      * @throws GuzzleException
      */
-    public function markOrderAsShipped($fbOrderId, $items, $trackingInfo, $fulfillmentAddressData)
+    public function markOrderAsShipped($fbOrderId, $magentoShipmentId, $items, $trackingInfo, $fulfillmentAddressData)
     {
         $request = [
             'access_token' => $this->accessToken,
+            'external_shipment_id' => $magentoShipmentId,
             'idempotency_key' => $this->getUniqId(),
             'items' => json_encode($items),
             'tracking_info' => json_encode($trackingInfo),
@@ -731,8 +733,7 @@ public function markOrderAsShipped($fbOrderId, $items, $trackingInfo, $fulfillme
             $request['should_use_default_fulfillment_location'] = true;
         }
         $response = $this->callApi('POST', "{$fbOrderId}/shipments", $request);
-        $response = json_decode($response->getBody()->__toString(), true);
-        return $response;
+        return json_decode($response->getBody()->__toString(), true);
     }
 
     /**

app/code/Meta/Sales/Model/Order/Shipper.php

@@ -65,10 +65,10 @@ class Shipper
      * @param OrderHelper $orderHelper
      */
     public function __construct(
-        SystemConfig $systemConfig,
+        SystemConfig    $systemConfig,
         GraphAPIAdapter $graphAPIAdapter,
-        ShippingHelper $shippingHelper,
-        OrderHelper $orderHelper
+        ShippingHelper  $shippingHelper,
+        OrderHelper     $orderHelper
     ) {
         $this->systemConfig = $systemConfig;
         $this->graphAPIAdapter = $graphAPIAdapter;
@@ -199,6 +199,7 @@ public function markAsShipped(Shipment $shipment)
         $this->markOrderAsShipped(
             (int)$storeId,
             $fbOrderId,
+            $shipment->getIncrementId(),
             $itemsToShip,
             $trackingInfo,
             $fulfillmentAddress
@@ -215,24 +216,27 @@ public function markAsShipped(Shipment $shipment)
      *
      * @param int $storeId
      * @param string $fbOrderId
+     * @param string $magentoShipmentId
      * @param array $items
      * @param array $trackingInfo
      * @param array $fulfillmentAddressData
      * @throws GuzzleException
      */
     private function markOrderAsShipped(
-        int $storeId,
+        int    $storeId,
         string $fbOrderId,
-        array $items,
-        array $trackingInfo,
-        array $fulfillmentAddressData = []
+        string $magentoShipmentId,
+        array  $items,
+        array  $trackingInfo,
+        array  $fulfillmentAddressData = []
     ) {
         $this->graphAPIAdapter
             ->setDebugMode($this->systemConfig->isDebugMode($storeId))
             ->setAccessToken($this->systemConfig->getAccessToken($storeId));
 
         $this->graphAPIAdapter->markOrderAsShipped(
             $fbOrderId,
+            $magentoShipmentId,
             $items,
             $trackingInfo,
             $fulfillmentAddressData