Remove support for different shipment events and only support 'auto' sync (#624)

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

Author: swinard-meta

app/code/Meta/BusinessExtension/Model/System/Config.php

@@ -89,8 +89,6 @@ class Config
     public const XML_PATH_FACEBOOK_ORDERS_SYNC_ACTIVE = 'facebook/orders_sync/active';
     public const XML_PATH_FACEBOOK_ORDERS_SYNC_DEFAULT_ORDER_STATUS = 'facebook/orders_sync/default_order_status';
     public const XML_PATH_FACEBOOK_AUTO_SUBSCRIBE_TO_NEWSLETTER = 'facebook/orders_sync/auto_subscribe_to_newsletter';
-    private const XML_PATH_FACEBOOK_ORDER_SHIP_EVENT = 'facebook/orders_sync/order_ship_event';
-
     private const XML_PATH_FACEBOOK_USE_DEFAULT_FULFILLMENT_LOCATION =
         'facebook/orders_sync/default_fulfillment_location';
     private const XML_PATH_FACEBOOK_FULFILLMENT_LOCATION_STREET_LINE_1 = 'facebook/orders_sync/street_line1';
@@ -494,19 +492,6 @@ public function isAutoNewsletterSubscriptionOn($scopeId = null, $scope = null):
         return (bool)$this->getConfig(self::XML_PATH_FACEBOOK_AUTO_SUBSCRIBE_TO_NEWSLETTER, $scopeId, $scope);
     }
 
-    /**
-     * Get order ship event
-     *
-     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
-     * @param int|null $scopeId
-     * @param int $scope
-     * @return string
-     */
-    public function getOrderShipEvent($scopeId = null, $scope = null)
-    {
-        return $this->getConfig(self::XML_PATH_FACEBOOK_ORDER_SHIP_EVENT, $scopeId, $scope);
-    }
-
     /**
      * Get config
      *

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

@@ -95,17 +95,6 @@ public function __construct(
         $this->facebookOrder = $facebookOrder;
     }
 
-    /**
-     * Get order ship event
-     *
-     * @param int|null $storeId
-     * @return null|string
-     */
-    public function getOrderShipEvent($storeId = null)
-    {
-        return $this->systemConfig->getOrderShipEvent($storeId);
-    }
-
     /**
      * Mark order items as shipped
      *

app/code/Meta/Sales/Observer/Order/ShipmentObserver.php

@@ -26,18 +26,17 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Model\Order\Shipment;
-use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Meta\BusinessExtension\Helper\FBEHelper;
+use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Meta\Sales\Helper\OrderHelper;
 use Meta\Sales\Model\Order\Shipper;
-use Psr\Log\LoggerInterface;
-
 use Meta\Sales\Observer\MetaObserverTrait;
+use Psr\Log\LoggerInterface;
 
 class ShipmentObserver implements ObserverInterface
 {
     use MetaObserverTrait;
-    
+
     /**
      * @var SystemConfig
      */
@@ -154,12 +153,7 @@ protected function executeImpl(Observer $observer)
             return;
         }
 
-        $orderShipmentEvent = $this->shipper->getOrderShipEvent($storeId);
-        if ($observer->getEvent()->getName() === $orderShipmentEvent) {
-            $this->executeMarkAsShipped($shipment);
-        } elseif (Shipper::MAGENTO_EVENT_SHIPMENT_AUTO === $orderShipmentEvent) {
-            $this->executeAutoSync($shipment);
-        }
+        $this->executeAutoSync($shipment);
     }
 
     /**

app/code/Meta/Sales/etc/config.xml

@@ -8,16 +8,6 @@
                 <default_order_status>pending</default_order_status>
                 <auto_subscribe_to_newsletter>1</auto_subscribe_to_newsletter>
                 <default_fulfillment_location>1</default_fulfillment_location>
-                <!--
-                    The event on which to trigger shipment sync, based on particular fulfillment flow.
-                    Alternatively, use 'auto' to allow Meta to determine the best strategy.
-
-                    Supported values:
-                        auto
-                        sales_order_shipment_save_after
-                        sales_order_shipment_track_save_after
-                -->
-                <order_ship_event>auto</order_ship_event>
             </orders_sync>
         </facebook>
         <payment>