Updated Register styles

Updated config styles

Author: Shaun Kutch

.DS_Store

@@ -10,7 +10,7 @@ function __construct()
 
 	function index()
 	{
-		$this->_reload();
+		$this->load_register();
 	}
 
 	function item_search()
@@ -46,14 +46,14 @@ function select_customer()
 	{
 		$customer_id = $this->input->post("customer");
 		$this->sale_lib->set_customer($customer_id);
-		$this->_reload();
+		$this->load_register_content();
 	}
 
 	function change_mode()
 	{
 		$mode = $this->input->post("mode");
 		$this->sale_lib->set_mode($mode);
-		$this->_reload();
+		$this->load_register_content();
 	}
 
 	//Alain Multiple Payments
@@ -69,7 +69,7 @@ function add_payment()
 			else
 				$data['error']=$this->lang->line('sales_must_enter_numeric');
 
- 			$this->_reload($data);
+ 			$this->load_register_content($data);
  			return;
 		}
 
@@ -83,7 +83,7 @@ function add_payment()
 			if ( $cur_giftcard_value <= 0 )
 			{
 				$data['error']='Giftcard balance is '.to_currency( $this->Giftcard->get_giftcard_value( $this->input->post('amount_tendered') ) ).' !';
-				$this->_reload($data);
+				$this->load_register_content($data);
 				return;
 			}
 			elseif ( ( $this->Giftcard->get_giftcard_value( $this->input->post('amount_tendered') ) - $this->sale_lib->get_total() ) > 0 )
@@ -102,14 +102,14 @@ function add_payment()
 			$data['error']='Unable to Add Payment! Please try again!';
 		}
 
-		$this->_reload($data);
+		$this->load_register_content($data);
 	}
 
 	//Alain Multiple Payments
 	function delete_payment($payment_id)
 	{
 		$this->sale_lib->delete_payment($payment_id);
-		$this->_reload();
+		$this->load_register_content();
 	}
 
 	function add()
@@ -136,7 +136,7 @@ function add()
 		{
 			$data['warning'] = $this->lang->line('sales_quantity_less_than_zero');
 		}
-		$this->_reload($data);
+		$this->load_register_content($data);
 	}
 
 	function edit_item($line)
@@ -168,19 +168,19 @@ function edit_item($line)
 		}
 
 
-		$this->_reload($data);
+		$this->load_register_content($data);
 	}
 
 	function delete_item($item_number)
 	{
 		$this->sale_lib->delete_item($item_number);
-		$this->_reload();
+		$this->load_register_content();
 	}
 
 	function delete_customer()
 	{
 		$this->sale_lib->delete_customer();
-		$this->_reload();
+		$this->load_register_content();
 	}
 
 	function complete()
@@ -219,7 +219,7 @@ function complete()
 		if ( ( $this->sale_lib->get_mode() == 'sale' ) && ( ( to_currency_no_money( $data['total'] ) - $total_payments ) > 1e-6 ) )
 		{
 			$data['error'] = $this->lang->line('sales_payment_not_cover_total');
-			$this->_reload($data);
+			$this->load_register_content($data);
 			return false;
 		}
 
@@ -318,8 +318,8 @@ function save($sale_id)
 			echo json_encode(array('success'=>false,'message'=>$this->lang->line('sales_unsuccessfully_updated')));
 		}
 	}
-	
-	function _reload($data=array())
+
+	function prepare_data()
 	{
 		$person_info = $this->Employee->get_logged_in_employee_info();
 		$data['cart']=$this->sale_lib->get_cart();
@@ -347,13 +347,26 @@ function _reload($data=array())
 			$info=$this->Customer->get_info($customer_id);
 			$data['customer']=$info->first_name.' '.$info->last_name;
 		}
+
+		return $data;
+	}
+	
+	function load_register($data=array())
+	{
+		$data = $this->prepare_data();
 		$this->load->view("sales/register",$data);
 	}
 
+	function load_register_content($data=array())
+	{
+		$data = $this->prepare_data();
+		$this->load->view("sales/register_content",$data);
+	}
+
     function cancel_sale()
     {
     	$this->sale_lib->clear_all();
-    	$this->_reload();
+    	$this->load_register_content();
 
     }
 
@@ -396,7 +409,7 @@ function suspend()
 			$data['error_message'] = $this->lang->line('sales_transaction_failed');
 		}
 		$this->sale_lib->clear_all();
-		$this->_reload(array('success' => $this->lang->line('sales_successfully_suspended_sale')));
+		$this->load_register_content(array('success' => $this->lang->line('sales_successfully_suspended_sale')));
 	}
 
 	function suspended()
@@ -412,7 +425,7 @@ function unsuspend()
 		$this->sale_lib->clear_all();
 		$this->sale_lib->copy_entire_suspended_sale($sale_id);
 		$this->Sale_suspended->delete($sale_id);
-    	$this->_reload();
+    	$this->load_register();
 	}
 }
 ?>

application/.DS_Store

@@ -19,7 +19,7 @@
 $lang['module_items']='Items';
 $lang['module_items_desc']='Add, Update, Delete, and Search items';
 
-$lang['module_config']='Store Config';
+$lang['module_config']='Settings';
 $lang['module_config_desc']='Change the store\'s configuration';
 
 $lang['module_receivings']='Receivings';

application/controllers/sales.php

@@ -7,6 +7,8 @@
 $lang['sales_item_name'] = 'Item Name';
 $lang['sales_item_number'] = 'Item #';
 $lang['sales_new_customer'] = 'Add New Customer';
+$lang['select_customer'] = 'Select Customer';
+$lang['remove_customer'] = 'Remove Customer';
 $lang['sales_customer'] = 'Customer';
 $lang['sales_no_items_in_cart']='There are no items in the cart';
 $lang['sales_total']='Total';
@@ -75,4 +77,7 @@
 $lang['sales_unsuspend_and_delete'] = 'Unsuspend and Delete';
 $lang['sales_unsuspend'] = 'Unsuspend';
 $lang['sales_successfully_suspended_sale'] = 'Your sale has been successfully suspended';
+$lang['payments'] = 'Payments';
+$lang['totals'] = 'Totals';
+$lang['items'] = 'Items';
 ?>

application/language/english/module_lang.php

@@ -50,7 +50,8 @@ function save($key,$value)
 	function batch_save($data)
 	{
 		$success=true;
-		
+		var_dump($data);
+		exit;
 		//Run these queries as a transaction, we want to make sure we do all or nothing
 		$this->db->trans_start();
 		foreach($data as $key=>$value)