diff --git a/application/controllers/suppliers.php b/application/controllers/suppliers.php index 8a10fe468..f3346008e 100644 --- a/application/controllers/suppliers.php +++ b/application/controllers/suppliers.php @@ -73,6 +73,7 @@ class Suppliers extends Person_controller ); $supplier_data=array( 'company_name'=>$this->input->post('company_name'), + 'agency_name'=>$this->input->post('agency_name'), 'account_number'=>$this->input->post('account_number')=='' ? null:$this->input->post('account_number'), ); if($this->Supplier->save($person_data,$supplier_data,$supplier_id)) @@ -131,5 +132,5 @@ class Suppliers extends Person_controller { return 360; } -} +} ?> \ No newline at end of file diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 8204570f8..cabf1157b 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -161,10 +161,12 @@ function get_supplier_manage_table($suppliers,$controller) $headers = array('', $CI->lang->line('suppliers_company_name'), - $CI->lang->line('common_last_name'), + $CI->lang->line('suppliers_agency_name'), $CI->lang->line('common_first_name'), + $CI->lang->line('common_last_name'), $CI->lang->line('common_email'), $CI->lang->line('common_phone_number'), + $CI->lang->line('suppliers_supplier_id'), ' '); $table.=''; @@ -208,10 +210,12 @@ function get_supplier_data_row($supplier,$controller) $table_data_row=''; $table_data_row.=""; $table_data_row.=''.character_limiter($supplier->company_name,13).''; - $table_data_row.=''.character_limiter($supplier->last_name,13).''; + $table_data_row.=''.character_limiter($supplier->agency_name,13).''; $table_data_row.=''.character_limiter($supplier->first_name,13).''; + $table_data_row.=''.character_limiter($supplier->last_name,13).''; $table_data_row.=''.mailto($supplier->email,character_limiter($supplier->email,22)).''; - $table_data_row.=''.character_limiter($supplier->phone_number,13).''; + $table_data_row.=''.character_limiter($supplier->phone_number,13).''; + $table_data_row.=''.character_limiter($supplier->person_id,5).''; $table_data_row.=''.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).''; $table_data_row.=''; diff --git a/application/language/en/suppliers_lang.php b/application/language/en/suppliers_lang.php index e7d842c18..ff408b799 100644 --- a/application/language/en/suppliers_lang.php +++ b/application/language/en/suppliers_lang.php @@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Supplier Information"; $lang["suppliers_cannot_be_deleted"] = "Could not deleted selected suppliers, one or more of the selected suppliers has sales."; $lang["suppliers_company_name"] = "Company Name"; $lang["suppliers_company_name_required"] = "Company Name is a required field"; +$lang["suppliers_agency_name"] = "Agency Name"; $lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected suppliers?"; $lang["suppliers_error_adding_updating"] = "Error adding/updating supplier"; $lang["suppliers_new"] = "New Supplier"; @@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "You have successfully added supplier"; $lang["suppliers_successful_deleted"] = "You have successfully deleted"; $lang["suppliers_successful_updating"] = "You have successfully updated supplier"; $lang["suppliers_supplier"] = "Supplier"; +$lang["suppliers_supplier_id"] = "Id"; $lang["suppliers_update"] = "Update Supplier"; diff --git a/application/language/es/suppliers_lang.php b/application/language/es/suppliers_lang.php index c39e463cf..bb01dbdc4 100644 --- a/application/language/es/suppliers_lang.php +++ b/application/language/es/suppliers_lang.php @@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Información de Proveedores"; $lang["suppliers_cannot_be_deleted"] = "No se pudo borrar los proveedores seleccionados. Uno o más de los seleccionados tiene ventas."; $lang["suppliers_company_name"] = "Nombre de la Compañía"; $lang["suppliers_company_name_required"] = "Nombre de la Compañía es requerido"; +$lang["suppliers_agency_name"] = "Nombre de la Agency"; $lang["suppliers_confirm_delete"] = "¿Seguro(a) de querer borrar los proveedores seleccionados?"; $lang["suppliers_error_adding_updating"] = "Error agregando/actualizando proveedor"; $lang["suppliers_new"] = "Nuevo Proveedor"; @@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Has agregado el proveedor satisfactoriam $lang["suppliers_successful_deleted"] = "Has borrado satisfactoriamente a"; $lang["suppliers_successful_updating"] = "Has actualizado el proveedor satisfactoriamente"; $lang["suppliers_supplier"] = "Proveedor"; +$lang["suppliers_supplier_id"] = "Id"; $lang["suppliers_update"] = "Actualizar Proveedor"; diff --git a/application/language/fr/suppliers_lang.php b/application/language/fr/suppliers_lang.php index 6075e1295..467453fa5 100644 --- a/application/language/fr/suppliers_lang.php +++ b/application/language/fr/suppliers_lang.php @@ -5,6 +5,7 @@ $lang["suppliers_basic_information"] = "Informations fournisseur"; $lang["suppliers_cannot_be_deleted"] = "Impossible de supprimer le(s) fournisseur(s) sélectionné(s). Un ou plusieurs ont des ventes."; $lang["suppliers_company_name"] = "Nom d\'Entreprise"; $lang["suppliers_company_name_required"] = "Le Nom d\'Entreprise est un champ requis"; +$lang["suppliers_agency_name"] = "Nom d\'Agence"; $lang["suppliers_confirm_delete"] = "Etes vous sûr(e) de vouloir supprimer ce(s) fournisseur(s)?"; $lang["suppliers_error_adding_updating"] = "Error lors de l\'ajout/suppression de fournisseur"; $lang["suppliers_new"] = "Nouveau Fournisseur"; @@ -14,4 +15,5 @@ $lang["suppliers_successful_adding"] = "Fournisseur ajouté avec succès"; $lang["suppliers_successful_deleted"] = "Suppression réussie"; $lang["suppliers_successful_updating"] = "Fournisseur édité avec succès"; $lang["suppliers_supplier"] = "Fournisseur"; +$lang["suppliers_supplier_id"] = "Id"; $lang["suppliers_update"] = "Éditer Fournisseur"; diff --git a/application/language/id/suppliers_lang.php b/application/language/id/suppliers_lang.php index 707d215d2..101f87d98 100644 --- a/application/language/id/suppliers_lang.php +++ b/application/language/id/suppliers_lang.php @@ -1,17 +1,19 @@ db->from('suppliers'); $this->db->join('people','suppliers.person_id=people.person_id'); $this->db->where('deleted', 0); - $this->db->order_by("last_name", "asc"); + $this->db->order_by("company_name", "asc"); if ($rows > 0) { $this->db->limit($rows, $limit_from); } @@ -151,6 +151,17 @@ class Supplier extends Person $suggestions[]=$row->company_name; } + $this->db->from('suppliers'); + $this->db->join('people','suppliers.person_id=people.person_id'); + $this->db->where('deleted', 0); + $this->db->distinct(); + $this->db->like("agency_name",$search); + $this->db->order_by("agency_name", "asc"); + $by_agency_name = $this->db->get(); + foreach($by_agency_name->result() as $row) + { + $suggestions[]=$row->agency_name; + } $this->db->from('suppliers'); $this->db->join('people','suppliers.person_id=people.person_id'); @@ -225,6 +236,19 @@ class Supplier extends Person } + $this->db->from('suppliers'); + $this->db->join('people','suppliers.person_id=people.person_id'); + $this->db->where('deleted', 0); + $this->db->distinct(); + $this->db->like("agency_name",$search); + $this->db->order_by("agency_name", "asc"); + $by_agency_name = $this->db->get(); + foreach($by_agency_name->result() as $row) + { + $suggestions[]=$row->person_id.'|'.$row->agency_name; + } + + $this->db->from('suppliers'); $this->db->join('people','suppliers.person_id=people.person_id'); $this->db->where("(first_name LIKE '%".$this->db->escape_like_str($search)."%' or @@ -253,6 +277,7 @@ class Supplier extends Person $this->db->where("(first_name LIKE '%".$this->db->escape_like_str($search)."%' or last_name LIKE '%".$this->db->escape_like_str($search)."%' or company_name LIKE '%".$this->db->escape_like_str($search)."%' or + agency_name LIKE '%".$this->db->escape_like_str($search)."%' or email LIKE '%".$this->db->escape_like_str($search)."%' or phone_number LIKE '%".$this->db->escape_like_str($search)."%' or account_number LIKE '%".$this->db->escape_like_str($search)."%' or @@ -270,6 +295,7 @@ class Supplier extends Person $this->db->where("(first_name LIKE '%".$this->db->escape_like_str($search)."%' or last_name LIKE '%".$this->db->escape_like_str($search)."%' or company_name LIKE '%".$this->db->escape_like_str($search)."%' or + agency_name LIKE '%".$this->db->escape_like_str($search)."%' or email LIKE '%".$this->db->escape_like_str($search)."%' or phone_number LIKE '%".$this->db->escape_like_str($search)."%' or account_number LIKE '%".$this->db->escape_like_str($search)."%' or diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php index 773accbc6..4b7b52fc4 100644 --- a/application/views/suppliers/form.php +++ b/application/views/suppliers/form.php @@ -17,6 +17,17 @@ echo form_open('suppliers/save/'.$person_info->person_id,array('id'=>'supplier_f +
+lang->line('suppliers_agency_name').':', 'agency_name'); ?> +
+ 'agency_name', + 'id'=>'agency_name_input', + 'value'=>$person_info->agency_name) + );?> +
+
+ load->view("people/form_basic_info"); ?>
lang->line('suppliers_account_number').':', 'account_number'); ?> @@ -65,15 +76,15 @@ $(document).ready(function() company_name: "required", first_name: "required", last_name: "required", - email: "email" + email: "email" }, messages: { - company_name: "lang->line('suppliers_company_name_required'); ?>", - last_name: "lang->line('common_last_name_required'); ?>", - email: "lang->line('common_email_invalid_format'); ?>" + company_name: "lang->line('suppliers_company_name_required'); ?>", + last_name: "lang->line('common_last_name_required'); ?>", + email: "lang->line('common_email_invalid_format'); ?>" } }); }); - + \ No newline at end of file diff --git a/database/database.sql b/database/database.sql index ea34116b9..9914e23f9 100644 --- a/database/database.sql +++ b/database/database.sql @@ -702,6 +702,7 @@ INSERT INTO `ospos_stock_locations` ( `deleted`, `location_name` ) VALUES ('0', CREATE TABLE `ospos_suppliers` ( `person_id` int(10) NOT NULL, `company_name` varchar(255) NOT NULL, + `agency_name` varchar(255) NOT NULL, `account_number` varchar(255) DEFAULT NULL, `deleted` int(1) NOT NULL DEFAULT '0', UNIQUE KEY `account_number` (`account_number`), diff --git a/translations/suppliers_lang.csv b/translations/suppliers_lang.csv index e7ca4efe5..de84bd629 100644 --- a/translations/suppliers_lang.csv +++ b/translations/suppliers_lang.csv @@ -4,6 +4,7 @@ suppliers_basic_information,Informatie Leverancier,Información de Proveedores,S suppliers_cannot_be_deleted,De geselecteeerde leveranciers konden niet worden verwijderd. Eén of meerdere leveranciers hebben ordergegevens in de database zitten.,No se pudo borrar los proveedores seleccionados. Uno o más de los seleccionados tiene ventas.,"Could not deleted selected suppliers, one or more of the selected suppliers has sales.",Impossible de supprimer le(s) fournisseur(s) sélectionné(s). Un ou plusieurs ont des ventes.,無法刪除所選擇的供應商，選定的供應商中至少有一家已有銷售紀錄。,"Не удалось удалить выбранные поставщиков, один или более из выбранных поставщиков имеет продаж.","ลบผู้ผลิตที่ถูกเลือกไม่ได้, one or more of the selected suppliers has sales.","Sağlayıcı silinemedi, bazı sağlayıcıların satışı var.","Tidak bisa dihapus pemasok yang dipilih, satu atau lebih dari pemasok yang dipilih memiliki penjualan." suppliers_company_name,Bedrijfsnaam,Nombre de la Compañía,Company Name,Nom d\'Entreprise,公司名稱,Название компании,ชื่อบริษัท,Şirket Adı,Nama Perusahaan suppliers_company_name_required,Bedrijfsnaam moet ingevuld worden,Nombre de la Compañía es requerido,Company Name is a required field,Le Nom d\'Entreprise est un champ requis,公司名稱是必填欄位,Название компании является обязательным полем,ชื่อบริษัทต้องกรอก,Şirket Adı zorunlu alandır,Nama Perusahaan wajib diisi +suppliers_agency_name,Agencynaam,Nombre de la Agency,Agency Name,Nom d\'Agence, , , , ,Nama suppliers_confirm_delete,Bent u zeker dat u de geselecteerde leveranciers wil verwijderen?,¿Seguro(a) de querer borrar los proveedores seleccionados?,Are you sure you want to delete the selected suppliers?,Etes vous sûr(e) de vouloir supprimer ce(s) fournisseur(s)?,你確定要刪除選定的供應商嗎？,"Вы уверены, что хотите удалить выбранных поставщиков?",แน่ใจหรือไม่ที่จะลบผู้ผลิตที่ถููกเลือก?,Seçili sağlayıcıları düzenlemek istiyor musunuz?,Apakah Anda yakin ingin menghapus pemasok yang dipilih? suppliers_error_adding_updating,Fout bij het toevoegen/aanpassen van een leverancier,Error agregando/actualizando proveedor,Error adding/updating supplier,Error lors de l\'ajout/suppression de fournisseur,新增/更新供應商錯誤,Ошибка при добавлении/обновлении поставщиком,เพิ่ม/แก้ไข ผู้ผลิต ล้มเหลว,Sağlayıcı ekleme/düzenleme hatası,Kesalahan Menambah / memperbarui data pemasok suppliers_new,N. Leverancier,Nuevo Proveedor,New Supplier,Nouveau Fournisseur,新增供應商,Новый поставщик,ผู้ผลิตรายใหม่,Yeni Sağlayıcı,Pemasok Baru @@ -13,4 +14,5 @@ suppliers_successful_adding,Leverancier succesvol toegevoegd,Has agregado el pro suppliers_successful_deleted,Er werd(en),Has borrado satisfactoriamente a,You have successfully deleted,Suppression réussie,您已成功刪除供應商,Вы успешно удален,ลบสำเร็จ,Sağlayıcı silindi,Anda telah berhasil menghapus data pemasok suppliers_successful_updating,Wijzigingen leveranciersgegevens bewaard,Has actualizado el proveedor satisfactoriamente,You have successfully updated supplier,Fournisseur édité avec succès,您已成功更新供應商,Вы успешно обновляли поставщиком,ปรับปรุงผู้ผลิตสำเร็จ,Sağlayıcı düzenlendi,Anda telah berhasil memperbarui data pemasok suppliers_supplier,Leverancier,Proveedor,Supplier,Fournisseur,供應商,поставщик,ผู้ผลิต,Sağlayıcı,Pemasok +suppliers_supplier_id,Id,Id,Id,Id,Id,Id,Id,Id,Id suppliers_update,Bewerk Leverancier,Actualizar Proveedor,Update Supplier,Éditer Fournisseur,更新供應商,Обновить поставщика,ปรับปรุงผู้ผลิต,Sağlayıcıyı Düzenle,Ubah data Pemasok