Move pro conditions out of advanced section

assets/javascripts/discourse/templates/components/wizard-custom-field.hbs

@@ -207,27 +207,27 @@
   </div>
 {{/if}}
 
+{{#if proSubscribed}}
+  <div class="setting full field-mapper-setting pro">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.condition"}}</label>
+      <span class="pro-label">{{i18n "admin.wizard.pro.label"}}</span>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=field.condition
+        options=fieldConditionOptions}}
+    </div>
+  </div>
+{{/if}}
+
 {{#if showAdvanced}}
   {{wizard-advanced-toggle showAdvanced=field.showAdvanced}}
 
   {{#if field.showAdvanced}}
     <div class="advanced-settings">
 
-      {{#if proSubscribed}}
-        <div class="setting full field-mapper-setting pro">
-          <div class="setting-label">
-            <label>{{i18n "admin.wizard.condition"}}</label>
-            <span class="pro-label">{{i18n "admin.wizard.pro.label"}}</span>
-          </div>
-
-          <div class="setting-value">
-            {{wizard-mapper
-              inputs=field.condition
-              options=fieldConditionOptions}}
-          </div>
-        </div>
-      {{/if}}
-
       <div class="setting full field-mapper-setting">
         <div class="setting-label">
           <label>{{i18n "admin.wizard.index"}}</label>

assets/javascripts/discourse/templates/components/wizard-custom-step.hbs

@@ -33,35 +33,35 @@
   </div>
 </div>
 
+{{#if proSubscribed}}
+  <div class="setting full field-mapper-setting pro">
+    <div class="setting-label">
+      <label>{{i18n "admin.wizard.condition"}}</label>
+      <span class="pro-label">{{i18n "admin.wizard.pro.label"}}</span>
+    </div>
+
+    <div class="setting-value">
+      {{wizard-mapper
+        inputs=step.condition
+        options=stepConditionOptions}}
+    </div>
+  </div>
+
+  <div class="setting full">
+    <div class="setting-label"></div>
+    <div class="setting-value force-final">
+      <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
+      {{input type="checkbox" checked=step.force_final}}
+      <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
+    </div>
+  </div>
+{{/if}}
+
 {{wizard-advanced-toggle showAdvanced=step.showAdvanced}}
 
 {{#if step.showAdvanced}}
   <div class="advanced-settings">
 
-    {{#if proSubscribed}}
-      <div class="setting full field-mapper-setting pro">
-        <div class="setting-label">
-          <label>{{i18n "admin.wizard.condition"}}</label>
-          <span class="pro-label">{{i18n "admin.wizard.pro.label"}}</span>
-        </div>
-
-        <div class="setting-value">
-          {{wizard-mapper
-            inputs=step.condition
-            options=stepConditionOptions}}
-        </div>
-      </div>
-
-      <div class="setting full">
-        <div class="setting-label"></div>
-        <div class="setting-value force-final">
-          <h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
-          {{input type="checkbox" checked=step.force_final}}
-          <span>{{i18n "admin.wizard.step.force_final.description"}}</span>
-        </div>
-      </div>
-    {{/if}}
-
     <div class="setting full field-mapper-setting">
       <div class="setting-label">
         <label>{{i18n "admin.wizard.step.required_data.label"}}</label>