diff --git a/application/controllers/config.php b/application/controllers/config.php index 4b9bcb49b..9f30081b4 100644 --- a/application/controllers/config.php +++ b/application/controllers/config.php @@ -18,11 +18,6 @@ class Config extends Secure_area function save() { - $barcode_labels = preg_replace('/^_|barcode_label_|_$/', '', implode('_', array( - $this->input->post('barcode_label_name'), - $this->input->post('barcode_label_price'), - $this->input->post('barcode_label_company') - ))); $batch_save_data=array( 'company'=>$this->input->post('company'), 'address'=>$this->input->post('address'), @@ -43,8 +38,6 @@ class Config extends Secure_area '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'), - 'barcode_labels'=>$barcode_labels, - 'barcode_content'=>$this->input->post('barcode_content'), 'custom1_name'=>$this->input->post('custom1_name'),/**GARRISON ADDED 4/20/2013**/ 'custom2_name'=>$this->input->post('custom2_name'),/**GARRISON ADDED 4/20/2013**/ 'custom3_name'=>$this->input->post('custom3_name'),/**GARRISON ADDED 4/20/2013**/ @@ -57,31 +50,9 @@ class Config extends Secure_area 'custom10_name'=>$this->input->post('custom10_name')/**GARRISON ADDED 4/20/2013**/ ); - $deleted_locations = $this->Stock_locations->get_allowed_locations(); - foreach($this->input->post() as $key => $value) - { - if (strstr($key, 'stock_location')) - { - $location_id = preg_replace("/.*?_(\d+)$/", "$1", $key); - unset($deleted_locations[$location_id]); - // save or update - $location_data = array('location_name' => $value); - if ($this->Stock_locations->save($location_data, $location_id)) - { - $this->_clear_session_state(); - } - } - } - // all locations not available in post will be deleted now - foreach ($deleted_locations as $location_id => $location_name) - { - $this->Stock_locations->delete($location_id); - } - - if( $this->Appconfig->batch_save( $batch_save_data )) - { - echo json_encode(array('success'=>true,'message'=>$this->lang->line('config_saved_successfully'))); - } + $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(); } @@ -101,6 +72,35 @@ class Config extends Secure_area $this->receiving_lib->clear_stock_destination(); $this->receiving_lib->clear_all(); } + + function save_locations() + { + $this->db->trans_start(); + + $deleted_locations = $this->Stock_locations->get_allowed_locations(); + foreach($this->input->post() as $key => $value) + { + if (strstr($key, 'stock_location')) + { + $location_id = preg_replace("/.*?_(\d+)$/", "$1", $key); + unset($deleted_locations[$location_id]); + // save or update + $location_data = array('location_name' => $value); + if ($this->Stock_locations->save($location_data, $location_id)) + { + $this->_clear_session_state(); + } + } + } + // all locations not available in post will be deleted now + foreach ($deleted_locations as $location_id => $location_name) + { + $this->Stock_locations->delete($location_id); + } + $success = $this->db->trans_complete(); + echo json_encode(array('success'=>$success,'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully'))); + $this->_remove_duplicate_cookies(); + } function save_barcode() { @@ -118,13 +118,13 @@ class Config extends Secure_area 'barcode_third_row'=>$this->input->post('barcode_third_row'), 'barcode_num_in_row'=>$this->input->post('barcode_num_in_row'), 'barcode_page_width'=>$this->input->post('barcode_page_width'), - 'barcode_page_cellspacing'=>$this->input->post('barcode_page_cellspacing') + 'barcode_page_cellspacing'=>$this->input->post('barcode_page_cellspacing'), + 'barcode_content'=>$this->input->post('barcode_content'), ); - if( $this->Appconfig->batch_save( $batch_save_data ) ) - { - echo json_encode(array('success'=>true,'message'=>$this->lang->line('config_saved_successfully'))); - } + $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'))); } } diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index 6396ea6c8..4d09aa41d 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = "Row 1"; $lang["config_barcode_font"] = "Font"; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = "Barcode Configuration Information"; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = "Barcode layout"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "Tax 2 Rate"; $lang["config_default_tax_rate_number"] = "The default tax rate must be a number"; $lang["config_default_tax_rate_required"] = "The default tax rate is a required field"; $lang["config_fax"] = "Fax"; -$lang["config_general_config"] = "General Configuration"; +$lang["config_general_configuration"] = "General Configuration"; $lang["config_info"] = "Store Configuration Information"; $lang["config_language"] = "Language"; $lang["config_phone"] = "Company Phone"; $lang["config_phone_required"] = "Company phone is a required field"; $lang["config_print_after_sale"] = "Print receipt after sale"; -$lang["config_recv_invoice_enable"] = "Enable Orders Invoice#"; $lang["config_recv_invoice_format"] = "Receivings Invoice Format"; $lang["config_return_policy_required"] = "Return policy is a required field"; -$lang["config_sales_invoice_enable"] = "Enable Sales Invoice#"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; $lang["config_saved_successfully"] = "Configuration saved successfully"; $lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Company Name"; +$lang["config_location_configuration"] = "Stock Locations"; +$lang["config_location_info"] = "Location Configuration Information"; diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index 47bf23ccd..4648582db 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,21 +58,19 @@ $lang["config_default_tax_rate_2"] = "Impuesto 2"; $lang["config_default_tax_rate_number"] = "El Impuesto Predeterminado debe ser un número"; $lang["config_default_tax_rate_required"] = "El Impuesto Predeterminado es requerido"; $lang["config_fax"] = "Fax"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "Información del Comercio"; $lang["config_language"] = "Idioma"; $lang["config_phone"] = "Teléfono del Comercio"; $lang["config_phone_required"] = "Teléfono del Comercio es requerido"; $lang["config_print_after_sale"] = "Imprimir recibo después de una venta"; -$lang["config_recv_invoice_enable"] = ""; $lang["config_recv_invoice_format"] = ""; $lang["config_return_policy_required"] = "Política de Devolución es requerida"; -$lang["config_sales_invoice_enable"] = ""; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Configuración guardada satisfactoriamente"; $lang["config_saved_unsuccessfully"] = "Configuración no guardada"; $lang["config_stock_location"] = ""; -$lang["config_stock_location_duplicate"] = ""; +$lang["config_stock_location_duplicate"] = " "; $lang["config_stock_location_required"] = ""; $lang["config_tax_included"] = "Impuestos incluidos"; $lang["config_timezone"] = "Zona Horaria"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Nombre del Comercio"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index 90092cf11..d42d81735 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "Taux d\'Imposition 2"; $lang["config_default_tax_rate_number"] = "Le taux d\'imposition doit etre un nombre"; $lang["config_default_tax_rate_required"] = "Le taux d\'imposition par défaut est requis"; $lang["config_fax"] = "Fax"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "Çonfiguration de l\'Entreprise"; $lang["config_language"] = "Langue"; $lang["config_phone"] = "Téléphone"; $lang["config_phone_required"] = "Le numéro de téléphone est requis"; $lang["config_print_after_sale"] = "Imprimer un recu après vente"; -$lang["config_recv_invoice_enable"] = ""; $lang["config_recv_invoice_format"] = ""; $lang["config_return_policy_required"] = "Le Message est un champ requis"; -$lang["config_sales_invoice_enable"] = ""; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Configuration sauvegardée"; $lang["config_saved_unsuccessfully"] = "Échec de sauvegarde de configuration"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Nome de l\'Entreprise"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php index e63736b09..bd41e9b8b 100644 --- a/application/language/id/config_lang.php +++ b/application/language/id/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "Tarif Pajak 2"; $lang["config_default_tax_rate_number"] = "Tarif Pajak Biasa harus angka"; $lang["config_default_tax_rate_required"] = "Tarif Pajak Biasa wajib diisi"; $lang["config_fax"] = "Fax"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "Informasi Konfigurasi Toko"; $lang["config_language"] = "Bahasa"; $lang["config_phone"] = "Telepon Perusahaan"; $lang["config_phone_required"] = "Telepon Perusahaan wajib diisi"; $lang["config_print_after_sale"] = "Cetak Faktur setelah penjualan"; -$lang["config_recv_invoice_enable"] = ""; $lang["config_recv_invoice_format"] = ""; $lang["config_return_policy_required"] = "Kebijakan retur wajib diisi"; -$lang["config_sales_invoice_enable"] = ""; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Konfigurasi berhasil disimpan"; $lang["config_saved_unsuccessfully"] = "Konfigurasi tidak berhasil disimpan"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Nama Perusahaan"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php index 2d686feba..43de0773e 100755 --- a/application/language/nl-BE/config_lang.php +++ b/application/language/nl-BE/config_lang.php @@ -2,28 +2,27 @@ $lang["config_address"] = "Adres"; $lang["config_address_required"] = "Het adres van het bedrijf moet ingevuld worden"; -$lang["config_barcode_checksum"] = ""; +$lang["config_barcode_checksum"] = "Checksum"; $lang["config_barcode_company"] = "Bedrijfsnaam"; $lang["config_barcode_content"] = "Inhoud Barcode"; -$lang["config_barcode_dpi"] = ""; -$lang["config_barcode_first_row"] = ""; -$lang["config_barcode_font"] = ""; +$lang["config_barcode_dpi"] = "DPI"; +$lang["config_barcode_first_row"] = "Rij 1"; +$lang["config_barcode_font"] = "Lettertype"; $lang["config_barcode_id"] = "Product id/naam"; -$lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; -$lang["config_barcode_layout"] = ""; +$lang["config_barcode_info"] = "Barcode instellingen"; +$lang["config_barcode_layout"] = "Barcode Layout"; $lang["config_barcode_name"] = "Productnaam"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; -$lang["config_barcode_number_in_row"] = ""; -$lang["config_barcode_page_cellspacing"] = ""; -$lang["config_barcode_page_width"] = ""; +$lang["config_barcode_number_in_row"] = "Aantal per rij"; +$lang["config_barcode_page_cellspacing"] = "Toon cellspatiëring"; +$lang["config_barcode_page_width"] = "Toon paginabreedte"; $lang["config_barcode_price"] = "Prijs"; -$lang["config_barcode_rotation"] = ""; -$lang["config_barcode_scale"] = ""; -$lang["config_barcode_second_row"] = ""; -$lang["config_barcode_thickness"] = ""; -$lang["config_barcode_third_row"] = ""; -$lang["config_barcode_type"] = ""; +$lang["config_barcode_rotation"] = "Rotatie"; +$lang["config_barcode_scale"] = "Schaal"; +$lang["config_barcode_second_row"] = "Rij 2"; +$lang["config_barcode_thickness"] = "Dikte"; +$lang["config_barcode_third_row"] = "Rij 3"; +$lang["config_barcode_type"] = "Barcode Type"; $lang["config_company"] = "Bedrijfsnaam"; $lang["config_company_required"] = "De bedrijfsnaam moet ingevuld worden"; $lang["config_company_website_url"] = "De website van het bedrijf is geen geldige URL (http://...)"; @@ -59,17 +58,15 @@ $lang["config_default_tax_rate_2"] = "VAT 2 %"; $lang["config_default_tax_rate_number"] = "Het percentage VAT moet een nummer zijn"; $lang["config_default_tax_rate_required"] = "Het percentage VAT moet ingevuld worden"; $lang["config_fax"] = "Fax"; -$lang["config_general_config"] = ""; -$lang["config_info"] = "Configuratie Informatie"; +$lang["config_general_configuration"] = "Algemene Instellingen"; +$lang["config_info"] = "Systeeminstellingen"; $lang["config_language"] = "Taal"; $lang["config_phone"] = "Telefoon"; $lang["config_phone_required"] = "De telefoonnummer van het bedrijf moet ingevuld worden"; $lang["config_print_after_sale"] = "Druk ticket na verkoop"; -$lang["config_recv_invoice_enable"] = ""; -$lang["config_recv_invoice_format"] = ""; +$lang["config_recv_invoice_format"] = "Formaat Ordernummer"; $lang["config_return_policy_required"] = "De retourvoorwaarden moeten ingevuld worden"; -$lang["config_sales_invoice_enable"] = ""; -$lang["config_sales_invoice_format"] = ""; +$lang["config_sales_invoice_format"] = "Formaat Factuurnummer"; $lang["config_saved_successfully"] = "Configuratie werd bewaard"; $lang["config_saved_unsuccessfully"] = "Configuratie kon niet worden bewaard"; $lang["config_stock_location"] = "Stock locatie"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Productnaam"; $lang["config_barcode_price"] = "Prijs"; $lang["config_barcode_company"] = "Bedrijfsnaam"; +$lang["config_location_configuration"] = "Stock Locaties"; +$lang["config_location_info"] = "Instellingen Locatie"; diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php index 04fbb60ef..addecc89a 100644 --- a/application/language/ru/config_lang.php +++ b/application/language/ru/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "ставка налога 2"; $lang["config_default_tax_rate_number"] = "Обычный ставка налога должен быть цифра"; $lang["config_default_tax_rate_required"] = "Обычный ставка налога обязательный пробел"; $lang["config_fax"] = "Факс"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "информация о магазин конфигурация"; $lang["config_language"] = "Язик"; $lang["config_phone"] = "Телефон Компании"; $lang["config_phone_required"] = "Телефон Компании обязательный пробел"; $lang["config_print_after_sale"] = "Распечатать квитанцию ​​после продажи"; -$lang["config_recv_invoice_enable"] = ""; $lang["config_recv_invoice_format"] = ""; $lang["config_return_policy_required"] = "Возвратний полис обязательный пробел"; -$lang["config_sales_invoice_enable"] = ""; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Конфигурация успешно сохранена"; $lang["config_saved_unsuccessfully"] = "Конфигурация сохраненная безуспешно"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Название Компании"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php index 18abe23b0..da7825fa2 100644 --- a/application/language/th/config_lang.php +++ b/application/language/th/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "อัตราภาษี 2"; $lang["config_default_tax_rate_number"] = "อัตราภาษีเริ่มต้นต้องเป็นตัวเลข"; $lang["config_default_tax_rate_required"] = "อัตราภาษีเริ่มต้นต้องกรอก"; $lang["config_fax"] = "แฟ็กซ์"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "ข้อมูลร้านค้า"; $lang["config_language"] = "ภาษา"; $lang["config_phone"] = "เบอร์โทรศัพท์"; $lang["config_phone_required"] = "เบอร์โทรต้องกรอก"; $lang["config_print_after_sale"] = "พิมพ์บิลหลังการขาย"; -$lang["config_recv_invoice_enable"] = "หมายเลขใบแจ้งหนี้"; $lang["config_recv_invoice_format"] = "รหัสใบแจ้งหนี้"; $lang["config_return_policy_required"] = "กฎการคืนของต้องกรอก"; -$lang["config_sales_invoice_enable"] = "หมายเลขใบแจ้งหนี้"; $lang["config_sales_invoice_format"] = "รหัสใบเสร็จ"; $lang["config_saved_successfully"] = "องค์ประกอบร้านค้าบันทึกเรียบร้อย"; $lang["config_saved_unsuccessfully"] = "องค์ประกอบร้านค้าบันทึกล้มเหลว"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "ชื่อร้านค้า"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php index ed20e1bbd..f41485197 100644 --- a/application/language/tr/config_lang.php +++ b/application/language/tr/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "Vergi Oranı 2"; $lang["config_default_tax_rate_number"] = "Varsayılan Vergi Oranı sayı olmalıdır"; $lang["config_default_tax_rate_required"] = "Varsayılan Vergi Oranı zorunlu alandır"; $lang["config_fax"] = "Faks"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "Mağaza yapılandırma bilgisi"; $lang["config_language"] = "Dil"; $lang["config_phone"] = "Şirket Telefonu"; $lang["config_phone_required"] = "Şirket Telefonu zorunlu alandır"; $lang["config_print_after_sale"] = "Satıştan sonra yazdır"; -$lang["config_recv_invoice_enable"] = ""; $lang["config_recv_invoice_format"] = ""; $lang["config_return_policy_required"] = "İade Politikası zorunlu alandır"; -$lang["config_sales_invoice_enable"] = ""; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "Yapılandırma kaydedildi"; $lang["config_saved_unsuccessfully"] = "Yapılandırma kaydedilemedi"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "Şirket Adı"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php index 9e737d196..7634b1bb7 100755 --- a/application/language/zh/config_lang.php +++ b/application/language/zh/config_lang.php @@ -10,7 +10,6 @@ $lang["config_barcode_first_row"] = ""; $lang["config_barcode_font"] = ""; $lang["config_barcode_id"] = "Item Id/Name"; $lang["config_barcode_info"] = ""; -$lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_layout"] = ""; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_number"] = "UPC/EAN/ISBN"; @@ -59,16 +58,14 @@ $lang["config_default_tax_rate_2"] = "稅率 2"; $lang["config_default_tax_rate_number"] = "預設稅率必需為數字"; $lang["config_default_tax_rate_required"] = "預設稅率為必填"; $lang["config_fax"] = "傳真"; -$lang["config_general_config"] = ""; +$lang["config_general_configuration"] = ""; $lang["config_info"] = "儲存組態"; $lang["config_language"] = "語言"; $lang["config_phone"] = "電話"; $lang["config_phone_required"] = "公司電話為必填"; $lang["config_print_after_sale"] = "出貨時打印收據"; -$lang["config_recv_invoice_enable"] = ""; $lang["config_recv_invoice_format"] = ""; $lang["config_return_policy_required"] = "退換貨政策為必填"; -$lang["config_sales_invoice_enable"] = ""; $lang["config_sales_invoice_format"] = ""; $lang["config_saved_successfully"] = "組態設置儲存成功"; $lang["config_saved_unsuccessfully"] = "組態設置儲存失敗"; @@ -86,3 +83,5 @@ $lang["config_barcode_labels"] = "Barcode Labels"; $lang["config_barcode_name"] = "Name"; $lang["config_barcode_price"] = "Price"; $lang["config_barcode_company"] = "公司名稱"; +$lang["config_location_configuration"] = ""; +$lang["config_location_info"] = ""; diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php index 6c8435ddc..60cd93239 100644 --- a/application/views/configs/barcode_config.php +++ b/application/views/configs/barcode_config.php @@ -11,7 +11,7 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
lang->line('common_fields_required_message'); ?>
- + lang->line("config_barcode_info"); ?>
@@ -103,6 +103,22 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form')); 'checked'=>$this->config->item('barcode_checksum')));?>
+ +
+ lang->line('config_barcode_content').':', 'barcode_content',array('class'=>'wide')); ?> +
+ 'barcode_content', + 'value'=>'id', + 'checked'=>$this->config->item('barcode_content') === "id")); ?> + lang->line('config_barcode_id'); ?> + 'barcode_content', + 'value'=>'number', + 'checked'=>$this->config->item('barcode_content') === "number")); ?> + lang->line('config_barcode_number'); ?> +
+
lang->line('config_barcode_layout').':', 'barcode_layout',array('class'=>'wide')); ?> @@ -214,7 +230,7 @@ $(document).ready(function() }); }, - errorLabelContainer: "#error_message_box", + errorLabelContainer: "#barcode_error_message_box", wrapper: "li", rules: { diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index 4955df7dd..451088990 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -1,11 +1,11 @@ -
lang->line('config_general_config'); ?>
+
lang->line('config_general_configuration'); ?>
'config_form')); ?>
lang->line('common_fields_required_message'); ?>
-
    +
      lang->line("config_info"); ?>
      @@ -138,17 +138,20 @@ echo form_open('config/save/',array('id'=>'config_form'));
      -
      -lang->line('config_language').':', 'language',array('class'=>'wide required')); ?> +
      + lang->line('config_language').':', 'language',array('class'=>'wide required')); ?>
      - 'Azerbaijan', - 'BahasaIndonesia' => 'BahasaIndonesia', - 'english' => 'English', - 'Spanish' => 'Spanish', - 'Russian' => 'Russian', - 'Thai' => 'Thai' - ), + 'English', + 'es' => 'Spanish', + 'ru' => 'Russian', + 'nl-BE' => 'Dutch', + 'zh' => 'Chinese', + 'id' => 'Indonesian', + 'fr' => 'French', + 'th' => 'Thai', + 'tr' => 'Turkish' + ), $this->config->item('language')); ?>
      diff --git a/application/views/configs/location_config.php b/application/views/configs/location_config.php new file mode 100644 index 000000000..412baecac --- /dev/null +++ b/application/views/configs/location_config.php @@ -0,0 +1,124 @@ +
      lang->line('config_location_configuration'); ?>
      +'location_config_form')); +?> +
      +
      +
      lang->line('common_fields_required_message'); ?>
      +
        + lang->line("config_location_info"); ?> + +
        + load->view('partial/stock_locations', array('stock_locations' => $stock_locations)); ?> +
        + + 'submit', + 'id'=>'submit', + 'value'=>$this->lang->line('common_submit'), + 'class'=>'submit_button float_right') + ); + ?> +
        +
        + + + + diff --git a/application/views/configs/manage.php b/application/views/configs/manage.php index 4248db6c4..9b1fcd995 100644 --- a/application/views/configs/manage.php +++ b/application/views/configs/manage.php @@ -8,6 +8,7 @@
        @@ -17,6 +18,9 @@
        load->view("configs/barcode_config"); ?>
        +
        + load->view("configs/location_config"); ?> +
        load->view("partial/footer"); ?> \ No newline at end of file diff --git a/css/popupbox.css b/css/popupbox.css index bd4b54169..c0ceebc30 100644 --- a/css/popupbox.css +++ b/css/popupbox.css @@ -79,7 +79,7 @@ font-size:80%; } -#error_message_box +.error_message_box { margin-bottom:7px; margin-left:20px; diff --git a/translations/.~lock.config_lang.csv# b/translations/.~lock.config_lang.csv# index 13c574fb9..de3cf1d0b 100644 --- a/translations/.~lock.config_lang.csv# +++ b/translations/.~lock.config_lang.csv# @@ -1 +1 @@ -jekkos ,jekkos,lenovo-t520.home,31.01.2015 20:52,file:///home/jekkos/.config/libreoffice/3; \ No newline at end of file +jekkos ,jekkos,lenovo-t520.home,02.02.2015 14:30,file:///home/jekkos/.config/libreoffice/3; \ No newline at end of file diff --git a/translations/config_lang.csv b/translations/config_lang.csv index 240c808f9..d1af0112e 100644 --- a/translations/config_lang.csv +++ b/translations/config_lang.csv @@ -1,28 +1,27 @@ label,nl-BE,es,en,fr,zh,ru,th,tr,id config_address,Adres,Dirección del Comercio,Company Address,Addresse,公司地址,Адрес Компании,ที่อยู่,Şirket Adresi,Alamat Perusahaan config_address_required,Het adres van het bedrijf moet ingevuld worden,Dirección del Comercio es requerida,Company address is a required field,L\'adresse est requise,公司地址為必填,Адрес Компании обязательный пробел,ที่อยู่ต้องกรอก,Şirket Adresi zorunlu alandır,Alamat Perusahaan wajib diisi -config_barcode_checksum,,,Checksum,,,,,, +config_barcode_checksum,Checksum,,Checksum,,,,,, config_barcode_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan config_barcode_content,Inhoud Barcode,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content -config_barcode_dpi,,,DPI,,,,,, -config_barcode_first_row,,,Row 1,,,,,, -config_barcode_font,,,Font,,,,,, +config_barcode_dpi,DPI,,DPI,,,,,, +config_barcode_first_row,Rij 1,,Row 1,,,,,, +config_barcode_font,Lettertype,,Font,,,,,, config_barcode_id,Product id/naam,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name -config_barcode_info,,,Barcode Configuration Information,,,,,, -config_barcode_labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Labels -config_barcode_layout,,,Barcode layout,,,,,, +config_barcode_info,Barcode instellingen,,Barcode Configuration Information,,,,,, +config_barcode_layout,Barcode Layout,,Barcode layout,,,,,, config_barcode_name,Productnaam,Name,Name,Name,Name,Name,Name,Name,Name config_barcode_number,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN -config_barcode_number_in_row,,,Number in row,,,,,, -config_barcode_page_cellspacing,,,Display page cellspacing,,,,,, -config_barcode_page_width,,,Display page width,,,,,, +config_barcode_number_in_row,Aantal per rij,,Number in row,,,,,, +config_barcode_page_cellspacing,Toon cellspatiëring,,Display page cellspacing,,,,,, +config_barcode_page_width,Toon paginabreedte,,Display page width,,,,,, config_barcode_price,Prijs,Price,Price,Price,Price,Price,Price,Price,Price -config_barcode_rotation,,,Rotation,,,,,, -config_barcode_scale,,,Scale,,,,,, -config_barcode_second_row,,,Row 2,,,,,, -config_barcode_thickness,,,Thickness,,,,,, -config_barcode_third_row,,,Row 3,,,,,, -config_barcode_type,,,Barcode Type,,,,,, +config_barcode_rotation,Rotatie,,Rotation,,,,,, +config_barcode_scale,Schaal,,Scale,,,,,, +config_barcode_second_row,Rij 2,,Row 2,,,,,, +config_barcode_thickness,Dikte,,Thickness,,,,,, +config_barcode_third_row,Rij 3,,Row 3,,,,,, +config_barcode_type,Barcode Type,,Barcode Type,,,,,, config_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan config_company_required,De bedrijfsnaam moet ingevuld worden,Nombre del Comercio es requerido,Company name is a required field,Le nom d\'entreprise est requis,公司名稱為必填,Имя Компании обязательный пробел,ชื่อร้านค้าต้องกรอก,Şirket Adı zorunlu alandır,Nama Perusahaan wajib diisi config_company_website_url,De website van het bedrijf is geen geldige URL (http://...),Sitio Web no es una URL estándard (http://...),Company website is not a valid URL (http://...),Le site web de l\'entreprise n\'est pas une URL valide (http://...),公司網址格式錯誤 (http://...),Веб-сайт Компании не является допустимым URL (http://...),เว็บไซต์ร้านค้าไม่ถูกต้อง,website adresi yanlış (http://...),Situs Perusahaan bukan URL yang benar(http://...) @@ -58,21 +57,19 @@ config_default_tax_rate_2,VAT 2 %,Impuesto 2,Tax 2 Rate,Taux d\'Imposition 2,稅 config_default_tax_rate_number,Het percentage VAT moet een nummer zijn,El Impuesto Predeterminado debe ser un número,The default tax rate must be a number,Le taux d\'imposition doit etre un nombre,預設稅率必需為數字,Обычный ставка налога должен быть цифра,อัตราภาษีเริ่มต้นต้องเป็นตัวเลข,Varsayılan Vergi Oranı sayı olmalıdır,Tarif Pajak Biasa harus angka config_default_tax_rate_required,Het percentage VAT moet ingevuld worden,El Impuesto Predeterminado es requerido,The default tax rate is a required field,Le taux d\'imposition par défaut est requis,預設稅率為必填,Обычный ставка налога обязательный пробел,อัตราภาษีเริ่มต้นต้องกรอก,Varsayılan Vergi Oranı zorunlu alandır,Tarif Pajak Biasa wajib diisi config_fax,Fax,Fax,Fax,Fax,傳真,Факс,แฟ็กซ์,Faks,Fax -config_general_config,,,General Configuration,,,,,, -config_info,Configuratie Informatie,Información del Comercio,Store Configuration Information,Çonfiguration de l\'Entreprise,儲存組態,информация о магазин конфигурация,ข้อมูลร้านค้า,Mağaza yapılandırma bilgisi,Informasi Konfigurasi Toko +config_general_configuration,Algemene Instellingen,,General Configuration,,,,,, +config_info,Systeeminstellingen,Información del Comercio,Store Configuration Information,Çonfiguration de l\'Entreprise,儲存組態,информация о магазин конфигурация,ข้อมูลร้านค้า,Mağaza yapılandırma bilgisi,Informasi Konfigurasi Toko config_language,Taal,Idioma,Language,Langue,語言,Язик,ภาษา,Dil,Bahasa config_phone,Telefoon,Teléfono del Comercio,Company Phone,Téléphone,電話,Телефон Компании,เบอร์โทรศัพท์,Şirket Telefonu,Telepon Perusahaan config_phone_required,De telefoonnummer van het bedrijf moet ingevuld worden,Teléfono del Comercio es requerido,Company phone is a required field,Le numéro de téléphone est requis,公司電話為必填,Телефон Компании обязательный пробел,เบอร์โทรต้องกรอก,Şirket Telefonu zorunlu alandır,Telepon Perusahaan wajib diisi config_print_after_sale,Druk ticket na verkoop,Imprimir recibo después de una venta,Print receipt after sale,Imprimer un recu après vente,出貨時打印收據,Распечатать квитанцию ​​после продажи,พิมพ์บิลหลังการขาย,Satıştan sonra yazdır,Cetak Faktur setelah penjualan -config_recv_invoice_enable,,,Enable Orders Invoice#,,,,หมายเลขใบแจ้งหนี้,, -config_recv_invoice_format,,,Receivings Invoice Format,,,,รหัสใบแจ้งหนี้,, +config_recv_invoice_format,Formaat Ordernummer,,Receivings Invoice Format,,,,รหัสใบแจ้งหนี้,, config_return_policy_required,De retourvoorwaarden moeten ingevuld worden,Política de Devolución es requerida,Return policy is a required field,Le Message est un champ requis,退換貨政策為必填,Возвратний полис обязательный пробел,กฎการคืนของต้องกรอก,İade Politikası zorunlu alandır,Kebijakan retur wajib diisi -config_sales_invoice_enable,,,Enable Sales Invoice#,,,,หมายเลขใบแจ้งหนี้,, -config_sales_invoice_format,,,Sales Invoice Format,,,,รหัสใบเสร็จ,, +config_sales_invoice_format,Formaat Factuurnummer,,Sales Invoice Format,,,,รหัสใบเสร็จ,, config_saved_successfully,Configuratie werd bewaard,Configuración guardada satisfactoriamente,Configuration saved successfully,Configuration sauvegardée,組態設置儲存成功,Конфигурация успешно сохранена,องค์ประกอบร้านค้าบันทึกเรียบร้อย,Yapılandırma kaydedildi,Konfigurasi berhasil disimpan config_saved_unsuccessfully,Configuratie kon niet worden bewaard,Configuración no guardada,Configuration saved unsuccessfully,Échec de sauvegarde de configuration,組態設置儲存失敗,Конфигурация сохраненная безуспешно,องค์ประกอบร้านค้าบันทึกล้มเหลว,Yapılandırma kaydedilemedi,Konfigurasi tidak berhasil disimpan config_stock_location,Stock locatie,,Stock location,,,,สถานที่เก็บ,Mağaza Yeri, -config_stock_location_duplicate,Vul een unieke naam in,,Please use an unique location name,,,,,, +config_stock_location_duplicate,Vul een unieke naam in, ,Please use an unique location name,,,,,, config_stock_location_required,Naam van de stock locatie is een verplicht veld,,Stock location number is a required field,,,,จำเป็นต้องระบุสถานที่เก็บ,Mağaza Yeri numarası zorunlu alandır, config_tax_included,VAT Ingebgrepen,Impuestos incluidos,Tax Included,,Tax Included,Tax Included,รวมภาษีแล้ว,,Dikenakan Pajak config_timezone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,โซนเวลา,Saat Dilimi,Zona Waktu @@ -85,3 +82,5 @@ config_barcode_labels,Barcode Labels,Barcode Labels,Barcode Labels,Barcode Label config_barcode_name,Productnaam,Name,Name,Name,Name,Name,Name,Name,Name config_barcode_price,Prijs,Price,Price,Price,Price,Price,Price,Price,Price config_barcode_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan +config_location_configuration,Stock Locaties,,Stock Locations,,,,,, +config_location_info,Instellingen Locatie,,Location Configuration Information,,,,,,