Shipping sync database scope changes (#407)

* Update dependency versions for version 1.2.0

* changes

* change

* changes

* changes

* changes

* linter

* changes

* changes

* changes

* Category sync cron job enabled (#405)

* Mapping added for age group (#408)

* 0 SKU id issue fixed for product feed (#411)

* 0 SKU id issue fixed

* 0 SKU id issue fixed

* changes

* changes

* removing comma

* casting store id to string

---------

Co-authored-by: Mark Wang <[email protected]>
Co-authored-by: Daniel M Connolly <[email protected]>
Co-authored-by: singhramanpreett <[email protected]>

Author: 4 people

.watchman-cookie-danconnolly-mbp-1492-146

@@ -20,33 +20,25 @@
 
 namespace Meta\Sales\Plugin;
 
-use Magento\OfflineShipping\Model\Carrier\Flatrate;
-use Magento\OfflineShipping\Model\Carrier\Freeshipping;
-use Magento\OfflineShipping\Model\Carrier\Tablerate;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CollectionFactory;
-use Magento\Shipping\Model\Carrier\AbstractCarrier;
 
 class ShippingData
 {
     /**
-     * @var Flatrate
-     */
-    protected Flatrate $flatRateModel;
-
-    /**
-     * @var Tablerate
+     * @var CollectionFactory
      */
-    protected Tablerate $tableRateModel;
+    protected CollectionFactory $tableRateCollection;
 
     /**
-     * @var Freeshipping
+     * @var ScopeConfigInterface
      */
-    protected Freeshipping $freeShippingModel;
+    protected ScopeConfigInterface $scopeConfig;
 
     /**
-     * @var CollectionFactory
+     * @var string
      */
-    protected CollectionFactory $tableRateCollection;
+    private string $storeId;
 
     public const ATTR_ENABLED = 'enabled';
     public const ATTR_TITLE = 'title';
@@ -58,78 +50,50 @@ class ShippingData
     public const ATTR_FREE_SHIPPING_MIN_ORDER_AMOUNT = 'free_shipping_minimum_order_amount';
 
     /**
-     * @param Flatrate $flatRateModel
-     * @param Tablerate $tableRateModel
-     * @param Freeshipping $freeShippingModel
      * @param CollectionFactory $tableRateCollection
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        Flatrate          $flatRateModel,
-        Tablerate         $tableRateModel,
-        Freeshipping      $freeShippingModel,
-        CollectionFactory $tableRateCollection
+        CollectionFactory    $tableRateCollection,
+        ScopeConfigInterface $scopeConfig
     ) {
-        $this->flatRateModel = $flatRateModel;
-        $this->tableRateModel = $tableRateModel;
-        $this->freeShippingModel = $freeShippingModel;
+        $this->scopeConfig = $scopeConfig;
         $this->tableRateCollection = $tableRateCollection;
     }
 
     /**
-     * A function that builds a table rates shipping profile
-     *
-     * @return array
-     */
-    public function buildTableRatesProfile(): array
-    {
-        return $this->buildShippingProfile($this->tableRateModel, true);
-    }
-
-    /**
-     * A function that builds a flat-rate shipping profile
-     *
-     * @return array
-     */
-    public function buildFlatRateProfile(): array
-    {
-        return $this->buildShippingProfile($this->flatRateModel, false);
-    }
-
-    /**
-     * A function that builds a free shipping profile
+     * Setter for store id
      *
-     * @return array
+     * @param string $store_id
+     * @return void
      */
-    public function buildFreeShippingProfile(): array
+    public function setStoreId(string $store_id)
     {
-        return $this->buildShippingProfile($this->freeShippingModel, false);
+        $this->storeId = $store_id;
     }
 
     /**
      * Returns shipping profiles based on the AbstractModel carrier passed in
      *
-     * @param AbstractCarrier $model
-     * @param bool $tableRates
+     * @param string $shippingProfileType
      * @return array
      */
-    private function buildShippingProfile(AbstractCarrier $model, bool $tableRates): array
+    public function buildShippingProfile(string $shippingProfileType): array
     {
-        $isEnabled = $model->getConfigData('active');
-        $title = $model->getConfigData('title');
-        $methodName = $model->getConfigData('name');
-        $price = (float)$model->getConfigData("price") ?? 0.0;
-        $allowedCountries = $model->getConfigData('specificcountry');
-        if ($tableRates) {
+        $isEnabled = $this->getFieldFromModel($shippingProfileType, 'active');
+        $title = $this->getFieldFromModel($shippingProfileType, 'title');
+        $methodName = $this->getFieldFromModel($shippingProfileType, 'name');
+        $price = (float)$this->getFieldFromModel($shippingProfileType, 'price') ?? 0.0;
+        $allowedCountries = $this->getFieldFromModel($shippingProfileType, 'specificcountries');
+        if ($shippingProfileType === ShippingProfileTypes::TABLE_RATE) {
             $shippingMethods = $this->getShippingMethodsInfoForTableRates();
         } else {
             $shippingMethods = $this->buildShippingMethodsInfo($allowedCountries, $price);
         }
-
-        $freeShippingThreshold = $model->getConfigData('free_shipping_subtotal');
-
-        $handlingFee = $model->getConfigData('handling_fee');
-        $handlingFeeType = $model->getConfigData('handling_type');
-        $shippingType = $model->getConfigData('type');
+        $freeShippingThreshold = $this->getFieldFromModel($shippingProfileType, 'free_shipping_subtotal');
+        $handlingFee = $this->getFieldFromModel($shippingProfileType, 'handling_fee');
+        $handlingFeeType = $this->getFieldFromModel($shippingProfileType, 'handling_type');
+        $shippingType = $this->getFieldFromModel($shippingProfileType, 'type');
         return [
             self::ATTR_ENABLED => $isEnabled,
             self::ATTR_TITLE => $title,
@@ -142,6 +106,19 @@ private function buildShippingProfile(AbstractCarrier $model, bool $tableRates):
         ];
     }
 
+    /**
+     * Get field from abstract carrier DB
+     *
+     * @param string $shippingProfileType
+     * @param string $field
+     * @return mixed
+     */
+    private function getFieldFromModel(string $shippingProfileType, string $field)
+    {
+        $path = 'carriers/' . $shippingProfileType . '/' . $field;
+        return $this->scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->storeId);
+    }
+
     /**
      * A function that builds shipping methods info for shipping profiles which are not table rates
      *

app/code/Meta/Sales/Plugin/ShippingData.php

@@ -18,34 +18,12 @@
  * limitations under the License.
  */
 
-namespace Meta\Sales\Plugin;
 
-use \Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Filesystem;
+namespace Meta\Sales\Plugin;
 
-class ShippingDataFactory
+class ShippingProfileTypes
 {
-    /**
-     * @var ObjectManagerInterface
-     */
-    protected ObjectManagerInterface $objectManager;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     */
-    public function __construct(ObjectManagerInterface $objectManager)
-    {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * A function to instantiate the shipping data class
-     *
-     * @return mixed
-     */
-    public function create(): mixed
-    {
-        return $this->objectManager->create(ShippingData::class);
-    }
+    public const TABLE_RATE = 'tablerate';
+    public const FREE_SHIPPING = 'freeshipping';
+    public const FLAT_RATE = 'flatrate';
 }

app/code/Meta/Sales/Plugin/ShippingDataFactory.php renamed to app/code/Meta/Sales/Plugin/ShippingProfileTypes.php

@@ -62,30 +62,35 @@ class ShippingSettingsUpdatePlugin
      */
     private StoreManagerInterface $storeManager;
 
+    /**
+     * @var ShippingData
+     */
+    private ShippingData $shippingData;
+
     /**
      * Constructor for Shipping settings update plugin
      *
-     * @param ShippingDataFactory $shippingRatesFactory
      * @param Filesystem $fileSystem
      * @param GraphAPIAdapter $graphApiAdapter
      * @param FBEHelper $fbeHelper
      * @param SystemConfig $systemConfig
      * @param StoreManagerInterface $storeManager
+     * @param ShippingData $shippingData
      */
     public function __construct(
-        ShippingDataFactory   $shippingRatesFactory,
         FileSystem            $fileSystem,
         GraphAPIAdapter       $graphApiAdapter,
         FBEHelper             $fbeHelper,
         SystemConfig          $systemConfig,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        ShippingData          $shippingData,
     ) {
-        $this->shippingRatesFactory = $shippingRatesFactory;
         $this->fileSystem = $fileSystem;
         $this->graphApiAdapter = $graphApiAdapter;
         $this->fbeHelper = $fbeHelper;
         $this->systemConfig = $systemConfig;
         $this->storeManager = $storeManager;
+        $this->shippingData = $shippingData;
     }
 
     /**
@@ -102,12 +107,12 @@ public function afterSave(Config $config): void
         }
         foreach ($this->storeManager->getStores() as $store) {
             try {
-                $shippingRates = $this->shippingRatesFactory->create();
                 $fileBuilder = new ShippingFileBuilder($this->fileSystem);
+                $this->shippingData->setStoreId((string)$store->getId());
                 $shippingProfiles = [
-                    $shippingRates->buildTableRatesProfile(),
-                    $shippingRates->buildFlatRateProfile(),
-                    $shippingRates->buildFreeShippingProfile()
+                    $this->shippingData->buildShippingProfile(ShippingProfileTypes::TABLE_RATE),
+                    $this->shippingData->buildShippingProfile(ShippingProfileTypes::FLAT_RATE),
+                    $this->shippingData->buildShippingProfile(ShippingProfileTypes::FREE_SHIPPING),
                 ];
                 $file_uri = $fileBuilder->createFile($shippingProfiles);
                 $partnerIntegrationId = $this->systemConfig->getCommercePartnerIntegrationId($store->getId());