diff --git a/application/controllers/sales.php b/application/controllers/sales.php index dd978389e..45da72a40 100644 --- a/application/controllers/sales.php +++ b/application/controllers/sales.php @@ -171,9 +171,9 @@ class Sales extends Secure_area $this->_reload(); } - function delete_customer() + function remove_customer() { - $this->sale_lib->delete_customer(); + $this->sale_lib->remove_customer(); $this->_reload(); } diff --git a/application/language/english/common_lang.php b/application/language/english/common_lang.php index d1840b1a3..3ddf42837 100644 --- a/application/language/english/common_lang.php +++ b/application/language/english/common_lang.php @@ -20,6 +20,7 @@ $lang['common_comments']='Comments'; $lang['common_edit']='edit'; $lang['common_search']='Search'; $lang['common_delete']='Delete'; +$lang['common_remove']='Remove'; $lang['common_view_recent_sales']='View Recent Sales'; $lang['common_you_are_using_ospos']='You are using Open Source Point Of Sale Version'; $lang['common_please_visit_my']='Please visit my'; diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index 44915180f..8f83a5147 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -349,7 +349,7 @@ class Sale_lib $sale_id = $pieces[1]; $this->empty_cart(); - $this->delete_customer(); + $this->remove_customer(); foreach($this->CI->Sale->get_sale_items($sale_id)->result() as $row) { @@ -373,7 +373,7 @@ class Sale_lib function copy_entire_sale($sale_id) { $this->empty_cart(); - $this->delete_customer(); + $this->remove_customer(); foreach($this->CI->Sale->get_sale_items($sale_id)->result() as $row) { @@ -390,7 +390,7 @@ class Sale_lib function copy_entire_suspended_sale($sale_id) { $this->empty_cart(); - $this->delete_customer(); + $this->remove_customer(); foreach($this->CI->Sale_suspended->get_sale_items($sale_id)->result() as $row) { @@ -416,7 +416,7 @@ class Sale_lib $this->CI->session->unset_userdata('cart'); } - function delete_customer() + function remove_customer() { $this->CI->session->unset_userdata('customer'); } @@ -433,7 +433,7 @@ class Sale_lib $this->clear_comment(); $this->clear_email_receipt(); $this->empty_payments(); - $this->delete_customer(); + $this->remove_customer(); } function get_taxes() diff --git a/application/views/sales/register.php b/application/views/sales/register.php index 73786e9c6..1853117e8 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -185,7 +185,7 @@ else if(isset($customer)) { echo $this->lang->line("sales_customer").': '.$customer. '
'; - echo anchor("sales/delete_customer",'['.$this->lang->line('common_delete').' '.$this->lang->line('customers_customer').']'); + echo anchor("sales/remove_customer",'['.$this->lang->line('common_remove').' '.$this->lang->line('customers_customer').']'); } else {