feat: use_default setting for shipping time

bin/backend/controls/products/fields/ShippingTimePeriod.js

@@ -31,7 +31,9 @@ define('package/quiqqer/shipping/bin/backend/controls/products/fields/ShippingTi
             selectOptions: [
                 'timeperiod', 'unavailable', 'immediately_available',
                 'on_request', 'available_soon', 'custom_text'
-            ]
+            ],
+
+            show_default_option: true
         },
 
         initialize: function (options) {
@@ -72,6 +74,10 @@ define('package/quiqqer/shipping/bin/backend/controls/products/fields/ShippingTi
             var options  = this.getAttribute('selectOptions'),
                 lgPrefix = 'controls.products.fields.ShippingTimePeriod.';
 
+            if (this.getAttribute('show_default_option')) {
+                options.unshift('use_default');
+            }
+
             for (var i = 0, len = options.length; i < len; i++) {
                 var option = options[i];
 

locale.xml

@@ -763,6 +763,14 @@
             <de><![CDATA[Individueller Text]]></de>
             <en><![CDATA[Custom text]]></en>
         </locale>
+        <locale name="controls.products.fields.ShippingTimePeriod.option.custom_text">
+            <de><![CDATA[Individueller Text]]></de>
+            <en><![CDATA[Custom text]]></en>
+        </locale>
+        <locale name="controls.products.fields.ShippingTimePeriod.option.use_default">
+            <de><![CDATA[Standard-Einstellung benutzen]]></de>
+            <en><![CDATA[Use default setting]]></en>
+        </locale>
 
         <locale name="control.search.ShippingWindow.title">
             <de><![CDATA[Versandarten durchsuchen]]></de>

settings.xml

@@ -85,6 +85,7 @@
                         <input type="hidden"
                                conf="shipping.deliveryTimeDefault"
                                data-qui="package/quiqqer/shipping/bin/backend/controls/products/fields/ShippingTimePeriod"
+                               data-qui-options-show_default_option="0"
                         >
                             <text>
                                 <locale group="quiqqer/shipping" var="shipping.settings.deliveryTimeDefault"/>

src/QUI/ERP/Shipping/Products/Fields/ShippingTimeFrontendView.php

@@ -105,4 +105,29 @@ public function create()
 
         return $Engine->fetch(\dirname(__FILE__).'/ShippingTimePeriodFrontendView.html');
     }
+
+    /**
+     * Return the current value
+     *
+     * @return string|array
+     */
+    public function getValue()
+    {
+        if (!empty($this->value['option']) && $this->value['option'] === ShippingTimePeriod::OPTION_USE_DEFAULT) {
+            try {
+                $Conf = QUI::getPackage('quiqqer/shipping')->getConfig();
+            } catch (\Exception $Exception) {
+                QUI\System\Log::writeException($Exception);
+                return null;
+            }
+
+            $defaultValue = $Conf->get('shipping', 'deliveryTimeDefault');
+
+            if (!empty($defaultValue)) {
+                return \json_decode($defaultValue, true);
+            }
+        }
+
+        return parent::getValue();
+    }
 }

src/QUI/ERP/Shipping/Products/Fields/ShippingTimePeriod.php

@@ -18,6 +18,7 @@ class ShippingTimePeriod extends TimePeriod
     const OPTION_ON_REQUEST            = 'on_request';
     const OPTION_AVAILABLE_SOON        = 'available_soon';
     const OPTION_CUSTOM_TEXT           = 'custom_text';
+    const OPTION_USE_DEFAULT           = 'use_default';
 
     /**
      * Check the value
@@ -92,6 +93,7 @@ public function cleanup($value)
             case self::OPTION_IMMEDIATELY_AVAILABLE:
             case self::OPTION_ON_REQUEST:
             case self::OPTION_AVAILABLE_SOON:
+            case self::OPTION_USE_DEFAULT:
                 break;
 
             case self::OPTION_CUSTOM_TEXT: