diff --git a/Gruntfile.js b/Gruntfile.js index 849882418..e3ba25848 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,7 +29,7 @@ module.exports = function(grunt) { destPrefix: 'dist' }, files: { - 'jquery-ui.css': 'jquery-ui/themes/smoothness/jquery-ui.css', + 'jquery-ui.css': 'jquery-ui/themes/base/jquery-ui.css', 'bootstrap.min.css': 'bootswatch-dist/css/bootstrap.min.css' } } diff --git a/application/controllers/Items.php b/application/controllers/Items.php index 871104d0d..c2fafb31d 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -179,12 +179,16 @@ class Items extends Secure_area implements iData_controller $suppliers[$row['person_id']] = $row['company_name']; } + $item_info = $this->Item->get_info($item_id); $data['suppliers'] = $suppliers; - $data['selected_supplier'] = $this->Item->get_info($item_id)->supplier_id; + $data['selected_supplier'] = $item_info->supplier_id; $data['default_tax_1_rate'] = ($item_id==-1) ? $this->Appconfig->get('default_tax_1_rate') : ''; $data['default_tax_2_rate'] = ($item_id==-1) ? $this->Appconfig->get('default_tax_2_rate') : ''; - - $locations_data = $this->Stock_location->get_undeleted_all()->result_array(); + $data['logo_exists'] = $item_info->pic_id != ''; + $images = glob ("uploads/item_pics/" . $item_info->pic_id . ".*"); + $data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : ''; + + $locations_data = $this->Stock_location->get_undeleted_all()->result_array(); foreach($locations_data as $location) { $quantity = $this->Item_quantity->get_item_quantity($item_id,$location['location_id'])->quantity; @@ -413,13 +417,20 @@ class Items extends Secure_area implements iData_controller 'max_size' => '100', 'max_width' => '640', 'max_height' => '480', - 'file_name' => sizeof($map)); + 'file_name' => sizeof($map) + 1); $this->load->library('upload', $config); $this->upload->do_upload('item_image'); return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '
'.$this->lang->line('upload_no_file_selected').'
'); } - + + public function remove_logo($item_id) + { + $item_data = array('pic_id' => null); + $result = $this->Item->save($item_data, $item_id);; + echo json_encode(array('success' => $result)); + } + function save_inventory($item_id=-1) { $employee_id=$this->Employee->get_logged_in_employee_info()->person_id; diff --git a/application/language/de-CH/items_lang.php b/application/language/de-CH/items_lang.php index 9c2bb99fc..df357d97f 100644 --- a/application/language/de-CH/items_lang.php +++ b/application/language/de-CH/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Datenbank"; $lang["items_update"] = "Ändere Artikel"; $lang["items_use_inventory_menu"] = "Verwende Bestandesmenu"; $lang["items_import_items_excel"] = "Importiere Artikel mit Excel Datei"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/en/items_lang.php b/application/language/en/items_lang.php index 6a23dc8f5..9968a495e 100644 --- a/application/language/en/items_lang.php +++ b/application/language/en/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database"; $lang["items_update"] = "Update Item"; $lang["items_use_inventory_menu"] = "Use Inv. Menu"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index 30db8f80e..59395c3e4 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -37,7 +37,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Edit"; $lang["sales_edit_item"] = "Edit Item"; $lang["sales_edit_sale"] = "Edit Sale"; -$lang["sales_email_receipt"] = "Email Receipt"; +$lang["sales_email_receipt"] = "E-Mail Receipt"; $lang["sales_employee"] = "Employee"; $lang["sales_error_editing_item"] = "Error editing item"; $lang["sales_find_or_scan_item"] = "Find/Scan Item"; diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php index a467d17b3..c7254b559 100644 --- a/application/language/es/items_lang.php +++ b/application/language/es/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Base de datos UPC"; $lang["items_update"] = "Actualizar Artículo"; $lang["items_use_inventory_menu"] = "Usar Menú de Inventario"; $lang["items_import_items_excel"] = "Importar Artículos desde Excel"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/fr/items_lang.php b/application/language/fr/items_lang.php index 150462379..be51dd6c5 100644 --- a/application/language/fr/items_lang.php +++ b/application/language/fr/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Base de Données UPC"; $lang["items_update"] = "Éditer Item"; $lang["items_use_inventory_menu"] = "Utiliser Menu Inv."; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php index c7b9d0ca2..d95d0b23d 100644 --- a/application/language/id/items_lang.php +++ b/application/language/id/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Database UPC"; $lang["items_update"] = "Ubah"; $lang["items_use_inventory_menu"] = "Gunakan Inv. Menu"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/id/reports_lang.php b/application/language/id/reports_lang.php index bb58cd0ff..51f2a465f 100644 --- a/application/language/id/reports_lang.php +++ b/application/language/id/reports_lang.php @@ -65,7 +65,7 @@ $lang["reports_requisition_related_item_unit_quantity"] = "Unit Item Barang"; $lang["reports_requisitions"] = "Laporan Permintaan"; $lang["reports_returns"] = "Retur"; $lang["reports_revenue"] = "Pendapatan"; -$lang["reports_sale_id"] = "ID Penjualan"; +$lang["reports_sale_id"] = "ID Penjualan "; $lang["reports_sale_type"] = "Jenis Penjualan"; $lang["reports_sales"] = "Penjualan"; $lang["reports_sales_amount"] = "Jumlah Penjualan"; diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php index 428916fcf..b81b5208d 100755 --- a/application/language/nl-BE/items_lang.php +++ b/application/language/nl-BE/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database"; $lang["items_update"] = "Bewerk Product"; $lang["items_use_inventory_menu"] = "Use Inv. Menu"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/ru/items_lang.php b/application/language/ru/items_lang.php index 3aefe81fe..d7ee3daeb 100644 --- a/application/language/ru/items_lang.php +++ b/application/language/ru/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC база данных"; $lang["items_update"] = "Обновить Товар"; $lang["items_use_inventory_menu"] = "Используйте меню инвентаря"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/th/items_lang.php b/application/language/th/items_lang.php index f075e590d..52f3e2d61 100644 --- a/application/language/th/items_lang.php +++ b/application/language/th/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC ฐานข้อมูล"; $lang["items_update"] = "ปรับแต่งสินค้า"; $lang["items_use_inventory_menu"] = "ใช้เมนูสินค้าคงเหลือ"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/tr/items_lang.php b/application/language/tr/items_lang.php index e3ae89279..3854c39a7 100644 --- a/application/language/tr/items_lang.php +++ b/application/language/tr/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Veritabanı"; $lang["items_update"] = "Ürün Güncelle"; $lang["items_use_inventory_menu"] = "Stok Menüsünü Kullan"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php index b938c985e..4f0f519bc 100755 --- a/application/language/zh/items_lang.php +++ b/application/language/zh/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database"; $lang["items_update"] = "更新產品"; $lang["items_use_inventory_menu"] = "使用庫存清單"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/views/items/form.php b/application/views/items/form.php index 7caad3d96..05a20ef33 100644 --- a/application/views/items/form.php +++ b/application/views/items/form.php @@ -187,38 +187,27 @@
+