Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barryo merged 2 commits into from
Aug 11, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36934b
[IM] Move "Billing Frequency" out of the contact details.
listerr May 2, 2025
985d6e1
[BF] Fix duplicate id in reg/billing note panels
listerr May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions resources/views/customer/billing-registration.foil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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' )
Expand Down Expand Up @@ -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' )
Expand Down Expand Up @@ -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>
Expand Down