Merge remote-tracking branch 'origin/main'

bold-commerce · Nov 9, 2023 · 0f625b4 · 0f625b4
2 parents 97081ff + 7ff4956
commit 0f625b4
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 824 deletions.
diff --git a/Api/Catalog/GetProductsInterface.php b/Api/Catalog/GetProductsInterface.php
diff --git a/Api/Data/Catalog/GetProductsResultInterface.php b/Api/Data/Catalog/GetProductsResultInterface.php
diff --git a/Block/System/Config/Form/Field.php b/Block/System/Config/Form/Field.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Block\System\Config\Form;
+
+use Magento\Config\Block\System\Config\Form\Field as FormField;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Render field html element in Stores Configuration.
+ */
+class Field extends FormField
+{
+    /**
+     * @var bool
+     */
+    protected $unsetScope = false;
+
+    /**
+     * Unset scope element parameters.
+     *
+     * @param AbstractElement $element
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        if ($this->unsetScope) {
+            $element = clone $element;
+            $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        }
+
+        return parent::render($element);
+    }
+}
diff --git a/Block/System/Config/Form/Field/Status.php b/Block/System/Config/Form/Field/Status.php
@@ -1,12 +1,11 @@
 <?php
-
 declare(strict_types=1);
 
 namespace Bold\Checkout\Block\System\Config\Form\Field;
 
+use Bold\Checkout\Block\System\Config\Form\Field;
 use Bold\Checkout\Model\BoldIntegration;
 use Magento\Backend\Block\Template\Context;
-use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Config\Model\Config;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Integration\Model\Integration\Source\Status as SourceStatus;
@@ -17,6 +16,8 @@
  */
 class Status extends Field
 {
+    protected $unsetScope = true;
+
     /**
      * @var BoldIntegration
      */

diff --git a/Block/System/Config/Form/Field/Version.php b/Block/System/Config/Form/Field/Version.php
@@ -1,19 +1,20 @@
 <?php
-
 declare(strict_types=1);
 
 namespace Bold\Checkout\Block\System\Config\Form\Field;
 
+use Bold\Checkout\Block\System\Config\Form\Field;
 use Bold\Checkout\Model\ModuleVersionProvider;
 use Magento\Backend\Block\Template\Context;
-use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
 /**
  * Bold Integration version field.
  */
 class Version extends Field
 {
+    protected $unsetScope = true;
+
     /**
      * @var ModuleVersionProvider
      */

diff --git a/Model/Catalog/GetProducts.php b/Model/Catalog/GetProducts.php
diff --git a/Model/Catalog/GetProducts/Result.php b/Model/Catalog/GetProducts/Result.php
diff --git a/Model/GetParallelCheckoutTemplate.php b/Model/GetParallelCheckoutTemplate.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model;
+
+/**
+ * Get template for the parallel checkout button.
+ */
+class GetParallelCheckoutTemplate
+{
+    private const PARALLEL_CHECKOUT_TEMPLATE = 'Bold_Checkout::cart/checkout_button.phtml';
+
+    /**
+     * Get template for the parallel checkout button.
+     *
+     * @return string
+     */
+    public function getTemplate(): string {
+       return self::PARALLEL_CHECKOUT_TEMPLATE;
+    }
+}