mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-19 06:47:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

make sale and receiving forms consistent with the other forms (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-02-28 15:55:45 +00:00
parent 7b09961075
commit c675a73fc6
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
application/views/receivings/form.php
View File

@@ -1,50 +1,49 @@
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="error_message_box" class="error_message_box"></ul>
<div id="edit_sale_wrapper">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="error_message_box" class="error_message_box"></ul>
<fieldset id="receiving_basic_info">
<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], array('id'=>'recvs_edit_form', 'class' => 'form-horizontal')); ?>
<legend><?php echo $this->lang->line("recvs_basic_information"); ?></legend>
<?php echo form_open("receivings/save/".$receiving_info['receiving_id'], array('id'=>'recvs_edit_form', 'class'=>'form-horizontal')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('recvs_receipt_number'), 'supplier', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('recvs_receipt_number'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo anchor('receivings/receipt/'.$receiving_info['receiving_id'], $this->lang->line('recvs_receipt_number') .$receiving_info['receiving_id'], array('target' => '_blank'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('recvs_date'), 'date', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('recvs_date'), 'date', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'class' => 'form-control input-sm', 'readonly'=>'true'));?>
<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('recvs_supplier'), 'supplier', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('recvs_supplier'), 'supplier', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_input(array('name' => 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id', 'class'=>'form-control input-sm'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('recvs_invoice_number'), 'invoice_number', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('recvs_invoice_number'), 'invoice_number', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number', 'class' => 'form-control input-sm'));?>
<?php echo form_input(array('name' => 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number', 'class'=>'form-control input-sm'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('recvs_employee'), 'employee', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('recvs_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_dropdown('employee_id', $employees, $receiving_info['employee_id'], 'id="employee_id" class="form-control"');?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('recvs_comments'), 'comment', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('recvs_comments'), 'comment', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class' => 'form-control input-sm'));?>
<?php echo form_textarea(array('name'=>'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
</div>
</div>

31
application/views/sales/form.php
View File

@@ -1,56 +1,55 @@
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="error_message_box" class="error_message_box"></ul>
<div id="edit_sale_wrapper">
<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
<ul id="error_message_box" class="error_message_box"></ul>
<fieldset id="sale_basic_info">
<?php echo form_open("sales/save/".$sale_info['sale_id'], array('id'=>'sales_edit_form', 'class' => 'form-horizontal')); ?>
<legend><?php echo $this->lang->line("sales_basic_information"); ?></legend>
<?php echo form_open("sales/save/".$sale_info['sale_id'], array('id'=>'sales_edit_form', 'class'=>'form-horizontal')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('sales_receipt_number'), 'customer', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('sales_receipt_number'), 'customer', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], $this->lang->line('sales_receipt_number') .$sale_info['sale_id'], array('target' => '_blank'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('sales_date'), 'date', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('sales_date'), 'date', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_input(array('name'=>'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'class'=>'form-control input-sm', 'readonly'=>'true'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('sales_invoice_number'), 'invoice_number', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('sales_invoice_number'), 'invoice_number', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php if (isset($sale_info["invoice_number"]) && !empty($sale_info["invoice_number"]) &&
isset($sale_info['customer_id']) && isset($sale_info['email']) && !empty($sale_info['email'])): ?>
<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control input-sm'));?>
<?php echo form_input(array('name'=>'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class'=>'form-control input-sm'));?>
<a id="send_invoice" href="javascript:void(0);"><?=$this->lang->line('sales_send_invoice')?></a>
<?php else: ?>
<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control input-sm'));?>
<?php echo form_input(array('name'=>'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class'=>'form-control input-sm'));?>
<?php endif; ?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('sales_customer'), 'customer', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('sales_customer'), 'customer', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id', 'class' => 'form-control input-sm'));?>
<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id', 'class'=>'form-control input-sm'));?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('sales_employee'), 'employee', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('sales_employee'), 'employee', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_dropdown('employee_id', $employees, $sale_info['employee_id'], 'id="employee_id" class="form-control"');?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('sales_comment'), 'comment', array('class' => 'control-label col-xs-3')); ?>
<?php echo form_label($this->lang->line('sales_comment'), 'comment', array('class'=>'control-label col-xs-3')); ?>
<div class='col-xs-6'>
<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class' => 'form-control input-sm'));?>
<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class'=>'form-control input-sm'));?>
</div>
</div>
<?php echo form_close(); ?>