diff --git a/application/controllers/Config.php b/application/controllers/Config.php index 127f8134d..1132947d3 100644 --- a/application/controllers/Config.php +++ b/application/controllers/Config.php @@ -7,23 +7,23 @@ class Config extends Secure_Controller public function __construct() { parent::__construct('config'); - + $this->load->library('barcode_lib'); $this->load->library('sale_lib'); } - + /* - * This function loads all the licenses starting with the first one being OSPOS one - */ + * This function loads all the licenses starting with the first one being OSPOS one + */ private function _licenses() { $i = 0; $bower = FALSE; $composer = FALSE; $license = array(); - + $license[$i]['title'] = 'Open Source Point Of Sale ' . $this->config->item('application_version'); - + if(file_exists('license/LICENSE')) { $license[$i]['text'] = $this->xss_clean(file_get_contents('license/LICENSE', NULL, NULL, 0, 2000)); @@ -32,10 +32,10 @@ class Config extends Secure_Controller { $license[$i]['text'] = 'LICENSE file must be in OSPOS license directory. You are not allowed to use OSPOS application until the distribution copy of LICENSE file is present.'; } - + // read all the files in the dir license $dir = new DirectoryIterator('license'); - + foreach($dir as $fileinfo) { // license files must be in couples: .version (name & version) & .license (license text) @@ -44,13 +44,13 @@ class Config extends Secure_Controller if($fileinfo->getExtension() == 'version') { ++$i; - + $basename = 'license/' . $fileinfo->getBasename('.version'); - + $license[$i]['title'] = $this->xss_clean(file_get_contents($basename . '.version', NULL, NULL, 0, 100)); - + $license_text_file = $basename . '.license'; - + if(file_exists($license_text_file)) { $license[$i]['text'] = $this->xss_clean(file_get_contents($license_text_file , NULL, NULL, 0, 2000)); @@ -72,17 +72,17 @@ class Config extends Secure_Controller } } } - + // attach the licenses from the LICENSES file generated by bower if($composer) { ++$i; $license[$i]['title'] = 'Composer Libraries'; $license[$i]['text'] = ''; - + $file = file_get_contents('license/composer.LICENSES'); $array = json_decode($file, TRUE); - + foreach($array as $key => $val) { if(is_array($val) && $key == 'dependencies') @@ -92,18 +92,18 @@ class Config extends Secure_Controller if(is_array($val1)) { $license[$i]['text'] .= 'component: ' . $key1 . "\n"; - + foreach($val1 as $key2 => $val2) { if(is_array($val2)) { $license[$i]['text'] .= $key2 . ': '; - + foreach($val2 as $key3 => $val3) { $license[$i]['text'] .= $val3 . ' '; } - + $license[$i]['text'] .= "\n"; } else @@ -111,7 +111,7 @@ class Config extends Secure_Controller $license[$i]['text'] .= $key2 . ': ' . $val2 . "\n"; } } - + $license[$i]['text'] .= "\n"; } else @@ -121,37 +121,37 @@ class Config extends Secure_Controller } } } - + $license[$i]['text'] = $this->xss_clean($license[$i]['text']); } - + // attach the licenses from the LICENSES file generated by bower if($bower) { ++$i; $license[$i]['title'] = 'JS Plugins'; $license[$i]['text'] = ''; - + $file = file_get_contents('license/bower.LICENSES'); $array = json_decode($file, TRUE); - + foreach($array as $key => $val) { if(is_array($val)) { $license[$i]['text'] .= 'component: ' . $key . "\n"; - + foreach($val as $key1 => $val1) { if(is_array($val1)) { $license[$i]['text'] .= $key1 . ': '; - + foreach($val1 as $key2 => $val2) { $license[$i]['text'] .= $val2 . ' '; } - + $license[$i]['text'] .= "\n"; } else @@ -159,27 +159,27 @@ class Config extends Secure_Controller $license[$i]['text'] .= $key1 . ': ' . $val1 . "\n"; } } - + $license[$i]['text'] .= "\n"; } } - + $license[$i]['text'] = $this->xss_clean($license[$i]['text']); } - + return $license; } - + /* - * This function loads all the available themes in the dist/bootswatch directory - */ + * This function loads all the available themes in the dist/bootswatch directory + */ private function _themes() { $themes = array(); - + // read all themes in the dist folder $dir = new DirectoryIterator('dist/bootswatch'); - + foreach($dir as $dirinfo) { if($dirinfo->isDir() && !$dirinfo->isDot() && $dirinfo->getFileName() != 'fonts') @@ -188,12 +188,12 @@ class Config extends Secure_Controller $themes[$file] = $file; } } - + asort($themes); - + return $themes; } - + public function index() { $data['stock_locations'] = $this->Stock_location->get_all()->result_array(); @@ -209,14 +209,14 @@ class Config extends Secure_Controller $data['tax_category_options'] = $this->tax_lib->get_tax_category_options(); $data['tax_jurisdiction_options'] = $this->tax_lib->get_tax_jurisdiction_options(); $data['show_office_group'] = $this->Module->get_show_office_group(); - + $data = $this->xss_clean($data); - + // load all the license statements, they are already XSS cleaned in the private function $data['licenses'] = $this->_licenses(); // load all the themes, already XSS cleaned in the private function $data['themes'] = $this->_themes(); - + $data['mailchimp'] = array(); if($this->_check_encryption()) { @@ -228,18 +228,18 @@ class Config extends Secure_Controller $data['mailchimp']['api_key'] = ''; $data['mailchimp']['list_id'] = ''; } - + // load mailchimp lists associated to the given api key, already XSS cleaned in the private function $data['mailchimp']['lists'] = $this->_mailchimp(); - + $this->load->view("configs/manage", $data); } - + public function save_info() { $upload_success = $this->_handle_logo_upload(); $upload_data = $this->upload->data(); - + $batch_save_data = array( 'company' => $this->input->post('company'), 'address' => $this->input->post('address'), @@ -249,7 +249,7 @@ class Config extends Secure_Controller 'website' => $this->input->post('website'), 'return_policy' => $this->input->post('return_policy') ); - + if(!empty($upload_data['orig_name'])) { // XSS file image sanity check @@ -258,18 +258,18 @@ class Config extends Secure_Controller $batch_save_data['company_logo'] = $upload_data['raw_name'] . $upload_data['file_ext']; } } - + $result = $this->Appconfig->batch_save($batch_save_data); $success = $upload_success && $result ? TRUE : FALSE; $message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully'); $message = $upload_success ? $message : strip_tags($this->upload->display_errors()); - + echo json_encode(array( 'success' => $success, 'message' => $message )); } - + public function save_general() { $batch_save_data = array( @@ -294,18 +294,18 @@ class Config extends Secure_Controller 'multi_pack_enabled' => $this->input->post('multi_pack_enabled') != NULL, 'include_hsn' => $this->input->post('include_hsn') != NULL ); - + $this->Module->set_show_office_group($this->input->post('show_office_group') != NULL); - + $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') )); } - + public function ajax_check_number_locale() { $number_locale = $this->input->post('number_locale'); @@ -318,16 +318,16 @@ class Config extends Secure_Controller $fmt->setAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL, ''); } - $fmt->setTextAttribute(\NumberFormatter::CURRENCY_CODE, $currency_code); $fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $currency_symbol); + $fmt->setTextAttribute(\NumberFormatter::CURRENCY_CODE, $currency_code); $number_local_example = $fmt->format(1234567890.12300); echo json_encode(array( 'success' => $number_local_example != FALSE, 'number_locale_example' => $number_local_example, - 'currency_code' => $currency_code, 'currency_symbol' => $currency_symbol, + 'currency_code' => $currency_code, 'thousands_separator' => $fmt->getAttribute(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL) != '' )); } @@ -355,25 +355,25 @@ class Config extends Secure_Controller 'cash_rounding_code' => $this->input->post('cash_rounding_code'), 'financial_year' => $this->input->post('financial_year') ); - + $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') )); } - + public function save_email() { $password = ''; - + if($this->_check_encryption()) { $password = $this->encryption->encrypt($this->input->post('smtp_pass')); } - + $batch_save_data = array( 'protocol' => $this->input->post('protocol'), 'mailpath' => $this->input->post('mailpath'), @@ -384,50 +384,50 @@ class Config extends Secure_Controller 'smtp_timeout' => $this->input->post('smtp_timeout'), 'smtp_crypto' => $this->input->post('smtp_crypto') ); - + $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') )); } - + public function save_message() { $password = ''; - + if($this->_check_encryption()) { $password = $this->encryption->encrypt($this->input->post('msg_pwd')); } - + $batch_save_data = array( 'msg_msg' => $this->input->post('msg_msg'), 'msg_uid' => $this->input->post('msg_uid'), 'msg_pwd' => $password, 'msg_src' => $this->input->post('msg_src') ); - + $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 function fetches all the available lists from Mailchimp for the given API key - */ + * This function fetches all the available lists from Mailchimp for the given API key + */ private function _mailchimp($api_key = '') { $this->load->library('mailchimp_lib', array('api_key' => $api_key)); - + $result = array(); - + if(($lists = $this->mailchimp_lib->getLists()) !== FALSE) { if(is_array($lists) && !empty($lists['lists']) && is_array($lists['lists'])) @@ -439,87 +439,87 @@ class Config extends Secure_Controller } } } - + return $result; } - + /* - AJAX call from mailchimp config form to fetch the Mailchimp lists when a valid API key is inserted - */ + AJAX call from mailchimp config form to fetch the Mailchimp lists when a valid API key is inserted + */ public function ajax_check_mailchimp_api_key() { // load mailchimp lists associated to the given api key, already XSS cleaned in the private function $lists = $this->_mailchimp($this->input->post('mailchimp_api_key')); $success = count($lists) > 0 ? TRUE : FALSE; - + echo json_encode(array( 'success' => $success, 'message' => $this->lang->line('config_mailchimp_key_' . ($success ? '' : 'un') . 'successfully'), 'mailchimp_lists' => $lists )); } - + public function save_mailchimp() { $api_key = ''; $list_id = ''; - + if($this->_check_encryption()) { $api_key = $this->encryption->encrypt($this->input->post('mailchimp_api_key')); $list_id = $this->encryption->encrypt($this->input->post('mailchimp_list_id')); } - + $batch_save_data = array( 'mailchimp_api_key' => $api_key, 'mailchimp_list_id' => $list_id ); - + $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') )); } - + public function ajax_stock_locations() { $stock_locations = $this->Stock_location->get_all()->result_array(); - + $stock_locations = $this->xss_clean($stock_locations); - + $this->load->view('partial/stock_locations', array('stock_locations' => $stock_locations)); } - + public function ajax_dinner_tables() { $dinner_tables = $this->Dinner_table->get_all()->result_array(); - + $dinner_tables = $this->xss_clean($dinner_tables); - + $this->load->view('partial/dinner_tables', array('dinner_tables' => $dinner_tables)); } - + public function ajax_tax_categories() { $tax_categories = $this->Tax->get_all_tax_categories()->result_array(); - + $tax_categories = $this->xss_clean($tax_categories); - + $this->load->view('partial/tax_categories', array('tax_categories' => $tax_categories)); } - + public function ajax_customer_rewards() { $customer_rewards = $this->Customer_rewards->get_all()->result_array(); - + $customer_rewards = $this->xss_clean($customer_rewards); - + $this->load->view('partial/customer_rewards', array('customer_rewards' => $customer_rewards)); } - + private function _clear_session_state() { $this->sale_lib->clear_sale_location(); @@ -530,18 +530,18 @@ class Config extends Secure_Controller $this->receiving_lib->clear_stock_destination(); $this->receiving_lib->clear_all(); } - + public function save_locations() { $this->db->trans_start(); - + $not_to_delete = array(); foreach($this->input->post() as $key => $value) { if(strstr($key, 'stock_location')) { $location_id = preg_replace("/.*?_(\d+)$/", "$1", $key); - + // save or update $location_data = array('location_name' => $value); if($this->Stock_location->save($location_data, $location_id)) @@ -552,10 +552,10 @@ class Config extends Secure_Controller } } } - + // all locations not available in post will be deleted now $deleted_locations = $this->Stock_location->get_all()->result_array(); - + foreach($deleted_locations as $location => $location_data) { if(!in_array($location_data['location_id'], $not_to_delete)) @@ -563,25 +563,25 @@ class Config extends Secure_Controller $this->Stock_location->delete($location_data['location_id']); } } - + $this->db->trans_complete(); - + $success = $this->db->trans_status(); - + echo json_encode(array( 'success' => $success, 'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully') )); } - + public function save_tables() { $this->db->trans_start(); - + $dinner_table_enable = $this->input->post('dinner_table_enable') != NULL; - + $this->Appconfig->save('dinner_table_enable', $dinner_table_enable); - + if($dinner_table_enable) { $not_to_delete = array(); @@ -599,10 +599,10 @@ class Config extends Secure_Controller } } } - + // all tables not available in post will be deleted now $deleted_tables = $this->Dinner_table->get_all()->result_array(); - + foreach($deleted_tables as $dinner_tables => $table) { if(!in_array($table['dinner_table_id'], $not_to_delete)) @@ -611,21 +611,21 @@ class Config extends Secure_Controller } } } - + $this->db->trans_complete(); - + $success = $this->db->trans_status(); - + echo json_encode(array( 'success' => $success, 'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully') )); } - + public function save_tax() { $this->db->trans_start(); - + $batch_save_data = array( 'default_tax_1_rate' => parse_decimals($this->input->post('default_tax_1_rate')), 'default_tax_1_name' => $this->input->post('default_tax_1_name'), @@ -638,29 +638,29 @@ class Config extends Secure_Controller 'default_tax_jurisdiction' => $this->input->post('default_tax_jurisdiction'), 'tax_id' => $this->input->post('tax_id') ); - + $success = $this->Appconfig->batch_save($batch_save_data) ? TRUE : FALSE; - + $this->db->trans_complete(); - + $success &= $this->db->trans_status(); - + $message = $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully'); - + echo json_encode(array( 'success' => $success, 'message' => $message )); } - + public function save_rewards() { $this->db->trans_start(); - + $customer_reward_enable = $this->input->post('customer_reward_enable') != NULL; - + $this->Appconfig->save('customer_reward_enable', $customer_reward_enable); - + if($customer_reward_enable) { $not_to_delete = array(); @@ -679,7 +679,7 @@ class Config extends Secure_Controller $array_save[$customer_reward_id]['points_percent'] = $value; } } - + if(!empty($array_save)) { foreach($array_save as $key => $value) @@ -689,10 +689,10 @@ class Config extends Secure_Controller $this->Customer_rewards->save($package_data, $key); } } - + // all packages not available in post will be deleted now $deleted_packages = $this->Customer_rewards->get_all()->result_array(); - + foreach($deleted_packages as $customer_rewards => $reward_category) { if(!in_array($reward_category['package_id'], $not_to_delete)) @@ -701,17 +701,17 @@ class Config extends Secure_Controller } } } - + $this->db->trans_complete(); - + $success = $this->db->trans_status(); - + echo json_encode(array( 'success' => $success, 'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully') )); } - + public function save_barcode() { $batch_save_data = array( @@ -731,16 +731,16 @@ class Config extends Secure_Controller 'barcode_content' => $this->input->post('barcode_content'), 'barcode_formats' => json_encode($this->input->post('barcode_formats')) ); - + $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') )); } - + public function save_receipt() { $batch_save_data = array ( @@ -762,16 +762,16 @@ class Config extends Secure_Controller 'print_bottom_margin' => $this->input->post('print_bottom_margin'), 'print_right_margin' => $this->input->post('print_right_margin') ); - + $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') )); } - + public function save_invoice() { $batch_save_data = array ( @@ -791,10 +791,10 @@ class Config extends Secure_Controller 'last_used_work_order_number' => $this->input->post('last_used_work_order_number'), 'invoice_type' => $this->input->post('invoice_type') ); - + $result = $this->Appconfig->batch_save($batch_save_data); $success = $result ? TRUE : FALSE; - + // Update the register mode with the latest change so that if the user // switches immediately back to the register the mode reflects the change if($success == TRUE) @@ -808,64 +808,64 @@ class Config extends Secure_Controller $this->sale_lib->set_mode('sale'); } } - + echo json_encode(array( 'success' => $success, 'message' => $this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully') )); } - + public function remove_logo() { $result = $this->Appconfig->batch_save(array('company_logo' => '')); - + echo json_encode(array('success' => $result)); } - + private function _handle_logo_upload() { $this->load->helper('directory'); - + // load upload library $config = array('upload_path' => './uploads/', - 'allowed_types' => 'gif|jpg|png', - 'max_size' => '1024', - 'max_width' => '800', - 'max_height' => '680', - 'file_name' => 'company_logo'); + 'allowed_types' => 'gif|jpg|png', + 'max_size' => '1024', + 'max_width' => '800', + 'max_height' => '680', + 'file_name' => 'company_logo'); $this->load->library('upload', $config); $this->upload->do_upload('company_logo'); - + return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '

'.$this->lang->line('upload_no_file_selected').'

'); } - + private function _check_encryption() { $encryption_key = $this->config->item('encryption_key'); - + // check if the encryption_key config item is the default one if($encryption_key == '' || $encryption_key == 'YOUR KEY') { // Config path $config_path = APPPATH . 'config/config.php'; - + // Open the file $config = file_get_contents($config_path); - + // $key will be assigned a 32-byte (256-bit) hex-encoded random key $key = bin2hex($this->encryption->create_key(32)); - + // set the encryption key in the config item $this->config->set_item('encryption_key', $key); - + // replace the empty placeholder with a real randomly generated encryption key $config = preg_replace("/(.*encryption_key.*)('');/", "$1'$key';", $config); - + $result = FALSE; - + // Chmod the file @chmod($config_path, 0777); - + // Verify file permissions if(is_writable($config_path)) { @@ -873,33 +873,33 @@ class Config extends Secure_Controller $handle = @fopen($config_path, 'w+'); // Write the file $result = (fwrite($handle, $config) === FALSE) ? FALSE : TRUE; - + fclose($handle); } - + // Chmod the file @chmod($config_path, 0444); - + return $result; } - + return TRUE; } - + public function backup_db() { $employee_id = $this->Employee->get_logged_in_employee_info()->person_id; if($this->Employee->has_module_grant('config', $employee_id)) { $this->load->dbutil(); - + $prefs = array( 'format' => 'zip', 'filename' => 'ospos.sql' ); - + $backup = $this->dbutil->backup($prefs); - + $file_name = 'ospos-' . date("Y-m-d-H-i-s") .'.zip'; $save = 'uploads/' . $file_name; $this->load->helper('download'); @@ -907,7 +907,7 @@ class Config extends Secure_Controller { ob_end_clean(); } - + force_download($file_name, $backup); } else @@ -916,4 +916,4 @@ class Config extends Secure_Controller } } } -?> +?> \ No newline at end of file diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php index 6b4a7f517..87f5e45a3 100644 --- a/application/views/configs/locale_config.php +++ b/application/views/configs/locale_config.php @@ -249,6 +249,8 @@ $(document).ready(function() data, function(response) { $('#number_locale_example').text(response.number_locale_example); + $('#currency_symbol').val(response.currency_symbol); + $('#currency_code').text(response.currency_code); }, 'json' ); @@ -272,6 +274,7 @@ $(document).ready(function() var response = JSON.parse(data); $('#number_locale_example').text(response.number_locale_example); $('#currency_symbol').val(response.currency_symbol); + $('#currency_code').text(response.currency_code); $('#thousands_separator').prop('checked', response.thousands_separator); return response.success; } @@ -290,4 +293,4 @@ $(document).ready(function() errorLabelContainer: '#locale_error_message_box' })); }); - + \ No newline at end of file