diff --git a/application/controllers/Item_kits.php b/application/controllers/Item_kits.php index 050689ae6..8793bde90 100644 --- a/application/controllers/Item_kits.php +++ b/application/controllers/Item_kits.php @@ -100,6 +100,7 @@ class Item_kits extends Secure_Controller $info->price_option = '0'; $info->print_option = PRINT_ALL; $info->kit_item_id = 0; + $info->item_number = ''; } foreach(get_object_vars($info) as $property => $value) { @@ -116,6 +117,7 @@ class Item_kits extends Secure_Controller $item['item_id'] = $this->xss_clean($item_kit_item['item_id']); $item['quantity'] = $this->xss_clean($item_kit_item['quantity']); + $items[] = $item; } @@ -131,6 +133,7 @@ class Item_kits extends Secure_Controller { $item_kit_data = array( 'name' => $this->input->post('name'), + 'item_kit_number' => $this->input->post('item_kit_number'), 'item_id' => $this->input->post('kit_item_id'), 'kit_discount' => $this->input->post('kit_discount'), 'kit_discount_type' => $this->input->post('kit_discount_type') == NULL ? PERCENT : $this->input->post('kit_discount_type'), @@ -141,7 +144,6 @@ class Item_kits extends Secure_Controller if($this->Item_kit->save($item_kit_data, $item_kit_id)) { - $success = TRUE; $new_item = FALSE; //New item kit if($item_kit_id == -1) @@ -205,6 +207,12 @@ class Item_kits extends Secure_Controller 'message' => $this->lang->line('item_kits_cannot_be_deleted'))); } } + + public function check_item_number() + { + $exists = $this->Item_kit->item_number_exists($this->input->post('item_kit_number'), $this->input->post('item_kit_id')); + echo !$exists ? 'true' : 'false'; + } public function generate_barcodes($item_kit_ids) { diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 2d1f65fa8..49c7b08be 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -411,7 +411,8 @@ class Sales extends Secure_Controller { // Add kit item to order if one is assigned $pieces = explode(' ', $item_id_or_number_or_item_kit_or_receipt); - $item_kit_id = $pieces[1]; + + $item_kit_id = (count($pieces) > 1) ? $pieces[1] : $item_id_or_number_or_item_kit_or_receipt; $item_kit_info = $this->Item_kit->get_info($item_kit_id); $kit_item_id = $item_kit_info->kit_item_id; $kit_price_option = $item_kit_info->price_option; diff --git a/application/helpers/tabular_helper.php b/application/helpers/tabular_helper.php index bcc2314b8..6954cf6c3 100644 --- a/application/helpers/tabular_helper.php +++ b/application/helpers/tabular_helper.php @@ -503,6 +503,7 @@ function get_item_kits_manage_table_headers() $headers = array( array('item_kit_id' => $CI->lang->line('item_kits_kit')), + array('item_kit_number' => $CI->lang->line('item_kits_item_kit_number')), array('name' => $CI->lang->line('item_kits_name')), array('description' => $CI->lang->line('item_kits_description')), array('total_cost_price' => $CI->lang->line('items_cost_price'), 'sortable' => FALSE), @@ -523,6 +524,7 @@ function get_item_kit_data_row($item_kit) return array ( 'item_kit_id' => $item_kit->item_kit_id, + 'item_kit_number' => $item_kit->item_kit_number, 'name' => $item_kit->name, 'description' => $item_kit->description, 'total_cost_price' => to_currency($item_kit->total_cost_price), diff --git a/application/language/ar-EG/common_lang.php b/application/language/ar-EG/common_lang.php index 84604e7aa..cb7dbc382 100644 --- a/application/language/ar-EG/common_lang.php +++ b/application/language/ar-EG/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "الأول"; $lang["common_gender"] = "النوع"; $lang["common_gender_female"] = "أنثى"; $lang["common_gender_male"] = "ذكر"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "كود"; $lang["common_import"] = "استيراد"; $lang["common_import_change_file"] = "تغيير"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "قائمة بـ"; $lang["common_logout"] = "خروج"; $lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول."; $lang["common_new"] = "جديد"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم."; $lang["common_none_selected_text"] = "[إختيار]"; $lang["common_or"] = "أو"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "عرض أحدث المبيعات"; $lang["common_website"] = "الموقع الإلكترونى"; $lang["common_welcome"] = "مرحباً"; $lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale"; $lang["common_zip"] = "الرقم البريدى"; diff --git a/application/language/ar-EG/item_kits_lang.php b/application/language/ar-EG/item_kits_lang.php index 1499e5732..3f7e06a3b 100644 --- a/application/language/ar-EG/item_kits_lang.php +++ b/application/language/ar-EG/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "خطاء فى إضافة/تحديث $lang["item_kits_find_kit_item"] = "صنف لمجموعة"; $lang["item_kits_info"] = "معلومات المجموعة"; $lang["item_kits_item"] = "صنف"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "أصناف"; $lang["item_kits_kit"] = "كود المجموعة"; $lang["item_kits_kit_and_components"] = "المجموعة ومحتوياتها"; diff --git a/application/language/ar-LB/common_lang.php b/application/language/ar-LB/common_lang.php index 84604e7aa..cb7dbc382 100644 --- a/application/language/ar-LB/common_lang.php +++ b/application/language/ar-LB/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "الأول"; $lang["common_gender"] = "النوع"; $lang["common_gender_female"] = "أنثى"; $lang["common_gender_male"] = "ذكر"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "كود"; $lang["common_import"] = "استيراد"; $lang["common_import_change_file"] = "تغيير"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "قائمة بـ"; $lang["common_logout"] = "خروج"; $lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول."; $lang["common_new"] = "جديد"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "لا يوجد اناس لعرضهم."; $lang["common_none_selected_text"] = "[إختيار]"; $lang["common_or"] = "أو"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "عرض أحدث المبيعات"; $lang["common_website"] = "الموقع الإلكترونى"; $lang["common_welcome"] = "مرحباً"; $lang["common_welcome_message"] = "مرحباً فى OSPOS برجاء إختيار أى قسم للبدء."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "أنت تستخدم إصدار Open Source Point Of Sale"; $lang["common_zip"] = "الرقم البريدى"; diff --git a/application/language/ar-LB/item_kits_lang.php b/application/language/ar-LB/item_kits_lang.php index 1499e5732..3f7e06a3b 100644 --- a/application/language/ar-LB/item_kits_lang.php +++ b/application/language/ar-LB/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "خطاء فى إضافة/تحديث $lang["item_kits_find_kit_item"] = "صنف لمجموعة"; $lang["item_kits_info"] = "معلومات المجموعة"; $lang["item_kits_item"] = "صنف"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "أصناف"; $lang["item_kits_kit"] = "كود المجموعة"; $lang["item_kits_kit_and_components"] = "المجموعة ومحتوياتها"; diff --git a/application/language/az-AZ/common_lang.php b/application/language/az-AZ/common_lang.php index 683932ea2..8f12756d8 100644 --- a/application/language/az-AZ/common_lang.php +++ b/application/language/az-AZ/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Birinci"; $lang["common_gender"] = "Cins"; $lang["common_gender_female"] = "Q"; $lang["common_gender_male"] = "K"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "ID"; $lang["common_import"] = "Daxil et"; $lang["common_import_change_file"] = "Dəyiş"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Siyahısı"; $lang["common_logout"] = "Çıxış"; $lang["common_migration_needed"] = "Girişdən sonra bazaya %1 köçməsi başlayacaq."; $lang["common_new"] = "Yenisi"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Göstərmək üçün heç kim yoxdur."; $lang["common_none_selected_text"] = "Seçin"; $lang["common_or"] = "Və ya"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Son Satışları Göstər"; $lang["common_website"] = "Veb Sayt"; $lang["common_welcome"] = "Xoş Gəlmisiniz"; $lang["common_welcome_message"] = "ALSAN-a Xoş gəlmisiniz, başlamaq üçün bir modula basın."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Açıq Layihədə Satışın Avtomatlaşdırma Nöqtəsi versiya"; $lang["common_zip"] = "Poçt Kodu"; diff --git a/application/language/az-AZ/item_kits_lang.php b/application/language/az-AZ/item_kits_lang.php index 671abf4be..87bb23640 100644 --- a/application/language/az-AZ/item_kits_lang.php +++ b/application/language/az-AZ/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Malı yeniləməkdə və ya əlavə $lang["item_kits_find_kit_item"] = "Mal Dəsti"; $lang["item_kits_info"] = "Mal Dəsti haqqında informasiya"; $lang["item_kits_item"] = "Maddə"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Mallar"; $lang["item_kits_kit"] = "Dəstin İd"; $lang["item_kits_kit_and_components"] = "Dəst və Komponentlər"; diff --git a/application/language/bg/common_lang.php b/application/language/bg/common_lang.php index 928b9ca04..5bfe6dfcd 100644 --- a/application/language/bg/common_lang.php +++ b/application/language/bg/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Първи"; $lang["common_gender"] = "Пол"; $lang["common_gender_female"] = "Ж"; $lang["common_gender_male"] = "М"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Номер"; $lang["common_import"] = "Внос"; $lang["common_import_change_file"] = "Промяна"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Списък с"; $lang["common_logout"] = "Излизане от профила"; $lang["common_migration_needed"] = ""; $lang["common_new"] = "Нов"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Няма хора за показване."; $lang["common_none_selected_text"] = "Нищо не е избрано."; $lang["common_or"] = "Или"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Преглед на последните п $lang["common_website"] = "Уебсайт"; $lang["common_welcome"] = "Добре дошли"; $lang["common_welcome_message"] = "Добре дошли в OSPOS, кликнете върху модул по-долу, за да започнете."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Вие използвате Open Source Point Оf Sale версия"; $lang["common_zip"] = "Пощенски код"; diff --git a/application/language/bg/item_kits_lang.php b/application/language/bg/item_kits_lang.php index f7c1ea45d..7e950c1cc 100644 --- a/application/language/bg/item_kits_lang.php +++ b/application/language/bg/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Item Kit add or update failed."; $lang["item_kits_find_kit_item"] = "Kit Item"; $lang["item_kits_info"] = "Item Kit Info"; $lang["item_kits_item"] = "Item"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Items"; $lang["item_kits_kit"] = "Kit ID"; $lang["item_kits_kit_and_components"] = "Kit and Components"; diff --git a/application/language/cs/common_lang.php b/application/language/cs/common_lang.php index 7c2f726fa..3d4f339e1 100644 --- a/application/language/cs/common_lang.php +++ b/application/language/cs/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "První"; $lang["common_gender"] = "Pohlaví"; $lang["common_gender_female"] = "Ž"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Změnit"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Seznam"; $lang["common_logout"] = "Odhlásit"; $lang["common_migration_needed"] = ""; $lang["common_new"] = "Nový"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Žádní zákazníci k zobrazení."; $lang["common_none_selected_text"] = "bez výběru"; $lang["common_or"] = "Nebo"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Zobrazit nedávné prodeje"; $lang["common_website"] = "www-stránky"; $lang["common_welcome"] = "Vítejte"; $lang["common_welcome_message"] = "Vítejte v OSPOS, vyberte si z modulů dole pro pokračování."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Používáte Open Source Point Of Sale verze"; $lang["common_zip"] = "PSČ"; diff --git a/application/language/cs/item_kits_lang.php b/application/language/cs/item_kits_lang.php index 7daa72edd..ae6b1ac74 100644 --- a/application/language/cs/item_kits_lang.php +++ b/application/language/cs/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = ""; $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = ""; $lang["item_kits_item"] = ""; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = ""; $lang["item_kits_kit"] = ""; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/da/common_lang.php b/application/language/da/common_lang.php index eed7519bb..fc7cd5389 100644 --- a/application/language/da/common_lang.php +++ b/application/language/da/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Første"; $lang["common_gender"] = "Køn"; $lang["common_gender_female"] = "Kvinde"; $lang["common_gender_male"] = "Mand"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Skift"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Liste af"; $lang["common_logout"] = "Log ud"; $lang["common_migration_needed"] = "En database migration til %1 vil starte efter du er logget ind."; $lang["common_new"] = "Ny"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Der er ingen folk at vise."; $lang["common_none_selected_text"] = "[Vælg]"; $lang["common_or"] = "ELLER"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Se seneste salg"; $lang["common_website"] = "Hjemmeside"; $lang["common_welcome"] = "Velkommen"; $lang["common_welcome_message"] = "Velkommen til OSPOS. Klik på et modul forneden for at komme i gang."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale version"; $lang["common_zip"] = "Postnummer"; diff --git a/application/language/da/item_kits_lang.php b/application/language/da/item_kits_lang.php index 7daa72edd..ae6b1ac74 100644 --- a/application/language/da/item_kits_lang.php +++ b/application/language/da/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = ""; $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = ""; $lang["item_kits_item"] = ""; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = ""; $lang["item_kits_kit"] = ""; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/de-CH/common_lang.php b/application/language/de-CH/common_lang.php index 22ac7dad1..c27c3750f 100644 --- a/application/language/de-CH/common_lang.php +++ b/application/language/de-CH/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Erste"; $lang["common_gender"] = "Geschlecht"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Change"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Liste von"; $lang["common_logout"] = "Logout"; $lang["common_migration_needed"] = ""; $lang["common_new"] = "Neu"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Keine Personen zum Anzeigen"; $lang["common_none_selected_text"] = "Nothing selected"; $lang["common_or"] = "Oder"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Letzte Verkäufe"; $lang["common_website"] = "Website"; $lang["common_welcome"] = "Willkommen"; $lang["common_welcome_message"] = "Willkommen bei OSPOS, zum Beginnen auf ein Modul klicken"; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Sie verwenden Open Source Point Of Sale Version"; $lang["common_zip"] = "PLZ"; diff --git a/application/language/de-CH/item_kits_lang.php b/application/language/de-CH/item_kits_lang.php index 920a49fa6..543c17a73 100644 --- a/application/language/de-CH/item_kits_lang.php +++ b/application/language/de-CH/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern"; $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = "Artikel-Set Information"; $lang["item_kits_item"] = "Artikel"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Artikel"; $lang["item_kits_kit"] = "Set-ID"; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/de/common_lang.php b/application/language/de/common_lang.php index 2f7ed029a..71641510c 100644 --- a/application/language/de/common_lang.php +++ b/application/language/de/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Erste"; $lang["common_gender"] = "Geschlecht"; $lang["common_gender_female"] = "W"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "ID"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Ändern"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Liste von"; $lang["common_logout"] = "Ausloggen"; $lang["common_migration_needed"] = "Eine Datenbankmigration auf %1 wird nach der Anmeldung gestartet."; $lang["common_new"] = "Neu"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Keine Personen zum Anzeigen."; $lang["common_none_selected_text"] = "[auswählen]"; $lang["common_or"] = "Oder"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Letzte Verkäufe"; $lang["common_website"] = "Website"; $lang["common_welcome"] = "Willkommen"; $lang["common_welcome_message"] = "Willkommen bei OSPOS, zum Beginnen auf ein Modul klicken."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Sie verwenden Open Source Point Of Sale Version"; $lang["common_zip"] = "PLZ"; diff --git a/application/language/de/item_kits_lang.php b/application/language/de/item_kits_lang.php index edb96f6cf..d07e9a27d 100644 --- a/application/language/de/item_kits_lang.php +++ b/application/language/de/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern."; $lang["item_kits_find_kit_item"] = "Artikel-Set"; $lang["item_kits_info"] = "Artikel-Set Information"; $lang["item_kits_item"] = "Artikel"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Artikel"; $lang["item_kits_kit"] = "Set-ID"; $lang["item_kits_kit_and_components"] = "Set und Komponenten"; diff --git a/application/language/el/common_lang.php b/application/language/el/common_lang.php index 00ce2b511..b73b43bf3 100644 --- a/application/language/el/common_lang.php +++ b/application/language/el/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Πρώτο"; $lang["common_gender"] = "Φύλο"; $lang["common_gender_female"] = "Θ"; $lang["common_gender_male"] = "Α"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Εισαγωγή"; $lang["common_import_change_file"] = "Αλλαγή"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Λίστα από"; $lang["common_logout"] = "Έξοδος"; $lang["common_migration_needed"] = "Η ενσωμάτωση της βάσης δεδομένων σε %1 θα ξεκινήσει μετά την είσοδο."; $lang["common_new"] = "Νέο"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Δεν υπάρχουν άνθρωποι για προβολή."; $lang["common_none_selected_text"] = "[Επιλογή]"; $lang["common_or"] = "Ή"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Εμφάνιση Πρόσφατων Πωλ $lang["common_website"] = "Ιστοσελίδα"; $lang["common_welcome"] = "Καλωσήρθατε"; $lang["common_welcome_message"] = "Καλωσορίσατε στο OSPOS, επιλέξτε μια από τις παρακάτω ενότητες για να ξεκινήσετε."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Χρησιμοποιείτε την Open Source Point Of Sale έκδοση"; $lang["common_zip"] = "Ταχ.Κωδικας"; diff --git a/application/language/el/item_kits_lang.php b/application/language/el/item_kits_lang.php index 7daa72edd..ae6b1ac74 100644 --- a/application/language/el/item_kits_lang.php +++ b/application/language/el/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = ""; $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = ""; $lang["item_kits_item"] = ""; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = ""; $lang["item_kits_kit"] = ""; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/en-GB/common_lang.php b/application/language/en-GB/common_lang.php index aca74ff58..230b76ba3 100644 --- a/application/language/en-GB/common_lang.php +++ b/application/language/en-GB/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "First"; $lang["common_gender"] = "Gender"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Change"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "List of"; $lang["common_logout"] = "Logout"; $lang["common_migration_needed"] = "A database migration to %1 will start after login"; $lang["common_new"] = "New"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "There are no people to display"; $lang["common_none_selected_text"] = "[Select]"; $lang["common_or"] = "OR"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "View Recent Sales"; $lang["common_website"] = "opensourcepos.org"; $lang["common_welcome"] = "Welcome"; $lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started"; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = ""; $lang["common_zip"] = "Post Code"; diff --git a/application/language/en-GB/item_kits_lang.php b/application/language/en-GB/item_kits_lang.php index fff6a6b09..362b89a77 100644 --- a/application/language/en-GB/item_kits_lang.php +++ b/application/language/en-GB/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Item Kit add or update failed"; $lang["item_kits_find_kit_item"] = "Kit Item"; $lang["item_kits_info"] = "Item Kit Info"; $lang["item_kits_item"] = "Item"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = "Barcode"; $lang["item_kits_items"] = "Items"; $lang["item_kits_kit"] = "Kit ID"; $lang["item_kits_kit_and_components"] = "Kit and Components"; diff --git a/application/language/en-US/common_lang.php b/application/language/en-US/common_lang.php index 1e80b3a72..121fe347d 100644 --- a/application/language/en-US/common_lang.php +++ b/application/language/en-US/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "First"; $lang["common_gender"] = "Gender"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Change"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "List of"; $lang["common_logout"] = "Logout"; $lang["common_migration_needed"] = "A database migration to %1 will start after login."; $lang["common_new"] = "New"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "There are no people to display."; $lang["common_none_selected_text"] = "[Select]"; $lang["common_or"] = "OR"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "View Recent Sales"; $lang["common_website"] = "opensourcepos.org"; $lang["common_welcome"] = "Welcome"; $lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = ""; $lang["common_zip"] = "Postal Code"; diff --git a/application/language/en-US/item_kits_lang.php b/application/language/en-US/item_kits_lang.php index 116f24198..7a40be2c7 100644 --- a/application/language/en-US/item_kits_lang.php +++ b/application/language/en-US/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Item Kit add or update failed."; $lang["item_kits_find_kit_item"] = "Kit Item"; $lang["item_kits_info"] = "Item Kit Info"; $lang["item_kits_item"] = "Item"; +$lang["item_kits_item_kit_number"] = "Barcode"; +$lang["item_kits_item_kit_number_duplicate"] = "Item Kit Number is already present in the database."; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Items"; $lang["item_kits_kit"] = "Kit ID"; $lang["item_kits_kit_and_components"] = "Kit and Components"; diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php index 3bc39b24a..475d707b3 100644 --- a/application/language/es/common_lang.php +++ b/application/language/es/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Primera"; $lang["common_gender"] = "Género"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Importar"; $lang["common_import_change_file"] = "Cambiar"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Lista de"; $lang["common_logout"] = "Salir"; $lang["common_migration_needed"] = "La migración de la base de datos hacia %1 comenzará después de iniciar sesión."; $lang["common_new"] = "Nuevo"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "No hay nadie que mostrar."; $lang["common_none_selected_text"] = "Seleccionar"; $lang["common_or"] = "Ó"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Ver Ventas Recientes"; $lang["common_website"] = "sitio"; $lang["common_welcome"] = "Bienvenido(a)"; $lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. ¡Haz click en algún módulo, para empezar."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Estás usando Open Source Point Of Sale Versión"; $lang["common_zip"] = "Código Postal"; diff --git a/application/language/es/item_kits_lang.php b/application/language/es/item_kits_lang.php index 3ff04b72f..e2707a5bc 100644 --- a/application/language/es/item_kits_lang.php +++ b/application/language/es/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Error agregando/actualizando Kit de $lang["item_kits_find_kit_item"] = "Kit de Artículo"; $lang["item_kits_info"] = "Info de Kit de Artículos"; $lang["item_kits_item"] = "Artículo"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Artículos"; $lang["item_kits_kit"] = "Id Kit"; $lang["item_kits_kit_and_components"] = "Artículos y componentes"; diff --git a/application/language/es_MX/common_lang.php b/application/language/es_MX/common_lang.php index 563951816..c0f53bc2f 100644 --- a/application/language/es_MX/common_lang.php +++ b/application/language/es_MX/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Primero"; $lang["common_gender"] = "Género"; $lang["common_gender_female"] = "M"; $lang["common_gender_male"] = "H"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Importar"; $lang["common_import_change_file"] = "Cambiar"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Lista de"; $lang["common_logout"] = "Cerrar Sesión"; $lang["common_migration_needed"] = "La migración de la base de datos a %1 comenzará luego de acceder."; $lang["common_new"] = "Nuevo(a)"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "No existen personas para mostrar."; $lang["common_none_selected_text"] = "[Seleccionar]"; $lang["common_or"] = "O"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Ver Ventas Recientes"; $lang["common_website"] = "sitio web"; $lang["common_welcome"] = "Bienvenido(a)"; $lang["common_welcome_message"] = "Bienvenido(a) a OSPOS, haga clic en algún módulo para comenzar."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Está utilizando la versión de Código Abierto de Punto de Venta"; $lang["common_zip"] = "CP"; diff --git a/application/language/es_MX/item_kits_lang.php b/application/language/es_MX/item_kits_lang.php index 7daa72edd..ae6b1ac74 100644 --- a/application/language/es_MX/item_kits_lang.php +++ b/application/language/es_MX/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = ""; $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = ""; $lang["item_kits_item"] = ""; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = ""; $lang["item_kits_kit"] = ""; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/fa-IR/common_lang.php b/application/language/fa-IR/common_lang.php index 5e97f72d8..916025dd7 100644 --- a/application/language/fa-IR/common_lang.php +++ b/application/language/fa-IR/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "اولین"; $lang["common_gender"] = "جنس"; $lang["common_gender_female"] = "خانم"; $lang["common_gender_male"] = "آقا"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "شناسه"; $lang["common_import"] = "وارد كردن"; $lang["common_import_change_file"] = "تغییر"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "فهرست"; $lang["common_logout"] = "خروج"; $lang["common_migration_needed"] = "انتقال پایگاه داده به٪ 1 پس از ورود به سیستم آغاز می شود."; $lang["common_new"] = "جدید"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "هیچ کس برای نمایش وجود ندارد."; $lang["common_none_selected_text"] = "[Select]"; $lang["common_or"] = "یا"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "مشاهده فروش اخیر"; $lang["common_website"] = "openourcepos.org"; $lang["common_welcome"] = "خوش آمدی"; $lang["common_welcome_message"] = "به اوسپوس خوش آمدید ، برای شروع کار ماژول زیر را کلیک کنید"; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = ""; $lang["common_zip"] = "کد پستی"; diff --git a/application/language/fa-IR/item_kits_lang.php b/application/language/fa-IR/item_kits_lang.php index c8804c7ec..f3a761a5d 100644 --- a/application/language/fa-IR/item_kits_lang.php +++ b/application/language/fa-IR/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "افزودن یا به روزرسا $lang["item_kits_find_kit_item"] = "مورد کیت"; $lang["item_kits_info"] = "اطلاعات کیت مورد"; $lang["item_kits_item"] = "مورد"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "موارد"; $lang["item_kits_kit"] = "شناسه کیت"; $lang["item_kits_kit_and_components"] = "کیت و قطعات"; diff --git a/application/language/fr/common_lang.php b/application/language/fr/common_lang.php index e81277d2f..ed2924582 100644 --- a/application/language/fr/common_lang.php +++ b/application/language/fr/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Premier"; $lang["common_gender"] = "Genre"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Changer"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Liste de"; $lang["common_logout"] = "Déconnexion"; $lang["common_migration_needed"] = "Une migration de la base de donnée vers %1 démarrera après le connexion."; $lang["common_new"] = "Nouveau"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Il n'y a personne à afficher."; $lang["common_none_selected_text"] = "[Sélectionner]"; $lang["common_or"] = "OU"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Voir Ventes Récentes"; $lang["common_website"] = "site-web"; $lang["common_welcome"] = "Bienvenue"; $lang["common_welcome_message"] = "Bienvenue à OSPOS, choisissez un module ci-dessous."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Vous utilisez Open Source Point Of Sale Version"; $lang["common_zip"] = "Zip"; diff --git a/application/language/fr/item_kits_lang.php b/application/language/fr/item_kits_lang.php index 2c308c870..569273f19 100644 --- a/application/language/fr/item_kits_lang.php +++ b/application/language/fr/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Érreur d'ajout/édition de groupes. $lang["item_kits_find_kit_item"] = "Article de group"; $lang["item_kits_info"] = "Détails du groupes"; $lang["item_kits_item"] = "Article"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Articles"; $lang["item_kits_kit"] = "Groupes ID"; $lang["item_kits_kit_and_components"] = "Groupes et composants"; diff --git a/application/language/he/common_lang.php b/application/language/he/common_lang.php index 82e3689c7..b5de81c30 100644 --- a/application/language/he/common_lang.php +++ b/application/language/he/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "ראשון"; $lang["common_gender"] = "מין"; $lang["common_gender_female"] = "נקבה"; $lang["common_gender_male"] = "זכר"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "מספר זיהוי"; $lang["common_import"] = "ייבוא"; $lang["common_import_change_file"] = "שינוי"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "רשימה של"; $lang["common_logout"] = "התנתק"; $lang["common_migration_needed"] = "העברת נתונים ל-%1 תתחיל לאחר הכניסה למערכת."; $lang["common_new"] = "חדש"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "אין אנשים להצגה."; $lang["common_none_selected_text"] = "[בחר]"; $lang["common_or"] = "או"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "הצג מכירות אחרונות"; $lang["common_website"] = "אתר"; $lang["common_welcome"] = "ברוך הבא"; $lang["common_welcome_message"] = "ברוכים הבאים אל OSPOS, לחץ על מודול למטה כדי להתחיל."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "אתה משתמש בגירסת קוד פתוח של נקודת מכירה"; $lang["common_zip"] = "מיקוד"; diff --git a/application/language/he/item_kits_lang.php b/application/language/he/item_kits_lang.php index 1db2f9606..de68c4449 100644 --- a/application/language/he/item_kits_lang.php +++ b/application/language/he/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "הוספה או עדכון של ער $lang["item_kits_find_kit_item"] = "ערכת פריט"; $lang["item_kits_info"] = "מידע על ערכת פריט"; $lang["item_kits_item"] = "פריט"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "פריטים"; $lang["item_kits_kit"] = "מזהה ערכה"; $lang["item_kits_kit_and_components"] = "ערכה ורכיבים"; diff --git a/application/language/hr-HR/common_lang.php b/application/language/hr-HR/common_lang.php index d39937485..e21456217 100644 --- a/application/language/hr-HR/common_lang.php +++ b/application/language/hr-HR/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Prva"; $lang["common_gender"] = "Spol"; $lang["common_gender_female"] = "Ž"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Uvoz"; $lang["common_import_change_file"] = "Promjena"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Lista"; $lang["common_logout"] = "Odjava"; $lang["common_migration_needed"] = ""; $lang["common_new"] = "Novi"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Nema nijede osoba za prikazati"; $lang["common_none_selected_text"] = "Nothing selected"; $lang["common_or"] = "Ili"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Pogledaj nedavne prodaje"; $lang["common_website"] = "web stranicu"; $lang["common_welcome"] = "Dobrodošli"; $lang["common_welcome_message"] = "Dobrodošli u blagajnu otvorenog koda(OSPOS)"; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Koristite blagajnu otvorenog koda (Open Source Point Of Sale) verziju"; $lang["common_zip"] = "Broj pošte"; diff --git a/application/language/hr-HR/item_kits_lang.php b/application/language/hr-HR/item_kits_lang.php index c24e42d1c..6bef9dbb3 100644 --- a/application/language/hr-HR/item_kits_lang.php +++ b/application/language/hr-HR/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Greška kod dodavanja/ažuriranja no $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = "Info normativa"; $lang["item_kits_item"] = "Artikal"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Stavke normativa"; $lang["item_kits_kit"] = "Normativ br."; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/hu-HU/common_lang.php b/application/language/hu-HU/common_lang.php index 01846f3cc..e9e3a3e33 100644 --- a/application/language/hu-HU/common_lang.php +++ b/application/language/hu-HU/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Első"; $lang["common_gender"] = "Neme"; $lang["common_gender_female"] = "Nő"; $lang["common_gender_male"] = "Ffi"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "ID"; $lang["common_import"] = "Import"; $lang["common_import_change_file"] = "Változtat"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Lista: "; $lang["common_logout"] = "Kilépés"; $lang["common_migration_needed"] = ""; $lang["common_new"] = "Új"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Nincsenek megjeleníthető emberek"; $lang["common_none_selected_text"] = "Nincs kiválaszva"; $lang["common_or"] = "VAGY"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Eladások megtekintése"; $lang["common_website"] = "weboldalt"; $lang["common_welcome"] = "Üdvözlet"; $lang["common_welcome_message"] = "Üdvözli az OSPOS, kattintson a modulokra a kezdéshez!"; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Ön az Open Source Point Of Sale alábbi verzióját használja"; $lang["common_zip"] = "Ir.Szám"; diff --git a/application/language/hu-HU/item_kits_lang.php b/application/language/hu-HU/item_kits_lang.php index 6c2efc183..b83afa26b 100644 --- a/application/language/hu-HU/item_kits_lang.php +++ b/application/language/hu-HU/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Hiba a termékcsomag hozzáadásán $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = "Termékcsomag info"; $lang["item_kits_item"] = "Termék"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Termékek"; $lang["item_kits_kit"] = "Csomag ID"; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/hy/common_lang.php b/application/language/hy/common_lang.php index fa63bf1c3..da6440fce 100644 --- a/application/language/hy/common_lang.php +++ b/application/language/hy/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = ""; $lang["common_gender"] = ""; $lang["common_gender_female"] = ""; $lang["common_gender_male"] = ""; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = ""; $lang["common_import"] = ""; $lang["common_import_change_file"] = ""; @@ -43,6 +44,7 @@ $lang["common_list_of"] = ""; $lang["common_logout"] = ""; $lang["common_migration_needed"] = ""; $lang["common_new"] = ""; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = ""; $lang["common_none_selected_text"] = ""; $lang["common_or"] = ""; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = ""; $lang["common_website"] = ""; $lang["common_welcome"] = ""; $lang["common_welcome_message"] = ""; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = ""; $lang["common_zip"] = ""; diff --git a/application/language/hy/item_kits_lang.php b/application/language/hy/item_kits_lang.php index 7daa72edd..ae6b1ac74 100644 --- a/application/language/hy/item_kits_lang.php +++ b/application/language/hy/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = ""; $lang["item_kits_find_kit_item"] = ""; $lang["item_kits_info"] = ""; $lang["item_kits_item"] = ""; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = ""; $lang["item_kits_kit"] = ""; $lang["item_kits_kit_and_components"] = ""; diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php index 581aa0516..8fc4b547f 100644 --- a/application/language/id/common_lang.php +++ b/application/language/id/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Pertama"; $lang["common_gender"] = "Jenis Kelamin"; $lang["common_gender_female"] = "V"; $lang["common_gender_male"] = "L"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "ID"; $lang["common_import"] = "Impor"; $lang["common_import_change_file"] = "Ubah"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Daftar"; $lang["common_logout"] = "Keluar"; $lang["common_migration_needed"] = "Migrasi data pada %1 akan dimulai setelah masuk."; $lang["common_new"] = "Baru"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Tidak ada orang untuk ditampilkan."; $lang["common_none_selected_text"] = "[Pilih]"; $lang["common_or"] = "ATAU"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Lihat Penjualan Terkini"; $lang["common_website"] = "Situs"; $lang["common_welcome"] = "Selamat Datang"; $lang["common_welcome_message"] = "Selamat Datang, klik modul di bawah ini untuk memulai."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Anda menggunakan Open Source Point Of Sale Versi"; $lang["common_zip"] = "Kode POS"; diff --git a/application/language/id/item_kits_lang.php b/application/language/id/item_kits_lang.php index 803241fcf..2735da196 100644 --- a/application/language/id/item_kits_lang.php +++ b/application/language/id/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Tambah/Ubah Item Paket tidak berhasi $lang["item_kits_find_kit_item"] = "Paket Item"; $lang["item_kits_info"] = "Item Paket Info"; $lang["item_kits_item"] = "Item Barang"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Item Barang"; $lang["item_kits_kit"] = "ID Paket"; $lang["item_kits_kit_and_components"] = "Kit dan komponen"; diff --git a/application/language/it/common_lang.php b/application/language/it/common_lang.php index 15838047d..c6a82332f 100644 --- a/application/language/it/common_lang.php +++ b/application/language/it/common_lang.php @@ -27,6 +27,7 @@ $lang["common_first_page"] = "Primo"; $lang["common_gender"] = "Sesso"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; +$lang["common_gender_undefined"] = ""; $lang["common_id"] = "Id"; $lang["common_import"] = "Importa"; $lang["common_import_change_file"] = "Sostituisci"; @@ -43,6 +44,7 @@ $lang["common_list_of"] = "Lista di"; $lang["common_logout"] = "Esci"; $lang["common_migration_needed"] = ""; $lang["common_new"] = "Nuovo"; +$lang["common_no"] = ""; $lang["common_no_persons_to_display"] = "Non ci sono persone da mostrare."; $lang["common_none_selected_text"] = "Nessuna selezione."; $lang["common_or"] = "OR"; @@ -67,5 +69,6 @@ $lang["common_view_recent_sales"] = "Mostra Vendite Recenti"; $lang["common_website"] = "Sito web"; $lang["common_welcome"] = "Benvenuto"; $lang["common_welcome_message"] = "Benvenuto in OSPOS, clicca su un modulo sottostante per incominciare."; +$lang["common_yes"] = ""; $lang["common_you_are_using_ospos"] = "Stai usando la versione Open Source Point Of Sale (Punto di vendita)"; $lang["common_zip"] = "CAP"; diff --git a/application/language/it/item_kits_lang.php b/application/language/it/item_kits_lang.php index a4b5b7073..920098f08 100644 --- a/application/language/it/item_kits_lang.php +++ b/application/language/it/item_kits_lang.php @@ -14,6 +14,9 @@ $lang["item_kits_error_adding_updating"] = "Aggiunta o modifica Kit Articoli fal $lang["item_kits_find_kit_item"] = "Kit Articoli"; $lang["item_kits_info"] = "Informazioni Kit"; $lang["item_kits_item"] = "Articolo"; +$lang["item_kits_item_kit_number"] = ""; +$lang["item_kits_item_kit_number_duplicate"] = ""; +$lang["item_kits_item_number"] = ""; $lang["item_kits_items"] = "Articoli"; $lang["item_kits_kit"] = "Kit ID"; $lang["item_kits_kit_and_components"] = "Kit e Componenti"; diff --git a/application/language/km/cashups_lang.php b/application/language/km/cashups_lang.php index f15c4df8a..817e900eb 100644 --- a/application/language/km/cashups_lang.php +++ b/application/language/km/cashups_lang.php @@ -1,4 +1,5 @@ - 1 ? $pieces[1] : $external_item_kit_id; foreach($this->CI->Item_kit_items->get_info($item_kit_id) as $item_kit_item) { diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index 567674ec7..f08b75458 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -1032,7 +1032,7 @@ class Sale_lib { //KIT # $pieces = explode(' ', $external_item_kit_id); - $item_kit_id = $pieces[1]; + $item_kit_id = (count($pieces) > 1) ? $pieces[1] : $external_item_kit_id; $result = TRUE; foreach($this->CI->Item_kit_items->get_info($item_kit_id) as $item_kit_item) diff --git a/application/migrations/20201110000000_add_item_kit_number.php b/application/migrations/20201110000000_add_item_kit_number.php new file mode 100644 index 000000000..dc66eaf19 --- /dev/null +++ b/application/migrations/20201110000000_add_item_kit_number.php @@ -0,0 +1,23 @@ + \ No newline at end of file diff --git a/application/migrations/sqlscripts/3.3.3_add_kits_item_number.sql b/application/migrations/sqlscripts/3.3.3_add_kits_item_number.sql new file mode 100644 index 000000000..9eb7bc437 --- /dev/null +++ b/application/migrations/sqlscripts/3.3.3_add_kits_item_number.sql @@ -0,0 +1,3 @@ +ALTER TABLE `ospos_item_kits` +ADD COLUMN `item_kit_number` VARCHAR(255) DEFAULT NULL AFTER `item_kit_id`, +ADD KEY `item_kit_number` (`item_kit_number`); \ No newline at end of file diff --git a/application/models/Item_kit.php b/application/models/Item_kit.php index c0e76212f..32faad32c 100644 --- a/application/models/Item_kit.php +++ b/application/models/Item_kit.php @@ -31,11 +31,37 @@ class Item_kit extends CI_Model { return $this->exists($pieces[1]); } + else + { + return $this->item_number_exists($item_kit_id); + } } return FALSE; } + /* + Determines if a given item_number exists + */ + public function item_number_exists($item_kit_number, $item_kit_id = '') + { + if($this->config->item('allow_duplicate_barcodes') != FALSE) + { + return FALSE; + } + + $this->db->from('item_kits'); + $this->db->where('item_kit_number', (string) $item_kit_number); + // check if $item_id is a number and not a string starting with 0 + // because cases like 00012345 will be seen as a number where it is a barcode + if(ctype_digit($item_kit_id) && substr($item_kit_id, 0, 1) != '0') + { + $this->db->where('item_kit_id !=', (int) $item_kit_id); + } + + return ($this->db->get()->num_rows() >= 1); + } + /* Gets total of rows */ @@ -54,6 +80,7 @@ class Item_kit extends CI_Model $this->db->select(' item_kit_id, item_kits.name as name, + item_kit_number, items.name as item_name, item_kits.description, items.description as item_description, @@ -79,6 +106,7 @@ class Item_kit extends CI_Model $this->db->from('item_kits'); $this->db->join('items', 'item_kits.item_id = items.item_id', 'left'); $this->db->where('item_kit_id', $item_kit_id); + $this->db->or_where('item_kit_number', $item_kit_id); $query = $this->db->get(); @@ -140,7 +168,7 @@ class Item_kit extends CI_Model */ public function delete($item_kit_id) { - return $this->db->delete('item_kits', array('item_kit_id' => $id)); + return $this->db->delete('item_kits', array('item_kit_id' => $item_kit_id)); } /* @@ -173,6 +201,7 @@ class Item_kit extends CI_Model else { $this->db->like('name', $search); + $this->db->or_like('item_kit_number', $search); $this->db->order_by('name', 'asc'); foreach($this->db->get()->result() as $row) @@ -212,6 +241,7 @@ class Item_kit extends CI_Model $this->db->from('item_kits AS item_kits'); $this->db->like('name', $search); $this->db->or_like('description', $search); + $this->db->or_like('item_kit_number', $search); //KIT # if(stripos($search, 'KIT ') !== FALSE) diff --git a/application/models/Item_kit_items.php b/application/models/Item_kit_items.php index a683901c4..cd47e4b76 100644 --- a/application/models/Item_kit_items.php +++ b/application/models/Item_kit_items.php @@ -11,10 +11,12 @@ class Item_kit_items extends CI_Model */ public function get_info($item_kit_id) { - $this->db->select('item_kit_id, item_kit_items.item_id, quantity, kit_sequence, unit_price, item_type, stock_type'); + $this->db->select('item_kits.item_kit_id, item_kit_items.item_id, quantity, kit_sequence, unit_price, item_type, stock_type'); $this->db->from('item_kit_items as item_kit_items'); $this->db->join('items as items', 'item_kit_items.item_id = items.item_id'); - $this->db->where('item_kit_id', $item_kit_id); + $this->db->join('item_kits as item_kits', 'item_kits.item_kit_id = item_kit_items.item_kit_id'); + $this->db->where('item_kits.item_kit_id', $item_kit_id); + $this->db->or_where('item_kit_number', $item_kit_id); $this->db->order_by('kit_sequence', 'asc'); //return an array of item kit items for an item diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php index bf7c80f3b..3a2d827f3 100644 --- a/application/views/item_kits/form.php +++ b/application/views/item_kits/form.php @@ -4,6 +4,21 @@ item_kit_id, array('id'=>'item_kit_form', 'class'=>'form-horizontal')); ?>
+
+ lang->line('item_kits_item_kit_number'), 'item_kit_number', array('class'=>'control-label col-xs-3')); ?> +
+
+ + 'item_kit_number', + 'id'=>'item_kit_number', + 'class'=>'form-control input-sm', + 'value'=>$item_kit_info->item_kit_number) + );?> +
+
+
+
lang->line('item_kits_name'), 'name', array('class'=>'required control-label col-xs-3')); ?>
@@ -40,7 +55,6 @@ 'kit_discount_type', 'type'=>'radio', - 'id'=>'kit_discount_type', 'value'=>0, 'checked'=>$item_kit_info->kit_discount_type == PERCENT) ); ?> lang->line('item_kits_discount_percent'); ?> @@ -49,7 +63,6 @@ 'kit_discount_type', 'type'=>'radio', - 'id'=>'kit_discount_type', 'value'=>1, 'checked'=>$item_kit_info->kit_discount_type == FIXED) ); ?> lang->line('item_kits_discount_fixed'); ?> @@ -80,7 +93,6 @@ 'price_option', 'type'=>'radio', - 'id'=>'price_option', 'value'=>0, 'checked'=>$item_kit_info->price_option == PRICE_ALL) ); ?> lang->line('item_kits_kit_and_components'); ?> @@ -89,7 +101,6 @@ 'price_option', 'type'=>'radio', - 'id'=>'price_option', 'value'=>1, 'checked'=>$item_kit_info->price_option == PRICE_KIT) ); ?> lang->line('item_kits_kit_only'); ?> @@ -98,7 +109,6 @@ 'price_option', 'type'=>'radio', - 'id'=>'price_option', 'value'=>2, 'checked'=>$item_kit_info->price_option == PRICE_KIT_ITEMS) ); ?> lang->line('item_kits_kit_and_stock'); ?> @@ -114,7 +124,6 @@ 'print_option', 'type'=>'radio', - 'id'=>'print_option', 'value'=>0, 'checked'=>$item_kit_info->print_option == PRINT_ALL) ); ?> lang->line('item_kits_all'); ?> @@ -123,7 +132,7 @@ 'print_option', 'type'=>'radio', - 'id'=>'print_option', + 'value'=>1, 'value'=>1, 'checked'=>$item_kit_info->print_option == PRINT_PRICED) ); ?> lang->line('item_kits_priced_only'); ?> @@ -132,7 +141,6 @@ 'print_option', 'type'=>'radio', - 'id'=>'print_option', 'value'=>2, 'checked'=>$item_kit_info->print_option == PRINT_KIT) ); ?> lang->line('item_kits_kit_only'); ?> @@ -263,14 +271,32 @@ $(document).ready(function() rules: { name: 'required', - category: 'required' + category: 'required', + item_kit_number: + { + required: false, + remote: + { + url: "", + type: 'POST', + data: + { + 'item_kit_id' : "item_kit_id; ?>", + 'item_kit_number' : function() + { + return $('#item_kit_number').val(); + } + } + } + } }, messages: { name: "lang->line('items_name_required'); ?>", - category: "lang->line('items_category_required'); ?>" - } + category: "lang->line('items_category_required'); ?>", + item_kit_number: "lang->line('item_kits_item_number_duplicate'); ?>" + } }, form_support.error)); });