Merge pull request #922 from listerr/billing-1

[IM/BF] Fix duplicate id on billing/registration notes. Move "Billing Frequency" field.

Author: barryo

resources/views/customer/billing-registration.foil.php

@@ -113,24 +113,24 @@
                                     <div class="card-header">
                                         <ul class="nav nav-tabs card-header-tabs">
                                             <li role="presentation" class="nav-item">
-                                                <a class="tab-link-body-note nav-link active" href="#body">Registration Notes</a>
+                                                <a class="tab-link-body-note nav-link active" href="#regbody">Registration Notes</a>
                                             </li>
                                             <li role="presentation" class="nav-item">
-                                                <a class="tab-link-preview-note nav-link" href="#preview">Preview</a>
+                                                <a class="tab-link-preview-note nav-link" href="#regpreview">Preview</a>
                                             </li>
                                         </ul>
                                     </div>
 
                                     <div class="tab-content card-body">
-                                        <div role="tabpanel" class="tab-pane show active" id="body">
+                                        <div role="tabpanel" class="tab-pane show active" id="regbody">
                                             <?= Former::textarea( 'notes' )
                                                 ->id( 'notes' )
                                                 ->label( '' )
                                                 ->rows( 8 )
                                                 ->blockHelp( "This field supports Markdown..." )
                                             ?>
                                         </div>
-                                        <div role="tabpanel" class="tab-pane" id="preview">
+                                        <div role="tabpanel" class="tab-pane" id="regpreview">
                                             <div class="bg-light p-4 well-preview">
                                                 Loading...
                                             </div>
@@ -152,14 +152,6 @@
                                 ->blockHelp( '' );
                             ?>
 
-                            <?= Former::select( 'billingFrequency' )
-                                ->label( 'Billing Frequency' )
-                                ->fromQuery( \IXP\Models\CompanyBillingDetail::$BILLING_FREQUENCIES )
-                                ->placeholder( 'Choose a billing frequency' )
-                                ->addClass( 'chzn-select' )
-                                ->blockHelp( '' );
-                            ?>
-
                             <?= Former::text( 'billingAddress1' )
                                 ->id( 'billingAddress1' )
                                 ->label( 'Address' )
@@ -213,6 +205,14 @@
                                 ->blockHelp( '' );
                             ?>
 
+                            <?= Former::select( 'billingFrequency' )
+                                ->label( 'Billing Frequency' )
+                                ->fromQuery( \IXP\Models\CompanyBillingDetail::$BILLING_FREQUENCIES )
+                                ->placeholder( 'Choose a billing frequency' )
+                                ->addClass( 'chzn-select' )
+                                ->blockHelp( '' );
+                            ?>
+
                             <?= Former::checkbox( 'purchaseOrderRequired' )
                                 ->label( ' ' )
                                 ->text( 'Purchase Order Required' )
@@ -262,24 +262,24 @@
                                         <div class="card-header">
                                             <ul class="nav nav-tabs card-header-tabs">
                                                 <li role="presentation" class="nav-item">
-                                                    <a class="tab-link-body-note nav-link active" href="#body">Billing Notes</a>
+                                                    <a class="tab-link-body-note nav-link active" href="#billbody">Billing Notes</a>
                                                 </li>
                                                 <li role="presentation" class="nav-item">
-                                                    <a class="tab-link-preview-note nav-link" href="#preview">Preview</a>
+                                                    <a class="tab-link-preview-note nav-link" href="#billpreview">Preview</a>
                                                 </li>
                                             </ul>
                                         </div>
 
                                         <div class="tab-content card-body">
-                                            <div role="tabpanel" class="tab-pane show active" id="body">
+                                            <div role="tabpanel" class="tab-pane show active" id="billbody">
                                                 <?= Former::textarea( 'billingNotes' )
                                                     ->id( 'billingNotes' )
                                                     ->label( '' )
                                                     ->rows( 8 )
                                                     ->blockHelp( "This field supports Markdown..." )
                                                 ?>
                                             </div>
-                                            <div role="tabpanel" class="tab-pane" id="preview">
+                                            <div role="tabpanel" class="tab-pane" id="billpreview">
                                                 <div class="bg-light p-4 well-preview">
                                                     Loading...
                                                 </div>