From 8bcd2a69dc39606ab73d12d23739e7a6a482213f Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Tue, 14 Jul 2015 16:59:00 +0100 Subject: [PATCH] Add better locale config support (pull request #93) I've added in this commit the following: - the means to configure date and time format - date and time is shown with the selected formats - a locale tab in the configuration page - changed location tab to be stock tab and the same for the file names - translation strings (only English) for the case NOTE 1: Not related to Locale support but I removed an extra
from general_config.php NOTE 2: There is no rules in the submit checks of Locale. Probably this is something to iron out a bit NOTE 3: It would be probably nice to add a button in the Locale tab to regenerate all the translation files in case somebody updates the translations .csv Fixed Local config - Removed text in Red as really not mandatory configuration - Added time format in 24h and 12h Updated General Config tab - reorganised the layout grouping things like company info, taxes and invoice formating - increased the limit of max lines per page to 1000 because 50 is too little. People can do what they want with up to 1000 --- application/controllers/config.php | 26 +- application/controllers/receivings.php | 4 +- application/controllers/reports.php | 48 +-- application/controllers/sales.php | 10 +- application/helpers/table_helper.php | 2 +- application/language/en/config_lang.php | 3 + application/language/es/config_lang.php | 3 + application/language/fr/config_lang.php | 3 + application/language/id/config_lang.php | 3 + application/language/nl-BE/config_lang.php | 3 + application/language/ru/config_lang.php | 3 + application/language/th/config_lang.php | 3 + application/language/tr/config_lang.php | 3 + application/language/zh/config_lang.php | 3 + application/views/configs/general_config.php | 283 ++++-------------- application/views/configs/locale_config.php | 247 +++++++++++++++ application/views/configs/manage.php | 10 +- .../{location_config.php => stock_config.php} | 0 application/views/partial/header.php | 4 +- application/views/sales/suspended.php | 2 +- test/giftcard_numbering.js | 4 + translations/config_lang.csv | 3 + 22 files changed, 401 insertions(+), 269 deletions(-) create mode 100644 application/views/configs/locale_config.php rename application/views/configs/{location_config.php => stock_config.php} (100%) diff --git a/application/controllers/config.php b/application/controllers/config.php index 19e0cb00a..0d44ec21e 100644 --- a/application/controllers/config.php +++ b/application/controllers/config.php @@ -33,17 +33,11 @@ class Config extends Secure_area 'default_tax_1_name'=>$this->input->post('default_tax_1_name'), 'default_tax_2_rate'=>$this->input->post('default_tax_2_rate'), 'default_tax_2_name'=>$this->input->post('default_tax_2_name'), - 'currency_symbol'=>$this->input->post('currency_symbol'), - 'currency_side'=>$this->input->post('currency_side'),/**GARRISON ADDED 4/20/2013**/ 'return_policy'=>$this->input->post('return_policy'), - 'language'=>$this->input->post('language'), - 'timezone'=>$this->input->post('timezone'), 'tax_included'=>$this->input->post('tax_included'), 'recv_invoice_format'=>$this->input->post('recv_invoice_format'), 'sales_invoice_format'=>$this->input->post('sales_invoice_format'), 'receiving_calculate_average_price'=>$this->input->post('receiving_calculate_average_price'), - 'thousands_separator'=>$this->input->post('thousands_separator'), - 'decimal_point'=>$this->input->post('decimal_point'), 'lines_per_page'=>$this->input->post('lines_per_page'), 'default_sales_discount'=>$this->input->post('default_sales_discount'), 'custom1_name'=>$this->input->post('custom1_name'),/**GARRISON ADDED 4/20/2013**/ @@ -71,6 +65,25 @@ class Config extends Secure_area $this->_remove_duplicate_cookies(); } + function save_locale() + { + $batch_save_data=array( + 'currency_symbol'=>$this->input->post('currency_symbol'), + 'currency_side'=>$this->input->post('currency_side'),/**GARRISON ADDED 4/20/2013**/ + 'language'=>$this->input->post('language'), + 'timezone'=>$this->input->post('timezone'), + 'dateformat'=>$this->input->post('dateformat'), + 'timeformat'=>$this->input->post('timeformat'), + 'thousands_separator'=>$this->input->post('thousands_separator'), + 'decimal_point'=>$this->input->post('decimal_point'), + ); + + $result = $this->Appconfig->batch_save( $batch_save_data ); + $success = $result ? true : false; + echo json_encode(array('success'=>$success, 'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully'))); + $this->_remove_duplicate_cookies(); + } + function stock_locations() { $stock_locations = $this->Stock_locations->get_all()->result_array(); @@ -138,7 +151,6 @@ class Config extends Secure_area $result = $this->Appconfig->batch_save( $batch_save_data ); $success = $result ? true : false; echo json_encode(array('success'=>$success, 'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully'))); - } function save_receipt() diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php index ac52abead..c2fc99747 100644 --- a/application/controllers/receivings.php +++ b/application/controllers/receivings.php @@ -181,7 +181,7 @@ class Receivings extends Secure_area $data['cart']=$this->receiving_lib->get_cart(); $data['total']=$this->receiving_lib->get_total(); $data['receipt_title']=$this->lang->line('recvs_receipt'); - $data['transaction_time']= date('m/d/Y h:i:s a'); + $data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat')); $data['mode']=$this->receiving_lib->get_mode(); $data['show_stock_locations']=$this->Stock_locations->show_locations('receivings'); $supplier_id=$this->receiving_lib->get_supplier(); @@ -306,7 +306,7 @@ class Receivings extends Secure_area $data['total']=$this->receiving_lib->get_total(); $data['mode']=$this->receiving_lib->get_mode(); $data['receipt_title']=$this->lang->line('recvs_receipt'); - $data['transaction_time']= date('m/d/Y h:i:s a', strtotime($receiving_info['receiving_time'])); + $data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])); $data['show_stock_locations']=$this->Stock_locations->show_locations('receivings'); $supplier_id=$this->receiving_lib->get_supplier(); $emp_info=$this->Employee->get_info($receiving_info['employee_id']); diff --git a/application/controllers/reports.php b/application/controllers/reports.php index 5d4f15c74..462ec1576 100644 --- a/application/controllers/reports.php +++ b/application/controllers/reports.php @@ -123,7 +123,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_sales_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -148,7 +148,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_categories_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -173,7 +173,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_customers_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -198,7 +198,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_suppliers_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -223,7 +223,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_items_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -248,7 +248,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_employees_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -273,7 +273,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_taxes_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -298,7 +298,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_discounts_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -322,7 +322,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_payments_summary_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "data" => $tabular_data, "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)), @@ -370,7 +370,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_sales_summary_report'), "data_file" => site_url("reports/graphical_summary_sales_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -387,7 +387,7 @@ class Reports extends Secure_area $graph_data = array(); foreach($report_data as $row) { - $graph_data[date('m/d/Y', strtotime($row['sale_date']))]= $row['total']; + $graph_data[date($this->config->item('dateformat'), strtotime($row['sale_date']))]= $row['total']; } $data = array( @@ -410,7 +410,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_items_summary_report'), "data_file" => site_url("reports/graphical_summary_items_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -449,7 +449,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_categories_summary_report'), "data_file" => site_url("reports/graphical_summary_categories_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -485,7 +485,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_suppliers_summary_report'), "data_file" => site_url("reports/graphical_summary_suppliers_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -521,7 +521,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_employees_summary_report'), "data_file" => site_url("reports/graphical_summary_employees_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -557,7 +557,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_taxes_summary_report'), "data_file" => site_url("reports/graphical_summary_taxes_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -594,7 +594,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_customers_summary_report'), "data_file" => site_url("reports/graphical_summary_customers_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -633,7 +633,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_discounts_summary_report'), "data_file" => site_url("reports/graphical_summary_discounts_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -671,7 +671,7 @@ class Reports extends Secure_area $data = array( "title" => $this->lang->line('reports_payments_summary_report'), "data_file" => site_url("reports/graphical_summary_payments_graph/$start_date/$end_date/$sale_type"), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)) ); @@ -738,7 +738,7 @@ class Reports extends Secure_area $customer_info = $this->Customer->get_info($customer_id); $data = array( "title" => $customer_info->first_name .' '. $customer_info->last_name.' '.$this->lang->line('reports_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "summary_data" => $summary_data, "details_data" => $details_data, @@ -788,7 +788,7 @@ class Reports extends Secure_area $employee_info = $this->Employee->get_info($employee_id); $data = array( "title" => $employee_info->first_name .' '. $employee_info->last_name.' '.$this->lang->line('reports_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "summary_data" => $summary_data, "details_data" => $details_data, @@ -837,7 +837,7 @@ class Reports extends Secure_area $data = array( "title" => $discount. '% '.$this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $headers, "summary_data" => $summary_data, "details_data" => $details_data, @@ -880,7 +880,7 @@ class Reports extends Secure_area $data = array( "title" =>$this->lang->line('reports_detailed_sales_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "editable" => "sales", "summary_data" => $summary_data, @@ -923,7 +923,7 @@ class Reports extends Secure_area $data = array( "title" =>$this->lang->line('reports_detailed_receivings_report'), - "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)), "headers" => $model->getDataColumns(), "header_width" => intval(100 / count($headers['summary'])), "editable" => "receivings", diff --git a/application/controllers/sales.php b/application/controllers/sales.php index 7274652ae..04c221fae 100644 --- a/application/controllers/sales.php +++ b/application/controllers/sales.php @@ -286,8 +286,8 @@ class Sales extends Secure_area $data['total']=$this->sale_lib->get_total(); $data['discount']=$this->sale_lib->get_discount(); $data['receipt_title']=$this->lang->line('sales_receipt'); - $data['transaction_time']= date('m/d/Y h:i:s a'); - $data['transaction_date']= date('d/m/Y', strtotime($data['transaction_time'])); + $data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat')); + $data['transaction_date']= date($this->config->item('dateformat'), strtotime($data['transaction_time'])); $data['show_stock_locations']=$this->Stock_locations->show_locations('sales'); $customer_id=$this->sale_lib->get_customer(); $employee_id=$this->Employee->get_logged_in_employee_info()->person_id; @@ -499,9 +499,9 @@ class Sales extends Secure_area $data['total']=$this->sale_lib->get_total(); $data['discount']=$this->sale_lib->get_discount(); $data['receipt_title']=$this->lang->line('sales_receipt'); - $data['transaction_time']= date('d/m/Y H:i:s', strtotime($sale_info['sale_time'])); + $data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat'), strtotime($sale_info['sale_time'])); + $data['transaction_date']= date($this->config->item('dateformat'), strtotime($data['transaction_time'])); $data['show_stock_locations']=$this->Stock_locations->show_locations('sales'); - $data['transaction_date']= date('d/m/Y', strtotime($sale_info['sale_time'])); $customer_id=$this->sale_lib->get_customer(); $employee_id=$this->Employee->get_logged_in_employee_info()->person_id; $emp_info=$this->Employee->get_info($employee_id); @@ -704,7 +704,7 @@ class Sales extends Secure_area $data['taxes']=$this->sale_lib->get_taxes(); $data['total']=$this->sale_lib->get_total(); $data['receipt_title']=$this->lang->line('sales_receipt'); - $data['transaction_time']= date('m/d/Y h:i:s a'); + $data['transaction_time']= date($this->config->item('dateformat').' '.$this->config->item('timeformat')); $customer_id=$this->sale_lib->get_customer(); $employee_id=$this->Employee->get_logged_in_employee_info()->person_id; $comment = $this->input->post('comment'); diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index d4468c8df..8204570f8 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -54,7 +54,7 @@ function get_sale_data_row($sale,$controller) $table_data_row=''; $table_data_row.=''; - $table_data_row.=''.date('d/m/Y H:i' , strtotime($sale[ 'sale_time' ])).''; + $table_data_row.=''.date($CI->config->item('dateformat').' '.$CI->config->item('timeformat'), strtotime($sale[ 'sale_time' ])).''; $table_data_row.=''.character_limiter( $sale[ 'last_name' ] . " " . $sale[ 'first_name' ] ,25).''; $table_data_row.=''.to_currency( $sale[ 'amount_tendered' ] ).''; $table_data_row.=''.to_currency( $sale[ 'amount_due' ] ).''; diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index 3646560cc..63b5c8238 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "Timezone"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "Website"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index 008253e54..61a1a468c 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Separador de miles"; $lang["config_timezone"] = "Zona Horaria"; $lang["config_use_invoice_template"] = "Use plantilla de factura"; $lang["config_website"] = "Sitio Web"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index adacffd8f..f8c9549f6 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "Fuseau Horaire"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "Site-web"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php index 228bf26ba..7809a905a 100644 --- a/application/language/id/config_lang.php +++ b/application/language/id/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Pemisah Ribuan"; $lang["config_timezone"] = "Zona Waktu"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "Situs Perusahaan"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php index ddc08dd16..8ea68a158 100755 --- a/application/language/nl-BE/config_lang.php +++ b/application/language/nl-BE/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "Tijdzone"; $lang["config_use_invoice_template"] = "Gebruik template voor facturen"; $lang["config_website"] = "Website"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php index f04d01c8c..a864ecddb 100644 --- a/application/language/ru/config_lang.php +++ b/application/language/ru/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "Часовой пояс"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "Веб-сайт"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php index 077666c78..2174c002c 100644 --- a/application/language/th/config_lang.php +++ b/application/language/th/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "Timezone"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "เว็บไซต์"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php index af78fe53d..5461becb2 100644 --- a/application/language/tr/config_lang.php +++ b/application/language/tr/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "Saat Dilimi"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "Website"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php index bad97aaba..bf69c26b5 100755 --- a/application/language/zh/config_lang.php +++ b/application/language/zh/config_lang.php @@ -115,3 +115,6 @@ $lang["config_thousands_separator"] = "Thousands Separator"; $lang["config_timezone"] = "時區"; $lang["config_use_invoice_template"] = "Use invoice template"; $lang["config_website"] = "網站"; +$lang["config_locale_configuration"] = "Localisation Configuration"; +$lang["config_locale_info"] = "Localisation Configuration Information"; +$lang["config_datetimeformat"] = "Date and Time format"; diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index 2115e7a27..15ee4bd43 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -38,6 +38,26 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo
+
+lang->line('config_website').':', 'website',array('class'=>'wide')); ?> +
+ 'website', + 'id'=>'website', + 'value'=>$this->config->item('website')));?> +
+
+ +
+lang->line('common_email').':', 'email',array('class'=>'wide')); ?> +
+ 'email', + 'id'=>'email', + 'value'=>$this->config->item('email')));?> +
+
+
lang->line('config_phone').':', 'phone',array('class'=>'wide required')); ?>
@@ -48,6 +68,28 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo
+
+lang->line('config_fax').':', 'fax',array('class'=>'wide')); ?> +
+ 'fax', + 'id'=>'fax', + 'value'=>$this->config->item('fax')));?> +
+
+ +
+lang->line('common_return_policy').':', 'return_policy',array('class'=>'wide required')); ?> +
+ 'return_policy', + 'id'=>'return_policy', + 'rows'=>'4', + 'cols'=>'17', + 'value'=>$this->config->item('return_policy')));?> +
+
+
lang->line('config_default_tax_rate_1').':', 'default_tax_1_rate',array('class'=>'wide required')); ?>
@@ -81,46 +123,28 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo 'value'=>$this->config->item('default_tax_2_rate')));?>%
- -
- lang->line('config_currency_symbol').':', 'currency_symbol',array('class'=>'wide')); ?> -
- 'currency_symbol', - 'id'=>'currency_symbol', - 'value'=>$this->config->item('currency_symbol')));?> -
- lang->line('config_currency_side').':', 'currency_side',array('class'=>''));?> +
+lang->line('config_tax_included').':', 'tax_included',array('class'=>'wide')); ?>
- 'currency_side', - 'id'=>'currency_side', - 'value'=>'currency_side', - 'checked'=>$this->config->item('currency_side')));?> + 'tax_included', + 'id'=>'tax_included', + 'value'=>'tax_included', + 'checked'=>$this->config->item('tax_included')));?>
- -
-lang->line('config_number_format').':', 'number_format',array('class'=>'wide required')); ?> +
+lang->line('config_default_sales_discount').':', 'default_sales_discount',array('class'=>'wide required')); ?>
- lang->line('config_thousands_separator'); ?> - ', (comma)', - '.' => '. (dot)', - '' => '(none)' - ), - $this->config->item('thousands_separator')); - ?> - lang->line('config_decimal_point'); ?> - '. (dot)', - ',' => ', (comma)' - ), - $this->config->item('decimal_point')); - ?> + 'default_sales_discount', + 'id'=>'default_sales_discount', + 'type'=>'number', + 'min'=>0, + 'max'=>100, + 'value'=>$this->config->item('default_sales_discount')));?>
@@ -144,170 +168,6 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo
-
-
-lang->line('common_email').':', 'email',array('class'=>'wide')); ?> -
- 'email', - 'id'=>'email', - 'value'=>$this->config->item('email')));?> -
-
- - -
-lang->line('config_fax').':', 'fax',array('class'=>'wide')); ?> -
- 'fax', - 'id'=>'fax', - 'value'=>$this->config->item('fax')));?> -
-
- -
-lang->line('config_website').':', 'website',array('class'=>'wide')); ?> -
- 'website', - 'id'=>'website', - 'value'=>$this->config->item('website')));?> -
-
- -
-lang->line('common_return_policy').':', 'return_policy',array('class'=>'wide required')); ?> -
- 'return_policy', - 'id'=>'return_policy', - 'rows'=>'4', - 'cols'=>'17', - 'value'=>$this->config->item('return_policy')));?> -
-
- -
- lang->line('config_language').':', 'language',array('class'=>'wide required')); ?> -
- 'English', - 'es' => 'Spanish', - 'ru' => 'Russian', - 'nl-BE' => 'Dutch', - 'zh' => 'Chinese', - 'id' => 'Indonesian', - 'fr' => 'French', - 'th' => 'Thai', - 'tr' => 'Turkish' - ), - $this->config->item('language')); - ?> -
-
- -
-lang->line('config_timezone').':', 'timezone',array('class'=>'wide required')); ?> -
- '(GMT-11:00) Midway Island, Samoa', - 'America/Adak'=>'(GMT-10:00) Hawaii-Aleutian', - 'Etc/GMT+10'=>'(GMT-10:00) Hawaii', - 'Pacific/Marquesas'=>'(GMT-09:30) Marquesas Islands', - 'Pacific/Gambier'=>'(GMT-09:00) Gambier Islands', - 'America/Anchorage'=>'(GMT-09:00) Alaska', - 'America/Ensenada'=>'(GMT-08:00) Tijuana, Baja California', - 'Etc/GMT+8'=>'(GMT-08:00) Pitcairn Islands', - 'America/Los_Angeles'=>'(GMT-08:00) Pacific Time (US & Canada)', - 'America/Denver'=>'(GMT-07:00) Mountain Time (US & Canada)', - 'America/Chihuahua'=>'(GMT-07:00) Chihuahua, La Paz, Mazatlan', - 'America/Dawson_Creek'=>'(GMT-07:00) Arizona', - 'America/Belize'=>'(GMT-06:00) Saskatchewan, Central America', - 'America/Cancun'=>'(GMT-06:00) Guadalajara, Mexico City, Monterrey', - 'Chile/EasterIsland'=>'(GMT-06:00) Easter Island', - 'America/Chicago'=>'(GMT-06:00) Central Time (US & Canada)', - 'America/New_York'=>'(GMT-05:00) Eastern Time (US & Canada)', - 'America/Havana'=>'(GMT-05:00) Cuba', - 'America/Bogota'=>'(GMT-05:00) Bogota, Lima, Quito, Rio Branco', - 'America/Caracas'=>'(GMT-04:30) Caracas', - 'America/Santiago'=>'(GMT-04:00) Santiago', - 'America/La_Paz'=>'(GMT-04:00) La Paz', - 'Atlantic/Stanley'=>'(GMT-04:00) Faukland Islands', - 'America/Campo_Grande'=>'(GMT-04:00) Brazil', - 'America/Goose_Bay'=>'(GMT-04:00) Atlantic Time (Goose Bay)', - 'America/Glace_Bay'=>'(GMT-04:00) Atlantic Time (Canada)', - 'America/St_Johns'=>'(GMT-03:30) Newfoundland', - 'America/Araguaina'=>'(GMT-03:00) UTC-3', - 'America/Montevideo'=>'(GMT-03:00) Montevideo', - 'America/Miquelon'=>'(GMT-03:00) Miquelon, St. Pierre', - 'America/Godthab'=>'(GMT-03:00) Greenland', - 'America/Argentina/Buenos_Aires'=>'(GMT-03:00) Buenos Aires', - 'America/Sao_Paulo'=>'(GMT-03:00) Brasilia', - 'America/Noronha'=>'(GMT-02:00) Mid-Atlantic', - 'Atlantic/Cape_Verde'=>'(GMT-01:00) Cape Verde Is.', - 'Atlantic/Azores'=>'(GMT-01:00) Azores', - 'Europe/Belfast'=>'(GMT) Greenwich Mean Time : Belfast', - 'Europe/Dublin'=>'(GMT) Greenwich Mean Time : Dublin', - 'Europe/Lisbon'=>'(GMT) Greenwich Mean Time : Lisbon', - 'Europe/London'=>'(GMT) Greenwich Mean Time : London', - 'Africa/Abidjan'=>'(GMT) Monrovia, Reykjavik', - 'Europe/Amsterdam'=>'(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna', - 'Europe/Belgrade'=>'(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague', - 'Europe/Brussels'=>'(GMT+01:00) Brussels, Copenhagen, Madrid, Paris', - 'Africa/Algiers'=>'(GMT+01:00) West Central Africa', - 'Africa/Windhoek'=>'(GMT+01:00) Windhoek', - 'Asia/Beirut'=>'(GMT+02:00) Beirut', - 'Africa/Cairo'=>'(GMT+02:00) Cairo', - 'Asia/Gaza'=>'(GMT+02:00) Gaza', - 'Africa/Blantyre'=>'(GMT+02:00) Harare, Pretoria', - 'Asia/Jerusalem'=>'(GMT+02:00) Jerusalem', - 'Europe/Minsk'=>'(GMT+02:00) Minsk', - 'Asia/Damascus'=>'(GMT+02:00) Syria', - 'Europe/Moscow'=>'(GMT+03:00) Moscow, St. Petersburg, Volgograd', - 'Africa/Addis_Ababa'=>'(GMT+03:00) Nairobi', - 'Asia/Tehran'=>'(GMT+03:30) Tehran', - 'Asia/Dubai'=>'(GMT+04:00) Abu Dhabi, Muscat', - 'Asia/Yerevan'=>'(GMT+04:00) Yerevan', - 'Asia/Kabul'=>'(GMT+04:30) Kabul', - 'Asia/Baku'=>'(GMT+05:00) Baku',/*GARRISON ADDED 4/20/2013*/ - 'Asia/Yekaterinburg'=>'(GMT+05:00) Ekaterinburg', - 'Asia/Tashkent'=>'(GMT+05:00) Tashkent', - 'Asia/Kolkata'=>'(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi', - 'Asia/Katmandu'=>'(GMT+05:45) Kathmandu', - 'Asia/Dhaka'=>'(GMT+06:00) Astana, Dhaka', - 'Asia/Novosibirsk'=>'(GMT+06:00) Novosibirsk', - 'Asia/Rangoon'=>'(GMT+06:30) Yangon (Rangoon)', - 'Asia/Bangkok'=>'(GMT+07:00) Bangkok, Hanoi, Jakarta', - 'Asia/Krasnoyarsk'=>'(GMT+07:00) Krasnoyarsk', - 'Asia/Hong_Kong'=>'(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi', - 'Asia/Irkutsk'=>'(GMT+08:00) Irkutsk, Ulaan Bataar', - 'Australia/Perth'=>'(GMT+08:00) Perth', - 'Australia/Eucla'=>'(GMT+08:45) Eucla', - 'Asia/Tokyo'=>'(GMT+09:00) Osaka, Sapporo, Tokyo', - 'Asia/Seoul'=>'(GMT+09:00) Seoul', - 'Asia/Yakutsk'=>'(GMT+09:00) Yakutsk', - 'Australia/Adelaide'=>'(GMT+09:30) Adelaide', - 'Australia/Darwin'=>'(GMT+09:30) Darwin', - 'Australia/Brisbane'=>'(GMT+10:00) Brisbane', - 'Australia/Hobart'=>'(GMT+10:00) Hobart', - 'Asia/Vladivostok'=>'(GMT+10:00) Vladivostok', - 'Australia/Lord_Howe'=>'(GMT+10:30) Lord Howe Island', - 'Etc/GMT-11'=>'(GMT+11:00) Solomon Is., New Caledonia', - 'Asia/Magadan'=>'(GMT+11:00) Magadan', - 'Pacific/Norfolk'=>'(GMT+11:30) Norfolk Island', - 'Asia/Anadyr'=>'(GMT+12:00) Anadyr, Kamchatka', - 'Pacific/Auckland'=>'(GMT+12:00) Auckland, Wellington', - 'Etc/GMT-12'=>'(GMT+12:00) Fiji, Kamchatka, Marshall Is.', - 'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands', - 'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa', - 'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati' - ), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get()); - ?> -
-
-
lang->line('config_receiving_calculate_average_price').':', 'receiving_calculate_average_price',array('class'=>'wide')); ?>
@@ -319,17 +179,6 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo
-
-lang->line('config_tax_included').':', 'tax_included',array('class'=>'wide')); ?> -
- 'tax_included', - 'id'=>'tax_included', - 'value'=>'tax_included', - 'checked'=>$this->config->item('tax_included')));?> -
-
-
lang->line('config_lines_per_page').':', 'lines_per_page',array('class'=>'wide required')); ?>
@@ -338,24 +187,11 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo 'id'=>'lines_per_page', 'type'=>'number', 'min'=>10, - 'max'=>50, + 'max'=>1000, 'value'=>$this->config->item('lines_per_page')));?>
-
-lang->line('config_default_sales_discount').':', 'default_sales_discount',array('class'=>'wide required')); ?> -
- 'default_sales_discount', - 'id'=>'default_sales_discount', - 'type'=>'number', - 'min'=>0, - 'max'=>100, - 'value'=>$this->config->item('default_sales_discount')));?> -
-
-
lang->line('config_custom1').':', 'config_custom1',array('class'=>'wide')); ?>
@@ -463,7 +299,6 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo
- 'submit_form', diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php new file mode 100644 index 000000000..b0f06e9ef --- /dev/null +++ b/application/views/configs/locale_config.php @@ -0,0 +1,247 @@ +
lang->line('config_locale_configuration'); ?>
+'locale_config_form')); +?> +
+
+
lang->line('common_fields_required_message'); ?>
+
    +lang->line("config_locale_info"); ?> + + +
    + lang->line('config_currency_symbol').':', 'currency_symbol',array('class'=>'wide')); ?> +
    + 'currency_symbol', + 'id'=>'currency_symbol', + 'value'=>$this->config->item('currency_symbol')));?> +
    + + lang->line('config_currency_side').':', 'currency_side',array('class'=>''));?> +
    + 'currency_side', + 'id'=>'currency_side', + 'value'=>'currency_side', + 'checked'=>$this->config->item('currency_side')));?> +
    +
    + + +
    +lang->line('config_number_format').':', 'number_format',array('class'=>'wide')); ?> +
    + lang->line('config_thousands_separator'); ?> + ', (comma)', + '.' => '. (dot)', + '' => '(none)' + ), + $this->config->item('thousands_separator')); + ?> + lang->line('config_decimal_point'); ?> + '. (dot)', + ',' => ', (comma)' + ), + $this->config->item('decimal_point')); + ?> +
    +
    + +
    + lang->line('config_language').':', 'language',array('class'=>'wide')); ?> +
    + 'English', + 'es' => 'Spanish', + 'ru' => 'Russian', + 'nl-BE' => 'Dutch', + 'zh' => 'Chinese', + 'id' => 'Indonesian', + 'fr' => 'French', + 'th' => 'Thai', + 'tr' => 'Turkish' + ), + $this->config->item('language')); + ?> +
    +
    + +
    +lang->line('config_timezone').':', 'timezone',array('class'=>'wide')); ?> +
    + '(GMT-11:00) Midway Island, Samoa', + 'America/Adak'=>'(GMT-10:00) Hawaii-Aleutian', + 'Etc/GMT+10'=>'(GMT-10:00) Hawaii', + 'Pacific/Marquesas'=>'(GMT-09:30) Marquesas Islands', + 'Pacific/Gambier'=>'(GMT-09:00) Gambier Islands', + 'America/Anchorage'=>'(GMT-09:00) Alaska', + 'America/Ensenada'=>'(GMT-08:00) Tijuana, Baja California', + 'Etc/GMT+8'=>'(GMT-08:00) Pitcairn Islands', + 'America/Los_Angeles'=>'(GMT-08:00) Pacific Time (US & Canada)', + 'America/Denver'=>'(GMT-07:00) Mountain Time (US & Canada)', + 'America/Chihuahua'=>'(GMT-07:00) Chihuahua, La Paz, Mazatlan', + 'America/Dawson_Creek'=>'(GMT-07:00) Arizona', + 'America/Belize'=>'(GMT-06:00) Saskatchewan, Central America', + 'America/Cancun'=>'(GMT-06:00) Guadalajara, Mexico City, Monterrey', + 'Chile/EasterIsland'=>'(GMT-06:00) Easter Island', + 'America/Chicago'=>'(GMT-06:00) Central Time (US & Canada)', + 'America/New_York'=>'(GMT-05:00) Eastern Time (US & Canada)', + 'America/Havana'=>'(GMT-05:00) Cuba', + 'America/Bogota'=>'(GMT-05:00) Bogota, Lima, Quito, Rio Branco', + 'America/Caracas'=>'(GMT-04:30) Caracas', + 'America/Santiago'=>'(GMT-04:00) Santiago', + 'America/La_Paz'=>'(GMT-04:00) La Paz', + 'Atlantic/Stanley'=>'(GMT-04:00) Faukland Islands', + 'America/Campo_Grande'=>'(GMT-04:00) Brazil', + 'America/Goose_Bay'=>'(GMT-04:00) Atlantic Time (Goose Bay)', + 'America/Glace_Bay'=>'(GMT-04:00) Atlantic Time (Canada)', + 'America/St_Johns'=>'(GMT-03:30) Newfoundland', + 'America/Araguaina'=>'(GMT-03:00) UTC-3', + 'America/Montevideo'=>'(GMT-03:00) Montevideo', + 'America/Miquelon'=>'(GMT-03:00) Miquelon, St. Pierre', + 'America/Godthab'=>'(GMT-03:00) Greenland', + 'America/Argentina/Buenos_Aires'=>'(GMT-03:00) Buenos Aires', + 'America/Sao_Paulo'=>'(GMT-03:00) Brasilia', + 'America/Noronha'=>'(GMT-02:00) Mid-Atlantic', + 'Atlantic/Cape_Verde'=>'(GMT-01:00) Cape Verde Is.', + 'Atlantic/Azores'=>'(GMT-01:00) Azores', + 'Europe/Belfast'=>'(GMT) Greenwich Mean Time : Belfast', + 'Europe/Dublin'=>'(GMT) Greenwich Mean Time : Dublin', + 'Europe/Lisbon'=>'(GMT) Greenwich Mean Time : Lisbon', + 'Europe/London'=>'(GMT) Greenwich Mean Time : London', + 'Africa/Abidjan'=>'(GMT) Monrovia, Reykjavik', + 'Europe/Amsterdam'=>'(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna', + 'Europe/Belgrade'=>'(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague', + 'Europe/Brussels'=>'(GMT+01:00) Brussels, Copenhagen, Madrid, Paris', + 'Africa/Algiers'=>'(GMT+01:00) West Central Africa', + 'Africa/Windhoek'=>'(GMT+01:00) Windhoek', + 'Asia/Beirut'=>'(GMT+02:00) Beirut', + 'Africa/Cairo'=>'(GMT+02:00) Cairo', + 'Asia/Gaza'=>'(GMT+02:00) Gaza', + 'Africa/Blantyre'=>'(GMT+02:00) Harare, Pretoria', + 'Asia/Jerusalem'=>'(GMT+02:00) Jerusalem', + 'Europe/Minsk'=>'(GMT+02:00) Minsk', + 'Asia/Damascus'=>'(GMT+02:00) Syria', + 'Europe/Moscow'=>'(GMT+03:00) Moscow, St. Petersburg, Volgograd', + 'Africa/Addis_Ababa'=>'(GMT+03:00) Nairobi', + 'Asia/Tehran'=>'(GMT+03:30) Tehran', + 'Asia/Dubai'=>'(GMT+04:00) Abu Dhabi, Muscat', + 'Asia/Yerevan'=>'(GMT+04:00) Yerevan', + 'Asia/Kabul'=>'(GMT+04:30) Kabul', + 'Asia/Baku'=>'(GMT+05:00) Baku',/*GARRISON ADDED 4/20/2013*/ + 'Asia/Yekaterinburg'=>'(GMT+05:00) Ekaterinburg', + 'Asia/Tashkent'=>'(GMT+05:00) Tashkent', + 'Asia/Kolkata'=>'(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi', + 'Asia/Katmandu'=>'(GMT+05:45) Kathmandu', + 'Asia/Dhaka'=>'(GMT+06:00) Astana, Dhaka', + 'Asia/Novosibirsk'=>'(GMT+06:00) Novosibirsk', + 'Asia/Rangoon'=>'(GMT+06:30) Yangon (Rangoon)', + 'Asia/Bangkok'=>'(GMT+07:00) Bangkok, Hanoi, Jakarta', + 'Asia/Krasnoyarsk'=>'(GMT+07:00) Krasnoyarsk', + 'Asia/Hong_Kong'=>'(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi', + 'Asia/Irkutsk'=>'(GMT+08:00) Irkutsk, Ulaan Bataar', + 'Australia/Perth'=>'(GMT+08:00) Perth', + 'Australia/Eucla'=>'(GMT+08:45) Eucla', + 'Asia/Tokyo'=>'(GMT+09:00) Osaka, Sapporo, Tokyo', + 'Asia/Seoul'=>'(GMT+09:00) Seoul', + 'Asia/Yakutsk'=>'(GMT+09:00) Yakutsk', + 'Australia/Adelaide'=>'(GMT+09:30) Adelaide', + 'Australia/Darwin'=>'(GMT+09:30) Darwin', + 'Australia/Brisbane'=>'(GMT+10:00) Brisbane', + 'Australia/Hobart'=>'(GMT+10:00) Hobart', + 'Asia/Vladivostok'=>'(GMT+10:00) Vladivostok', + 'Australia/Lord_Howe'=>'(GMT+10:30) Lord Howe Island', + 'Etc/GMT-11'=>'(GMT+11:00) Solomon Is., New Caledonia', + 'Asia/Magadan'=>'(GMT+11:00) Magadan', + 'Pacific/Norfolk'=>'(GMT+11:30) Norfolk Island', + 'Asia/Anadyr'=>'(GMT+12:00) Anadyr, Kamchatka', + 'Pacific/Auckland'=>'(GMT+12:00) Auckland, Wellington', + 'Etc/GMT-12'=>'(GMT+12:00) Fiji, Kamchatka, Marshall Is.', + 'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands', + 'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa', + 'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati' + ), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get()); + ?> +
    +
    + +
    +lang->line('config_datetimeformat').':', 'datetimeformat', array('class'=>'wide')); ?> +
    + 'dd/mm/yyyy', + 'm/d/Y' => 'mm/dd/yyyy', + 'Y/m/d' => 'yyyy/mm/dd', + 'd/m/y' => 'dd/mm/yy', + 'm/d/y' => 'mm/dd/yy', + 'y/m/d' => 'yy/mm/dd'), + $this->config->item('dateformat')); + ?> +
    +
    + 'hh:mm:ss (24h)', + 'h:i:s a' => 'hh:mm:ss am/pm', + 'h:i:s' => 'hh:mm:ss (12h)'), + $this->config->item('timeformat')); + ?> +
    +
    + +'submit_form', + 'id'=>'submit_form', + 'value'=>$this->lang->line('common_submit'), + 'class'=>'submit_button float_right') +); +?> +
    +
    + + + \ No newline at end of file diff --git a/application/views/configs/manage.php b/application/views/configs/manage.php index 431d254f4..c43680472 100644 --- a/application/views/configs/manage.php +++ b/application/views/configs/manage.php @@ -7,8 +7,9 @@
    @@ -16,11 +17,14 @@
    load->view("configs/general_config"); ?>
    +
    + load->view("configs/locale_config"); ?> +
    load->view("configs/barcode_config"); ?>
    -
    - load->view("configs/location_config"); ?> +
    + load->view("configs/stock_config"); ?>
    load->view("configs/receipt_config"); ?> diff --git a/application/views/configs/location_config.php b/application/views/configs/stock_config.php similarity index 100% rename from application/views/configs/location_config.php rename to application/views/configs/stock_config.php diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 4413dcc58..4aa0c9ce5 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -85,11 +85,11 @@ html {
    - + \ No newline at end of file diff --git a/application/views/sales/suspended.php b/application/views/sales/suspended.php index d84667cfe..8fecd9c43 100644 --- a/application/views/sales/suspended.php +++ b/application/views/sales/suspended.php @@ -13,7 +13,7 @@ ?> - + config->item('dateformat'),strtotime($suspended_sale['sale_time']));?> >>>>>> 24c5a00... Sync with latest from jekkos/master assert.ok(value, "giftcard failed to be added properly!"); }).elementByCss(".big_button").click().waitForElementByName("value", 2000).type("100").elementById("submit").click() .waitForElementByXPath("//table/tbody/tr[td/text()='11']/td[4]").text().then(function (value) { diff --git a/translations/config_lang.csv b/translations/config_lang.csv index 698e9983c..db2c7ac93 100644 --- a/translations/config_lang.csv +++ b/translations/config_lang.csv @@ -114,3 +114,6 @@ config_thousands_separator,Thousands Separator,Separador de miles,Thousands Sepa config_timezone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,Timezone,Saat Dilimi,Zona Waktu config_use_invoice_template,Gebruik template voor facturen,Use plantilla de factura,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template config_website,Website,Sitio Web,Website,Site-web,網站,Веб-сайт,เว็บไซต์,Website,Situs Perusahaan +config_locale_configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration +config_locale_info,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information +config_datetimeformat,Date and Time format,Date and Time format,Date and Time format,Date and Time format,Date and Time format,Date and Time format,Date and Time format,Date and Time format,Date and Time format