Merge branch 'dev' of dev.quiqqer.com:quiqqer/shipping into dev

locale.xml

@@ -171,6 +171,14 @@
             <de><![CDATA[sofort verfügbar]]></de>
             <en><![CDATA[immediately available]]></en>
         </locale>
+        <locale name="fields.ShippingTimeFrontendView.on_request">
+            <de><![CDATA[auf Anfrage]]></de>
+            <en><![CDATA[on request]]></en>
+        </locale>
+        <locale name="fields.ShippingTimeFrontendView.available_soon">
+            <de><![CDATA[bald verfügbar]]></de>
+            <en><![CDATA[available soon]]></en>
+        </locale>
         <locale name="fields.ShippingTimeFrontendView.timeperiod.from_to">
             <de><![CDATA[ca. [from] bis [to]]]></de>
             <en><![CDATA[approx. [from] to [to]]]></en>

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

@@ -34,11 +34,9 @@ public function create()
 
         switch ($value['option']) {
             case ShippingTimePeriod::OPTION_UNAVAILABLE:
-                $valueText = $L->get($lg, 'fields.ShippingTimeFrontendView.unavailable');
-                break;
-
+            case ShippingTimePeriod::OPTION_ON_REQUEST:
             case ShippingTimePeriod::OPTION_IMMEDIATELY_AVAILABLE:
-                $valueText = $L->get($lg, 'fields.ShippingTimeFrontendView.immediately_available');
+                $valueText = $L->get($lg, 'fields.ShippingTimeFrontendView.'.$value['option']);
                 break;
 
             default:

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

@@ -15,6 +15,8 @@ class ShippingTimePeriod extends TimePeriod
     const OPTION_TIMEPERIOD            = 'timeperiod';
     const OPTION_UNAVAILABLE           = 'unavailable';
     const OPTION_IMMEDIATELY_AVAILABLE = 'immediately_available';
+    const OPTION_ON_REQUEST            = 'on_request';
+    const OPTION_AVAILABLE_SOON        = 'available_soon';
 
     /**
      * Check the value
@@ -66,6 +68,8 @@ public function cleanup($value)
             case self::OPTION_TIMEPERIOD:
             case self::OPTION_UNAVAILABLE:
             case self::OPTION_IMMEDIATELY_AVAILABLE:
+            case self::OPTION_ON_REQUEST:
+            case self::OPTION_AVAILABLE_SOON:
                 break;
 
             default: