Fixes getOrderIdPrefix return #141

magmodules · Feb 16, 2022 · 7a5ddcd · 7a5ddcd
1 parent 25676a0
commit 7a5ddcd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Model/Config/System/BaseRepository.php b/Model/Config/System/BaseRepository.php
@@ -97,9 +97,9 @@ public function __construct(
      * @param string $path
      * @param int|null $storeId
      * @param string|null $scope
-     * @return mixed
+     * @return string|null
      */
-    protected function getStoreValue(string $path, int $storeId = null, string $scope = null)
+    protected function getStoreValue(string $path, int $storeId = null, string $scope = null): ?string
     {
         if (empty($scope)) {
             $scope = ScopeInterface::SCOPE_STORE;
@@ -132,9 +132,9 @@ protected function getStore(): StoreInterface
      * @param string $path
      * @param int|null $storeId
      * @param string|null $scope
-     * @return mixed
+     * @return bool
      */
-    protected function isSetFlag(string $path, int $storeId = null, string $scope = null)
+    protected function isSetFlag(string $path, int $storeId = null, string $scope = null): bool
     {
         if (empty($scope)) {
             $scope = ScopeInterface::SCOPE_STORE;

diff --git a/Model/Config/System/OrderRepository.php b/Model/Config/System/OrderRepository.php
@@ -154,7 +154,7 @@ public function useChannelOrderAsOrderIncrementId(int $storeId = null): bool
      */
     public function getOrderIdPrefix(int $storeId = null): ?string
     {
-        return $this->isSetFlag(self::XML_PATH_ORDERID_PREFIX, $storeId);
+        return $this->getStoreValue(self::XML_PATH_ORDERID_PREFIX, $storeId);
     }
 
     /**

diff --git a/etc/adminhtml/system/order.xml b/etc/adminhtml/system/order.xml
@@ -157,7 +157,6 @@
             <field id="orderid_prefix" translate="label" type="text" sortOrder="48" showInDefault="1"
                    showInWebsite="1" showInStore="1">
                 <label>Order ID Prefix</label>
-                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <config_path>magmodules_channable_marketplace/order/orderid_prefix</config_path>
                 <comment><![CDATA[<strong>NOTE:</strong> As the Order Increment ID is a unique value, we strongly
                 recommend to add a prefix to the Channable Order ID to make sure the order number is unique.
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function getOrderIdPrefix(int $storeId = null): ?string
         {
-            return $this->isSetFlag(self::XML_PATH_ORDERID_PREFIX, $storeId);
+            return $this->getStoreValue(self::XML_PATH_ORDERID_PREFIX, $storeId);
         }
         /**
@@ Expand Down @@