From 79a4414a131f1ee473685ee7bf998b5d8ddeedf0 Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 22 Mar 2016 08:55:43 +0100 Subject: [PATCH] Disable second tax field if first is not filled (#381) Add extra warning if first tax is modified --- application/language/de-CH/items_lang.php | 1 + application/language/en/items_lang.php | 1 + application/language/es/items_lang.php | 1 + application/language/fr/items_lang.php | 1 + application/language/id/items_lang.php | 1 + application/language/nl-BE/items_lang.php | 1 + application/language/ru/items_lang.php | 1 + application/language/th/items_lang.php | 1 + application/language/tr/items_lang.php | 1 + application/language/zh/items_lang.php | 1 + application/views/items/form_bulk.php | 14 +++++++++++--- translations/items_lang.csv | 1 + 12 files changed, 22 insertions(+), 3 deletions(-) diff --git a/application/language/de-CH/items_lang.php b/application/language/de-CH/items_lang.php index 9c2bb99fc..38f977196 100644 --- a/application/language/de-CH/items_lang.php +++ b/application/language/de-CH/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Ändere alle zu NICHT Erlau $lang["items_change_all_to_serialized"] = "Ändere alle zu serialisiert"; $lang["items_change_all_to_unserialized"] = "Ändere alle zu nicht serialisiert"; $lang["items_confirm_bulk_edit"] = "Wollen Sie alle gewählten Artikel ändern?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "Wollen Sie alle gewählten Artikel löschen?"; $lang["items_cost_price"] = "Einstandspreis"; $lang["items_cost_price_number"] = "Einstandspresi muss eine Zahl sein"; diff --git a/application/language/en/items_lang.php b/application/language/en/items_lang.php index 6a23dc8f5..8901fe073 100644 --- a/application/language/en/items_lang.php +++ b/application/language/en/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Not Allow Alt Desc For All" $lang["items_change_all_to_serialized"] = "Change All To Serialized"; $lang["items_change_all_to_unserialized"] = "Change All To Unserialized"; $lang["items_confirm_bulk_edit"] = "Are you sure you want to edit all the items selected?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "Are you sure you want to delete the selected items?"; $lang["items_cost_price"] = "Cost Price"; $lang["items_cost_price_number"] = "Cost price must be a number"; diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php index a467d17b3..52631d3eb 100644 --- a/application/language/es/items_lang.php +++ b/application/language/es/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Denegar Descripción Altern $lang["items_change_all_to_serialized"] = "Cambiar Todo A Serializado"; $lang["items_change_all_to_unserialized"] = "Cambiar Todo A Deserializado"; $lang["items_confirm_bulk_edit"] = "¿Estás seguro(a) de querer editar los artículos seleccionados?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "¿Estás seguro(a) de querer borrar los artículos seleccionados?"; $lang["items_cost_price"] = "Precio de Compra"; $lang["items_cost_price_number"] = "Precio de Compra debe ser número"; diff --git a/application/language/fr/items_lang.php b/application/language/fr/items_lang.php index 150462379..f82538123 100644 --- a/application/language/fr/items_lang.php +++ b/application/language/fr/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Interdire Desc Alt Pour Tou $lang["items_change_all_to_serialized"] = "Tout Sérialiser"; $lang["items_change_all_to_unserialized"] = "Tout désérialiser"; $lang["items_confirm_bulk_edit"] = "Etes vous sûre de vouloir éditer toute la sélection?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "Etes vous sûre de vouloir supprimer la sélection?"; $lang["items_cost_price"] = "Prix de Gros"; $lang["items_cost_price_number"] = "Le Prix d\'achat doit etre un nombre"; diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php index c7b9d0ca2..b47c1d359 100644 --- a/application/language/id/items_lang.php +++ b/application/language/id/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Tidak Diijinkan Deskripsi a $lang["items_change_all_to_serialized"] = "Ubah semua menggunakan nomor serial"; $lang["items_change_all_to_unserialized"] = "Ubah semua tanpa nomor serial"; $lang["items_confirm_bulk_edit"] = "Apakah Anda yakin ingin merubah semua item yang dipilih?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "Apakah Anda yakin ingin menghapus item yang dipilih?"; $lang["items_cost_price"] = "Harga Pokok"; $lang["items_cost_price_number"] = "Biaya Item harus angka"; diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php index 428916fcf..38b716747 100755 --- a/application/language/nl-BE/items_lang.php +++ b/application/language/nl-BE/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Vaste omschrijvingen"; $lang["items_change_all_to_serialized"] = "Genummerd"; $lang["items_change_all_to_unserialized"] = "Niet genummerd"; $lang["items_confirm_bulk_edit"] = "Bent u zeker dat u de geselecteerde producten wil aanpassen?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "Alle taxgegevens zullen overschreven worden!"; $lang["items_confirm_delete"] = "Bent u zeker dat u de geselecteerde producten wil verwijderen?"; $lang["items_cost_price"] = "Aankoopprijs"; $lang["items_cost_price_number"] = "Kostprijs moet een cijfer zijn"; diff --git a/application/language/ru/items_lang.php b/application/language/ru/items_lang.php index 3aefe81fe..347a01df5 100644 --- a/application/language/ru/items_lang.php +++ b/application/language/ru/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Не разрешить а $lang["items_change_all_to_serialized"] = "Изменить все в сериализованную"; $lang["items_change_all_to_unserialized"] = "Изменить все в несериализованную"; $lang["items_confirm_bulk_edit"] = "Вы уверены, что хотите редактировать все товари выбраны?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "Вы уверены, что хотите удалить выбранные товари?"; $lang["items_cost_price"] = "Оптовая Цена"; $lang["items_cost_price_number"] = "Оптовая цена должно быть число"; diff --git a/application/language/th/items_lang.php b/application/language/th/items_lang.php index f075e590d..d10bfb379 100644 --- a/application/language/th/items_lang.php +++ b/application/language/th/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Not Allow Alt Desc For All" $lang["items_change_all_to_serialized"] = "เปลี่ยนแปลงรหัสสินค้าทั้งหมด"; $lang["items_change_all_to_unserialized"] = "ลบรหัสสินค้าทั้งหมด"; $lang["items_confirm_bulk_edit"] = "แน่ใจหรือไม่ที่จะแก้ใขสินค้าทั้งหมดที่คุณเลือก?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "โปรดยืนยันการลบสินค้าที่ถูกเลือก?"; $lang["items_cost_price"] = "ราคาทุน"; $lang["items_cost_price_number"] = "ราคาทุนต้องเป็นตัวเลข"; diff --git a/application/language/tr/items_lang.php b/application/language/tr/items_lang.php index e3ae89279..ec66a3120 100644 --- a/application/language/tr/items_lang.php +++ b/application/language/tr/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Tümünde dip nota izin ver $lang["items_change_all_to_serialized"] = "Tümünü seri numaralı yap"; $lang["items_change_all_to_unserialized"] = "Tümünü seri numarasız yap"; $lang["items_confirm_bulk_edit"] = "Seçili tüm ürünleri düzenlemek istediğinize emin misiniz?"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "Seçili ürünleri silmek istediğinize emin misiniz?"; $lang["items_cost_price"] = "Maliyet Fiyatı"; $lang["items_cost_price_number"] = "Fiyat sayı olmalıdır (9.90)"; diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php index b938c985e..c4a6c0459 100755 --- a/application/language/zh/items_lang.php +++ b/application/language/zh/items_lang.php @@ -16,6 +16,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "不允許全部ALT倒序"; $lang["items_change_all_to_serialized"] = "全部更改序號至序列化"; $lang["items_change_all_to_unserialized"] = "全部更改序號至非序列化"; $lang["items_confirm_bulk_edit"] = "您確定您要編輯的所有選定的產品嗎？"; +$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!"; $lang["items_confirm_delete"] = "你確定你要刪除選定的產品嗎？"; $lang["items_cost_price"] = "成本價"; $lang["items_cost_price_number"] = "成本價必需是數值"; diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php index 9fed7b48f..117056665 100644 --- a/application/views/items/form_bulk.php +++ b/application/views/items/form_bulk.php @@ -84,7 +84,7 @@ echo form_open('items/bulk_update/',array('id'=>'item_form')); 'name'=>'tax_names[]', 'id'=>'tax_name_2', 'size'=>'8', - 'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->lang->line('items_sales_tax_2')) + 'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->lang->line('items_sales_tax_2'),) );?>
@@ -162,11 +162,19 @@ $(document).ready(function() { }); $("#category").search(); - + + var confirm_message = "lang->line('items_confirm_bulk_edit') ?>"; + $("#tax_percent_name_2, #tax_name_2").prop('disabled', true), + $("#tax_percent_name_1").blur(function() { + var enabled = !$(this).val(); + $("#tax_percent_name_2, #tax_name_2").prop('disabled', enabled); + confirm_message = confirm_message + " lang->line('items_confirm_bulk_edit_wipe_taxes') ?>"; + }); + $('#item_form').validate({ submitHandler:function(form) { - if(confirm("lang->line('items_confirm_bulk_edit') ?>")) + if(confirm(confirm_message)) { //Get the selected ids and create hidden fields to send with ajax submit. var selected_item_ids=get_selected_values(); diff --git a/translations/items_lang.csv b/translations/items_lang.csv index 8aa7e8bfa..38541e57e 100644 --- a/translations/items_lang.csv +++ b/translations/items_lang.csv @@ -15,6 +15,7 @@ items_change_all_to_not_allow_allow_desc,Ändere alle zu NICHT Erlaube Alt. Bez. items_change_all_to_serialized,Ändere alle zu serialisiert,Genummerd,Cambiar Todo A Serializado,Change All To Serialized,Tout Sérialiser,全部更改序號至序列化,Изменить все в сериализованную,เปลี่ยนแปลงรหัสสินค้าทั้งหมด,Tümünü seri numaralı yap,Ubah semua menggunakan nomor serial items_change_all_to_unserialized,Ändere alle zu nicht serialisiert,Niet genummerd,Cambiar Todo A Deserializado,Change All To Unserialized,Tout désérialiser,全部更改序號至非序列化,Изменить все в несериализованную,ลบรหัสสินค้าทั้งหมด,Tümünü seri numarasız yap,Ubah semua tanpa nomor serial items_confirm_bulk_edit,Wollen Sie alle gewählten Artikel ändern?,Bent u zeker dat u de geselecteerde producten wil aanpassen?,¿Estás seguro(a) de querer editar los artículos seleccionados?,Are you sure you want to edit all the items selected?,Etes vous sûre de vouloir éditer toute la sélection?,您確定您要編輯的所有選定的產品嗎？,"Вы уверены, что хотите редактировать все товари выбраны?",แน่ใจหรือไม่ที่จะแก้ใขสินค้าทั้งหมดที่คุณเลือก?,Seçili tüm ürünleri düzenlemek istediğinize emin misiniz?,Apakah Anda yakin ingin merubah semua item yang dipilih? +items_confirm_bulk_edit_wipe_taxes,All item tax information will be replaced!,Alle taxgegevens zullen overschreven worden!,All item tax information will be replaced!,All item tax information will be replaced!,All item tax information will be replaced!,All item tax information will be replaced!,All item tax information will be replaced!,All item tax information will be replaced!,All item tax information will be replaced!,All item tax information will be replaced! items_confirm_delete,Wollen Sie alle gewählten Artikel löschen?,Bent u zeker dat u de geselecteerde producten wil verwijderen?,¿Estás seguro(a) de querer borrar los artículos seleccionados?,Are you sure you want to delete the selected items?,Etes vous sûre de vouloir supprimer la sélection?,你確定你要刪除選定的產品嗎？,"Вы уверены, что хотите удалить выбранные товари?",โปรดยืนยันการลบสินค้าที่ถูกเลือก?,Seçili ürünleri silmek istediğinize emin misiniz?,Apakah Anda yakin ingin menghapus item yang dipilih? items_cost_price,Einstandspreis,Aankoopprijs,Precio de Compra,Cost Price,Prix de Gros,成本價,Оптовая Цена,ราคาทุน,Maliyet Fiyatı,Harga Pokok items_cost_price_number,Einstandspresi muss eine Zahl sein,Kostprijs moet een cijfer zijn,Precio de Compra debe ser número,Cost price must be a number,Le Prix d\'achat doit etre un nombre,成本價必需是數值,Оптовая цена должно быть число,ราคาทุนต้องเป็นตัวเลข,Fiyat sayı olmalıdır (9.90),Biaya Item harus angka