diff --git a/application/config/config.php b/application/config/config.php index 6536a9ce7..f47a24a65 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -509,13 +509,5 @@ $config['rewrite_short_tags'] = FALSE; */ $config['proxy_ips'] = ''; -/* -|-------------------------------------------------------------------------- -| Statistics -|-------------------------------------------------------------------------- -| -| This is to enable the statistics for development and feature improvement purposes -| -*/ -$config['statistics'] = TRUE; + diff --git a/application/controllers/Config.php b/application/controllers/Config.php index 7b93b92d5..e7f8cfccc 100644 --- a/application/controllers/Config.php +++ b/application/controllers/Config.php @@ -257,7 +257,8 @@ class Config extends Secure_Controller 'custom7_name' => $this->input->post('custom7_name'), 'custom8_name' => $this->input->post('custom8_name'), 'custom9_name' => $this->input->post('custom9_name'), - 'custom10_name' => $this->input->post('custom10_name') + 'custom10_name' => $this->input->post('custom10_name'), + 'statistics' => $this->input->post('statistics') != NULL, ); $result = $this->Appconfig->batch_save($batch_save_data); diff --git a/application/language/ar-EG/config_lang.php b/application/language/ar-EG/config_lang.php index 8bb47fde7..8dd903beb 100644 --- a/application/language/ar-EG/config_lang.php +++ b/application/language/ar-EG/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "يمين"; $lang["config_sales_invoice_format"] = "شكل فاتورة البيع"; $lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح"; $lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = ",Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "مكان المخزون"; $lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر"; $lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'"; diff --git a/application/language/de-CH/config_lang.php b/application/language/de-CH/config_lang.php index a486da4b4..08a842b88 100644 --- a/application/language/de-CH/config_lang.php +++ b/application/language/de-CH/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Format Verkaufsrechnung"; $lang["config_saved_successfully"] = "Einstellungen erfolgreich gesichert"; $lang["config_saved_unsuccessfully"] = "Einstellungen konnten nicht gesichert werden"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Lagerort"; $lang["config_stock_location_duplicate"] = "Bitte verwenden Sie einen eindeutigen Lagerort"; $lang["config_stock_location_invalid_chars"] = "Der Lagerort kann keine Unterstriche enthalten"; diff --git a/application/language/de/config_lang.php b/application/language/de/config_lang.php index 82c156745..4039a4cdc 100644 --- a/application/language/de/config_lang.php +++ b/application/language/de/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Format Verkaufsrechnung"; $lang["config_saved_successfully"] = "Einstellungen erfolgreich gesichert"; $lang["config_saved_unsuccessfully"] = "Einstellungen konnten nicht gesichert werden"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Lagerort"; $lang["config_stock_location_duplicate"] = "Bitte verwenden Sie einen eindeutigen Lagerort"; $lang["config_stock_location_invalid_chars"] = "Der Lagerort kann keine Unterstriche enthalten"; diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index 5d85a1632..4963c51c0 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; $lang["config_saved_successfully"] = "Configuration saved successfully"; $lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Stock location"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index ed884e300..7fa764fb5 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Derecha"; $lang["config_sales_invoice_format"] = "Formato de Facturas de Venta"; $lang["config_saved_successfully"] = "Configuración guardada satisfactoriamente"; $lang["config_saved_unsuccessfully"] = "Configuración no guardada"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Ubicación de Inventario"; $lang["config_stock_location_duplicate"] = "Por favor use un nombre de inventario único"; $lang["config_stock_location_invalid_chars"] = "Nombre de la Ubicación de Inventario no debe contener '_'"; diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index 0e3ca5861..e4cb9cdcb 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; $lang["config_saved_successfully"] = "Configuration sauvegardée"; $lang["config_saved_unsuccessfully"] = "Échec de sauvegarde de configuration"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Stock location"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/hr-HR/config_lang.php b/application/language/hr-HR/config_lang.php index 43fc37546..c9cd34e4a 100644 --- a/application/language/hr-HR/config_lang.php +++ b/application/language/hr-HR/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Oblik fakture"; $lang["config_saved_successfully"] = "Konfiguracija je uspješno snimljena"; $lang["config_saved_unsuccessfully"] = "Konfiguracija nije uspješno snimljena"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Lokacija skladišta"; $lang["config_stock_location_duplicate"] = "Molim koristite jedinstveni naziv skladišta"; $lang["config_stock_location_invalid_chars"] = "Naziv skaldišta ne može sadržavati '_'"; diff --git a/application/language/hu-HU/config_lang.php b/application/language/hu-HU/config_lang.php index 5d933d211..10bea5caf 100644 --- a/application/language/hu-HU/config_lang.php +++ b/application/language/hu-HU/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Eladási számla formátum"; $lang["config_saved_successfully"] = "Beállítások sikeresen elmentve"; $lang["config_saved_unsuccessfully"] = "Beállítások mentése sikertelen"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Bolt helye"; $lang["config_stock_location_duplicate"] = "Kérem egyedi helyszin nevet használjon"; $lang["config_stock_location_invalid_chars"] = "A bolt helyének neve nem tartalmazhat '_' karaktert"; diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php index 84fea7104..7890bb08c 100644 --- a/application/language/id/config_lang.php +++ b/application/language/id/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Format Nota"; $lang["config_saved_successfully"] = "Konfigurasi berhasil disimpan"; $lang["config_saved_unsuccessfully"] = "Konfigurasi tidak berhasil disimpan"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Lokasi Stock"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php index f2cf56a21..e8d3c0527 100755 --- a/application/language/nl-BE/config_lang.php +++ b/application/language/nl-BE/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Formattering Aankoop #"; $lang["config_saved_successfully"] = "Configuratie werd bewaard"; $lang["config_saved_unsuccessfully"] = "Configuratie kon niet worden bewaard"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Stock locatie"; $lang["config_stock_location_duplicate"] = "Vul een unieke naam in"; $lang["config_stock_location_invalid_chars"] = "De bedrijfsnaam moet ingevuld worden"; diff --git a/application/language/pt-BR/config_lang.php b/application/language/pt-BR/config_lang.php index eae419495..d05c3f165 100644 --- a/application/language/pt-BR/config_lang.php +++ b/application/language/pt-BR/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Direita"; $lang["config_sales_invoice_format"] = "Formato da Fatura de Vendas"; $lang["config_saved_successfully"] = "Configuração salva com sucesso"; $lang["config_saved_unsuccessfully"] = "Configuração não salva"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Localização do Estoque"; $lang["config_stock_location_duplicate"] = "Por favor, use um nome de localização única"; $lang["config_stock_location_invalid_chars"] = "O nome do local de ações não pode conter '_'"; diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php index 53d0a8bab..1403d9240 100644 --- a/application/language/ru/config_lang.php +++ b/application/language/ru/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; $lang["config_saved_successfully"] = "Конфигурация успешно сохранена"; $lang["config_saved_unsuccessfully"] = "Конфигурация сохраненная безуспешно"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Stock location"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php index 7a8d672df..3bf7eb5d5 100644 --- a/application/language/th/config_lang.php +++ b/application/language/th/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "รหัสใบเสร็จ"; $lang["config_saved_successfully"] = "บันทึกข้อมูลร้านค้าเรียบร้อยแล้ว"; $lang["config_saved_unsuccessfully"] = "บันทึกข้อมูลร้านค้าไม่สำเร็จ"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "สถานที่เก็บ"; $lang["config_stock_location_duplicate"] = ""; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php index c0cf6b192..ac72d512b 100644 --- a/application/language/tr/config_lang.php +++ b/application/language/tr/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; $lang["config_saved_successfully"] = "Yapılandırma kaydedildi"; $lang["config_saved_unsuccessfully"] = "Yapılandırma kaydedilemedi"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Mağaza Yeri"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php index a2ac5600d..a4a6aa0d8 100755 --- a/application/language/zh/config_lang.php +++ b/application/language/zh/config_lang.php @@ -163,6 +163,8 @@ $lang["config_right"] = "Right"; $lang["config_sales_invoice_format"] = "Sales Invoice Format"; $lang["config_saved_successfully"] = "組態設置儲存成功"; $lang["config_saved_unsuccessfully"] = "組態設置儲存失敗"; +$lang["config_statistics"] = "Send statistics"; +$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Stock location"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'"; diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index d5cca63b1..adbabf8a6 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -125,6 +125,19 @@ +
+ lang->line('config_statistics'), 'statistics', array('class' => 'control-label col-xs-2')); ?> +
+ 'statistics', + 'id' => 'statistics', + 'value' => 'statistics', + 'checked'=>$this->config->item('statistics'))); ?> +   + +
+
+
lang->line('config_custom1'), 'config_custom1', array('class' => 'control-label col-xs-2')); ?>
diff --git a/database/2.4_to_3.0.sql b/database/2.4_to_3.0.sql index 229574304..d900f77bb 100644 --- a/database/2.4_to_3.0.sql +++ b/database/2.4_to_3.0.sql @@ -63,6 +63,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('smtp_crypto', 'ssl'), ('receipt_template', 'receipt_default'), ('theme', 'flatly'), +('statistics', '1'), ('language', 'english'), ('language_code', 'en'); diff --git a/database/database.sql b/database/database.sql index f0cbe522b..118a9f327 100644 --- a/database/database.sql +++ b/database/database.sql @@ -80,6 +80,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('smtp_crypto', 'ssl'), ('receipt_template', 'receipt_default'), ('theme', 'flatly'), +('statistics', '1'), ('language', 'english'), ('language_code', 'en'); diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index f08750159..15dcaead9 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -80,6 +80,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('smtp_crypto', 'ssl'), ('receipt_template', 'receipt_default'), ('theme', 'flatly'), +('statistics', '1'), ('language', 'english'), ('language_code', 'en'); diff --git a/database/tables.sql b/database/tables.sql index 0c1cb0df6..752f74b8e 100644 --- a/database/tables.sql +++ b/database/tables.sql @@ -80,6 +80,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('smtp_crypto', 'ssl'), ('receipt_template', 'receipt_default'), ('theme', 'flatly'), +('statistics', '1'), ('language', 'english'), ('language_code', 'en'); diff --git a/translations/config_lang.csv b/translations/config_lang.csv index caf0b662b..56577389c 100644 --- a/translations/config_lang.csv +++ b/translations/config_lang.csv @@ -162,6 +162,8 @@ config_right,Right,Right,Right,Derecha,Right,Right,Right,Right,Right,Right,Right config_sales_invoice_format,Eladási számla formátum,Format Verkaufsrechnung,Formattering Aankoop #,Formato de Facturas de Venta,Sales Invoice Format,Sales Invoice Format,Sales Invoice Format,Sales Invoice Format,รหัสใบเสร็จ,Sales Invoice Format,Format Nota,Formato da Fatura de Vendas,Oblik fakture,Format Verkaufsrechnung,شكل فاتورة البيع config_saved_successfully,Beállítások sikeresen elmentve,Einstellungen erfolgreich gesichert,Configuratie werd bewaard,Configuración guardada satisfactoriamente,Configuration saved successfully,Configuration sauvegardée,組態設置儲存成功,Конфигурация успешно сохранена,บันทึกข้อมูลร้านค้าเรียบร้อยแล้ว,Yapılandırma kaydedildi,Konfigurasi berhasil disimpan,Configuração salva com sucesso,Konfiguracija je uspješno snimljena,Einstellungen erfolgreich gesichert,تم حفظ التهيئة بنجاح config_saved_unsuccessfully,Beállítások mentése sikertelen,Einstellungen konnten nicht gesichert werden,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,Configuração não salva,Konfiguracija nije uspješno snimljena,Einstellungen konnten nicht gesichert werden,لم يتم حفظ التهيئة بنجاح +config_statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics,Send statistics +config_statistics_tooltip,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes,Send statistics for development and feature improvement purposes config_stock_location,Bolt helye,Lagerort,Stock locatie,Ubicación de Inventario,Stock location,Stock location,Stock location,Stock location,สถานที่เก็บ,Mağaza Yeri,Lokasi Stock,Localização do Estoque,Lokacija skladišta,Lagerort,مكان المخزون config_stock_location_duplicate,Kérem egyedi helyszin nevet használjon,Bitte verwenden Sie einen eindeutigen Lagerort,Vul een unieke naam in,Por favor use un nombre de inventario único,Please use an unique location name,Please use an unique location name,Please use an unique location name,Please use an unique location name,,Please use an unique location name,Please use an unique location name,"Por favor, use um nome de localização única",Molim koristite jedinstveni naziv skladišta,Bitte verwenden Sie einen eindeutigen Lagerort,من فضلك إستخدم اسم مكان غير مكرر config_stock_location_invalid_chars,A bolt helyének neve nem tartalmazhat '_' karaktert,Der Lagerort kann keine Unterstriche enthalten,De bedrijfsnaam moet ingevuld worden,Nombre de la Ubicación de Inventario no debe contener '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',O nome do local de ações não pode conter '_',Naziv skaldišta ne može sadržavati '_',Der Lagerort kann keine Unterstriche enthalten,مكان المخزون لايمكن أن يحتوى على '_'