Stop submitting cancel form when hitting enter in invoice number field (#809)

This commit is contained in:
jekkos committed 2016-08-29 18:10:55 +02:00
1 parent 0ec94f1044
commit 31166c814e
1 file changed
+51 -50
+51 -50
View File
@@ -440,75 +440,76 @@ if (isset($success))
<div class='btn btn-sm btn-danger pull-right' id='cancel_sale_button'><span class="glyphicon glyphicon-remove">&nbsp</span><?php echo $this->lang->line('sales_cancel_sale'); ?></div>
</div>
<?php
<?php echo form_close(); ?>
<?php
// Only show this part if the payment cover the total
if($payments_cover_total)
{
?>
<div class="container-fluid">
<div class="no-gutter row">
<div class="form-group form-group-sm">
<div class="col-xs-12">
<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class'=>'control-label', 'id'=>'comment_label', 'for'=>'comment')); ?>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'2')); ?>
</div>
<div class="container-fluid">
<div class="no-gutter row">
<div class="form-group form-group-sm">
<div class="col-xs-12">
<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class'=>'control-label', 'id'=>'comment_label', 'for'=>'comment')); ?>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'2')); ?>
</div>
</div>
<div class="row">
</div>
<div class="row">
<div class="form-group form-group-sm">
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label for="sales_print_after_sale" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'sales_print_after_sale', 'id'=>'sales_print_after_sale', 'value'=>1, 'checked'=>$print_after_sale)); ?>
<?php echo $this->lang->line('sales_print_after_sale')?>
</label>
</div>
<?php
if(!empty($customer_email))
{
?>
<div class="col-xs-6">
<label for="sales_print_after_sale" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'sales_print_after_sale', 'id'=>'sales_print_after_sale', 'value'=>1, 'checked'=>$print_after_sale)); ?>
<?php echo $this->lang->line('sales_print_after_sale')?>
<label for="email-receipt" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'email_receipt', 'id'=>'email_receipt', 'value'=>1, 'checked'=>$email_receipt)); ?>
<?php echo $this->lang->line('sales_email_receipt');?>
</label>
</div>
<?php
if(!empty($customer_email))
{
?>
<div class="col-xs-6">
<label for="email-receipt" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'email_receipt', 'id'=>'email_receipt', 'value'=>1, 'checked'=>$email_receipt)); ?>
<?php echo $this->lang->line('sales_email_receipt');?>
</label>
</div>
<?php
}
?>
</div>
<?php
}
?>
</div>
<?php
if ($mode == "sale" && $this->config->item('invoice_enable') == TRUE)
{
?>
<div class="row">
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label class="control-label checkbox" for="sales_invoice_enable">
<?php echo form_checkbox(array('name'=>'sales_invoice_enable', 'id'=>'sales_invoice_enable', 'value'=>1, 'checked'=>$invoice_number_enabled)); ?>
<?php echo $this->lang->line('sales_invoice_enable');?>
</label>
</div>
</div>
<?php
if ($mode == "sale" && $this->config->item('invoice_enable') == TRUE)
{
?>
<div class="row">
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label class="control-label checkbox" for="sales_invoice_enable">
<?php echo form_checkbox(array('name'=>'sales_invoice_enable', 'id'=>'sales_invoice_enable', 'value'=>1, 'checked'=>$invoice_number_enabled)); ?>
<?php echo $this->lang->line('sales_invoice_enable');?>
</label>
</div>
<div class="col-xs-6">
<div class="input-group input-group-sm">
<span class="input-group-addon input-sm">#</span>
<?php echo form_input(array('name'=>'sales_invoice_number', 'id'=>'sales_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number));?>
</div>
<div class="col-xs-6">
<div class="input-group input-group-sm">
<span class="input-group-addon input-sm">#</span>
<?php echo form_input(array('name'=>'sales_invoice_number', 'id'=>'sales_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number));?>
</div>
</div>
</div>
<?php
}
?>
</div>
<?php
}
?>
<?php echo form_close(); ?>
</div>
<?php
}
?>
<?php
}
?>