Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI

application/controllers/Sales.php

@@ -674,7 +674,7 @@ class Sales extends Secure_area
 
 		$sale_data = array(
 			'sale_time' => $start_date_formatter->format('Y-m-d H:i:s'),
-			'customer_id' => $this->input->post('customer_id'),
+			'customer_id' => $this->input->post('customer_id') != '' ? $this->input->post('customer_id') : null,
 			'employee_id' => $this->input->post('employee_id'),
 			'comment' => $this->input->post('comment'),
 			'invoice_number' => $this->input->post('invoice_number')

application/helpers/table_helper.php

@@ -50,7 +50,7 @@ function get_sales_manage_table_data_rows($sales, $controller)
 
 	if($table_data_rows == '')
 	{
-		$table_data_rows .= "<tr><td colspan='10'><div class='alert alert-dismissible alert-warning'>".$CI->lang->line('sales_no_sales_to_display')."</div></td></tr>";
+		$table_data_rows .= "<tr><td colspan='10'><div class='alert alert-dismissible alert-info'>".$CI->lang->line('sales_no_sales_to_display')."</div></td></tr>";
 	}
 	else
 	{

application/views/sales/form.php

@@ -3,7 +3,7 @@
 	<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')); ?>
+		<?php echo form_open("sales/save/".$sale_info['sale_id'], array('id'=>'sales_edit_form')); ?>
 			<legend><?php echo $this->lang->line("sales_basic_information"); ?></legend>
 			
 			<div class="field_row clearfix">
@@ -50,19 +50,19 @@
 			<div class="field_row clearfix">
 				<?php echo form_label($this->lang->line('sales_comment').':', 'comment'); ?>
 				<div class='form_field'>
-					<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
+					<?php echo form_textarea(array('name'=>'comment', 'value'=>$sale_info['comment'], 'rows'=>'4', 'cols'=>'23', 'id'=>'comment'));?>
 				</div>
 			</div>
 			
 			<?php echo form_submit(array(
-				'name'=>'submit',
-				'value'=>$this->lang->line('common_submit'),
-				'class'=> 'btn btn-primary btn-sm pull-right')
+				'name' => 'submit',
+				'value' => $this->lang->line('common_submit'),
+				'class' => 'btn btn-primary btn-sm pull-right')
 			);
 			?>
 		<?php echo form_close(); ?>
 		
-		<?php echo form_open("sales/delete/".$sale_info['sale_id'],array('id'=>'sales_delete_form')); ?>
+		<?php echo form_open("sales/delete/".$sale_info['sale_id'], array('id'=>'sales_delete_form')); ?>
 			<?php echo form_hidden('sale_id', $sale_info['sale_id']);?>
 			<?php echo form_submit(array(
 				'name'=>'submit',

application/views/sales/register.php

@@ -390,7 +390,7 @@ if (isset($success))
 						</tr>
 					</table>
 					
-					<div class='btn btn-sm btn-primary' id='add_payment_button' style='float: left; margin-top: 5px;'>
+					<div class='btn btn-sm btn-success' id='add_payment_button' style='float: left; margin-top: 5px;'>
 						<span><?php echo $this->lang->line('sales_add_payment'); ?></span>
 					</div>
 				<?php echo form_close(); ?>
@@ -620,4 +620,5 @@ function check_payment_type_gifcard()
 }
 
 </script>
+
 <?php $this->load->view("partial/footer"); ?>