Merge branch 'namefield' of andre/thurdataOrderform into master

checkout.tpl

@@ -1638,8 +1638,11 @@
                                 class="margin-bottom btn btn-primary btn-lg disable-on-click spinner-on-click{if $captcha}{$captcha->getButtonClass($captchaForm)}{/if}"
                                 {if $cartitems==0}disabled="disabled"{/if}
                                 >
-                    {if $inExpressCheckout}{$LANG.confirmAndPay}{else}{$LANG.completeorder}{/if}
-                    &nbsp;<i class="fas fa-arrow-circle-right"></i>
+                                {if $rawtotal==0}Kostenlos bestellen
+                                {else}
+                                    {if $inExpressCheckout}{$LANG.confirmAndPay}{else}{$LANG.completeorder}{/if}
+                                {/if}
+                            &nbsp;<i class="fas fa-arrow-circle-right"></i>
                 </button>
             </div>
         </form>

configure_thurvcloud.tpl

@@ -179,6 +179,27 @@ var _localLang = {
 
                             </div>
                         {/if}
+                        {if $customfields}
+
+                            <div class="sub-heading">
+                                <span>{$LANG.orderadditionalrequiredinfo}</span>
+                            </div>
+
+                            <div class="field-container">
+                                {foreach $customfields as $customfield}
+                                    <div class="form-group">
+                                        <label for="customfield{$customfield.id}">{$customfield.name}</label>
+                                        {$customfield.input}
+                                        {if $customfield.description}
+                                            <span class="field-help-text">
+                                                {$customfield.description}
+                                            </span>
+                                        {/if}
+                                    </div>
+                                {/foreach}
+                            </div>
+
+                        {/if}
 
                         {if $configurableoptions}
                             <div class="sub-heading">
@@ -291,28 +312,6 @@ var _localLang = {
 
                         {/if}
 
-                        {if $customfields}
-
-                            <div class="sub-heading">
-                                <span>{$LANG.orderadditionalrequiredinfo}</span>
-                            </div>
-
-                            <div class="field-container">
-                                {foreach $customfields as $customfield}
-                                    <div class="form-group">
-                                        <label for="customfield{$customfield.id}">{$customfield.name}</label>
-                                        {$customfield.input}
-                                        {if $customfield.description}
-                                            <span class="field-help-text">
-                                                {$customfield.description}
-                                            </span>
-                                        {/if}
-                                    </div>
-                                {/foreach}
-                            </div>
-
-                        {/if}
-
                         {if $addons || count($addonsPromoOutput) > 0}
 
                             <div class="sub-heading">