.../com_jshopping/Model/ProductsModel.php | 25 ++-- .../components/com_jshopping/install/install.sql | 1 + .../components/com_jshopping/js/functions.js | 2 + .../language/de-DE/de-DE.com_jshopping.ini | 5 +- .../language/en-GB/en-GB.com_jshopping.ini | 3 + .../language/ru-RU/ru-RU.com_jshopping.ini | 5 +- .../com_jshopping/sql/updates/mysql/5.1.0.sql | 1 + .../com_jshopping/tmpl/product_edit/images.php | 160 +++++++++++---------- components/com_jshopping/Table/ProductTable.php | 2 +- components/com_jshopping/config/default_config.php | 11 +- .../default/product/block_image_middle.php | 4 +- .../default/product/block_image_thumb.php | 2 +- .../templates/default/product/product_default.php | 6 +- 13 files changed, 130 insertions(+), 97 deletions(-) diff --git a/administrator/components/com_jshopping/Model/ProductsModel.php b/administrator/components/com_jshopping/Model/ProductsModel.php index df0b6eb4..6859b179 100644 --- a/administrator/components/com_jshopping/Model/ProductsModel.php +++ b/administrator/components/com_jshopping/Model/ProductsModel.php @@ -123,7 +123,6 @@ class ProductsModel extends BaseadminModel{ } function getCountAllProducts($filter){ - $lang = \JSFactory::getLang(); $db = \JFactory::getDBO(); if (isset($filter['category_id'])) $category_id = $filter['category_id']; @@ -231,7 +230,7 @@ class ProductsModel extends BaseadminModel{ $id_vendor_cuser = \JSHelperAdmin::getIdVendorForCUser(); if ($id_vendor_cuser && $post['product_id']){ - checkAccessVendorToProduct($id_vendor_cuser, $post['product_id']); + \JSHelperAdmin::checkAccessVendorToProduct($id_vendor_cuser, $post['product_id']); } $post['different_prices'] = 0; if (isset($post['product_is_add_price']) && $post['product_is_add_price']){ @@ -585,6 +584,9 @@ class ProductsModel extends BaseadminModel{ if ($jshopConfig->product_imagename_lowercase){ $upload->name = strtolower($upload->name); } + if (isset($post["product_image_name_".$i]) && $post["product_image_name_".$i] != '') { + $upload->setNameWithoutExt($post["product_image_name_".$i]); + } $upload->setFileNameMd5(0); $upload->setFilterName(1); $upload->setMaxSizeFile($jshopConfig->image_product_max_size_file); @@ -656,7 +658,7 @@ class ProductsModel extends BaseadminModel{ } if (!$error){ - $this->addToProductImage($product_id, $name_image, $post["product_image_descr_".$i]); + $this->addToProductImage($product_id, $name_image, $post["product_image_descr_".$i], $post["product_image_title_".$i] ?? null); $dispatcher->triggerEvent('onAfterSaveProductImage', array($product_id, $name_image)); } }else{ @@ -675,7 +677,7 @@ class ProductsModel extends BaseadminModel{ $name_image = $post['product_folder_image_'.$i]; $name_thumb = 'thumb_'.$name_image; $name_full = 'full_'.$name_image; - $this->addToProductImage($product_id, $name_image, $post["product_image_descr_".$i]); + $this->addToProductImage($product_id, $name_image, $post["product_image_descr_".$i], $post["product_image_title_".$i] ?? null); $dispatcher->triggerEvent('onAfterSaveProductFolerImage', array($product_id, $name_full, $name_image, $name_thumb)); } } @@ -692,7 +694,7 @@ class ProductsModel extends BaseadminModel{ } if (isset($post['old_image_descr'])){ - $this->renameProductImageOld($post['old_image_descr'], $post['old_image_ordering']); + $this->renameProductImageOld($post['old_image_descr'], $post['old_image_ordering'], $post['old_image_title'] ?? null); } } @@ -716,20 +718,25 @@ class ProductsModel extends BaseadminModel{ return 1; } - function addToProductImage($product_id, $name_image, $image_descr) { + function addToProductImage($product_id, $name_image, $alt, $title = null) { $image = \JSFactory::getTable('image'); $image->set("image_id", 0); $image->set("product_id", $product_id); $image->set("image_name", $name_image); - $image->set("name", $image_descr); + $image->set("name", $alt); + $image->set("title", $title); $image->set("ordering", $image->getNextOrder("product_id='".intval($product_id)."'")); $image->store(); } - function renameProductImageOld($image_descr, $image_ordering){ + function renameProductImageOld($image_descr, $image_ordering, $title = null){ $db = \JFactory::getDBO(); foreach($image_descr as $id=>$v){ - $query = "update `#__jshopping_products_images` set `name`='".$db->escape($image_descr[$id])."', `ordering`='".$db->escape($image_ordering[$id])."' where `image_id`='".$db->escape($id)."'"; + $ext_query = ''; + if (isset($title[$id])) { + $ext_query = ', `title`='.$db->q($title[$id]); + } + $query = "update `#__jshopping_products_images` set `name`='".$db->escape($image_descr[$id])."', `ordering`='".$db->escape($image_ordering[$id])."' ".$ext_query." where `image_id`='".$db->escape($id)."'"; $db->setQuery($query); $db->execute(); } diff --git a/administrator/components/com_jshopping/install/install.sql b/administrator/components/com_jshopping/install/install.sql index 627f29f1..931a2796 100644 --- a/administrator/components/com_jshopping/install/install.sql +++ b/administrator/components/com_jshopping/install/install.sql @@ -85,6 +85,7 @@ CREATE TABLE IF NOT EXISTS `#__jshopping_products_images` ( `product_id` int(11) NOT NULL default 0, `image_name` VARCHAR(255) NOT NULL default '', `name` VARCHAR(255) NOT NULL default '', +`title` VARCHAR(255) NOT NULL default '', `ordering` tinyint(4) NOT NULL default 0, PRIMARY KEY (`image_id`) ) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/administrator/components/com_jshopping/js/functions.js b/administrator/components/com_jshopping/js/functions.js index 81884481..6e622edc 100644 --- a/administrator/components/com_jshopping/js/functions.js +++ b/administrator/components/com_jshopping/js/functions.js @@ -814,10 +814,12 @@ var jshopAdminClass = function(){ isChecked = jQuery(obj).is(':checked'); var div_inputs = jQuery(obj).parents('div:first'); if (isChecked) { + div_inputs.find(".product_img_name").hide(); div_inputs.find(".product_file_image").hide(); div_inputs.find(".product_file_image input").val(''); div_inputs.find('.product_folder_image').show(); } else { + div_inputs.find(".product_img_name").show(); div_inputs.find(".product_folder_image").hide(); div_inputs.find(".product_folder_image input[type=text]").val(''); div_inputs.find('.product_file_image').show(); diff --git a/administrator/components/com_jshopping/language/de-DE/de-DE.com_jshopping.ini b/administrator/components/com_jshopping/language/de-DE/de-DE.com_jshopping.ini index ca910a1c..5db41890 100644 --- a/administrator/components/com_jshopping/language/de-DE/de-DE.com_jshopping.ini +++ b/administrator/components/com_jshopping/language/de-DE/de-DE.com_jshopping.ini @@ -1,5 +1,5 @@ -JOOMSHOPPING="JoomShopping" +JOOMSHOPPING="JoomShopping" JSHOP_NO = "Nicht" JSHOP_YES = "Ja" JSHOP_ALL = "Alle" @@ -944,3 +944,6 @@ JSHOP_INSTALL_JSHOP_INSTALL_UPDATE = "Installieren Addon - Joomshopping / Instal JSHOP_SHOP_OPTION_ADDON_KEY_CONFIG = "JoomShopping / Optionen / Addons- Stellen Sie Schlüssel- Set-Einstellungen" JSHOP_DELETE_ITEM_CAN_BE_USED = "Löschen? Element kann in dem System und die Datenintegrität verwendet werden kann, beeinträchtigt werden." JSHOP_ERROR_UPLOAD_MIN_SIZE_IMAGE = "Bildgröße zu klein." +JSHOP_IMG_ALT="Alt" +JSHOP_IMG_NAME="Bildname" +JSHOP_OC_PRODUCT_IMG_SEO="Produktbild-SEO" \ No newline at end of file diff --git a/administrator/components/com_jshopping/language/en-GB/en-GB.com_jshopping.ini b/administrator/components/com_jshopping/language/en-GB/en-GB.com_jshopping.ini index fbde91a7..87232c19 100644 --- a/administrator/components/com_jshopping/language/en-GB/en-GB.com_jshopping.ini +++ b/administrator/components/com_jshopping/language/en-GB/en-GB.com_jshopping.ini @@ -944,3 +944,6 @@ JSHOP_INSTALL_JSHOP_INSTALL_UPDATE="Install addon - Joomshopping / Install & Upd JSHOP_SHOP_OPTION_ADDON_KEY_CONFIG="JoomShopping / Options / Addons- set key- set configuration" JSHOP_DELETE_ITEM_CAN_BE_USED="Delete? The element can be used in the system and the integrity of the data can be compromised." JSHOP_ERROR_UPLOAD_MIN_SIZE_IMAGE="Image size too small" +JSHOP_IMG_ALT="Alt" +JSHOP_IMG_NAME="Image name" +JSHOP_OC_PRODUCT_IMG_SEO="Product image SEO" \ No newline at end of file diff --git a/administrator/components/com_jshopping/language/ru-RU/ru-RU.com_jshopping.ini b/administrator/components/com_jshopping/language/ru-RU/ru-RU.com_jshopping.ini index e3b98b2d..62375da5 100644 --- a/administrator/components/com_jshopping/language/ru-RU/ru-RU.com_jshopping.ini +++ b/administrator/components/com_jshopping/language/ru-RU/ru-RU.com_jshopping.ini @@ -1,5 +1,5 @@ -JOOMSHOPPING="JoomShopping" +JOOMSHOPPING="JoomShopping" JSHOP_NO = "Нет" JSHOP_YES = "Да" JSHOP_ALL = "Все" @@ -944,3 +944,6 @@ JSHOP_INSTALL_JSHOP_INSTALL_UPDATE = "Установка дополнения - JSHOP_SHOP_OPTION_ADDON_KEY_CONFIG = "JoomShopping / Опции / Дополнения- задайте ключ- задайте настройки" JSHOP_DELETE_ITEM_CAN_BE_USED = "Удалить? Элемент может использоваться в системе и целостность данных может быть нарушена." JSHOP_ERROR_UPLOAD_MIN_SIZE_IMAGE = "Размер изображения слишком мал." +JSHOP_IMG_ALT="Alt" +JSHOP_IMG_NAME="Название изображения" +JSHOP_OC_PRODUCT_IMG_SEO="SEO изображения продукта" \ No newline at end of file diff --git a/administrator/components/com_jshopping/sql/updates/mysql/5.1.0.sql b/administrator/components/com_jshopping/sql/updates/mysql/5.1.0.sql new file mode 100644 index 00000000..d2403836 --- /dev/null +++ b/administrator/components/com_jshopping/sql/updates/mysql/5.1.0.sql @@ -0,0 +1 @@ +ALTER TABLE `#__jshopping_products_images` ADD `title` varchar(255) NOT NULL; \ No newline at end of file diff --git a/administrator/components/com_jshopping/tmpl/product_edit/images.php b/administrator/components/com_jshopping/tmpl/product_edit/images.php index f5402f8b..6e6c7586 100644 --- a/administrator/components/com_jshopping/tmpl/product_edit/images.php +++ b/administrator/components/com_jshopping/tmpl/product_edit/images.php @@ -21,7 +21,10 @@ defined('_JEXEC') or die(); foreach($lists['images'] as $image){ ?>
- +
+ product_img_seo) {?> +
+
@@ -41,83 +44,92 @@ defined('_JEXEC') or die();
-
-
- -
- product_image_upload_count; $i++){?> -
-
- +
+
+
+ +
+ product_image_upload_count; $i++){?> +
+
+ +
+ product_img_seo) {?> +
+ +
+
+ +
+ +
+ +
+ + + + plugin_template_images_load)){ + print $this->plugin_template_images_load[$i]; + } + ?>
-
- -
- - - - plugin_template_images_load)){ - print $this->plugin_template_images_load[$i]; - } - ?> + +
- -
-
- -
- -
- - - - -
- - - -
- - - - -
-
-
-
-
-
- -
- - - - -
- - - -
- - - - -
-
-
-
-
-
+
+
+ + + + +
+ + + +
+ + + + +
+
+
+
+
+
+ +
+ + + + +
+ + + +
+ + + + +
+
+
+
+
+
+ +
-
+ $pkey){ print $this->$pkey;}?>
diff --git a/components/com_jshopping/Table/ProductTable.php b/components/com_jshopping/Table/ProductTable.php index c1d368ff..de2b1f2c 100644 --- a/components/com_jshopping/Table/ProductTable.php +++ b/components/com_jshopping/Table/ProductTable.php @@ -381,7 +381,7 @@ class ProductTable extends MultilangTable{ if (!$title){ $title = $this->getName(); } - $list[$k]->_title = $title; + $list[$k]->_title = $title; $list[$k]->image_thumb = \JSHelper::getPatchProductImage($v->image_name, 'thumb'); $list[$k]->image_full = \JSHelper::getPatchProductImage($v->image_name, 'full'); } diff --git a/components/com_jshopping/config/default_config.php b/components/com_jshopping/config/default_config.php index fef6078e..f1871011 100644 --- a/components/com_jshopping/config/default_config.php +++ b/components/com_jshopping/config/default_config.php @@ -1,6 +1,6 @@ show_short_descr_insted_of = 1; $config->allow_image_upload = array('jpeg','jpg','gif','png','webp'); $config->use_summ_for_calcule_payment_with_discount = 0; $config->product_related_order_by = 'relation.id'; +$config->product_img_seo = 0; $config->default_template_block_list_product = 'list_products/list_products.php'; $config->default_template_no_list_product = 'list_products/no_products.php'; @@ -353,6 +354,7 @@ $other_config = array( "product_image_upload_count", "product_video_upload_count", "show_insert_code_in_product_video", + "product_img_seo", "max_number_download_sale_file", "max_day_download_sale_file", "order_display_new_digital_products", @@ -363,8 +365,7 @@ $other_config = array( "load_css", 'list_products_calc_basic_price_from_product_price', 'hide_from_basic_price','calc_basic_price_from_product_price', - 'user_discount_not_apply_prod_old_price', - 'advert' + 'user_discount_not_apply_prod_old_price' ); $other_config_checkbox = array( @@ -374,6 +375,7 @@ $other_config_checkbox = array( "show_list_price_shipping_weight", "display_tax_id_in_pdf", "show_insert_code_in_product_video", + "product_img_seo", "order_display_new_digital_products", "display_user_groups_info", "display_user_group", @@ -384,8 +386,7 @@ $other_config_checkbox = array( 'list_products_calc_basic_price_from_product_price', 'hide_from_basic_price', 'calc_basic_price_from_product_price', - 'user_discount_not_apply_prod_old_price', - 'advert' + 'user_discount_not_apply_prod_old_price' ); $other_config_select = array( 'cart_back_to_shop'=>array( diff --git a/components/com_jshopping/templates/default/product/block_image_middle.php b/components/com_jshopping/templates/default/product/block_image_middle.php index 26424313..633444da 100644 --- a/components/com_jshopping/templates/default/product/block_image_middle.php +++ b/components/com_jshopping/templates/default/product/block_image_middle.php @@ -13,8 +13,8 @@ defined('_JEXEC') or die(); <?php print htmlspecialchars($this->product->name)?> images as $k=>$image){?> - style="display:none" title="_title)?>"> - <?php print htmlspecialchars($image->_title)?> + style="display:none" title="title ? $image->title : $image->_title)?>"> + <?php print htmlspecialchars($image->_title)?>
diff --git a/components/com_jshopping/templates/default/product/block_image_thumb.php b/components/com_jshopping/templates/default/product/block_image_thumb.php index d2b3ae0c..c21c5cc6 100644 --- a/components/com_jshopping/templates/default/product/block_image_thumb.php +++ b/components/com_jshopping/templates/default/product/block_image_thumb.php @@ -11,7 +11,7 @@ defined('_JEXEC') or die(); images)>1) || (count($this->videos) && count($this->images)) ) {?> images as $k=>$image){?>
- <?php print htmlspecialchars($image->_title)?> + <?php print htmlspecialchars($image->_title)?>
\ No newline at end of file diff --git a/components/com_jshopping/templates/default/product/product_default.php b/components/com_jshopping/templates/default/product/product_default.php index ca456672..d2a8b5f9 100644 --- a/components/com_jshopping/templates/default/product/product_default.php +++ b/components/com_jshopping/templates/default/product/product_default.php @@ -53,8 +53,8 @@ include(dirname(__FILE__)."/load.js.php"); images as $k=>$image){?> - style="display:none" title="_title)?>"> - <?php print htmlspecialchars($image->_title)?> + style="display:none" title="title ? $image->title : $image->_title)?>"> + <?php print htmlspecialchars($image->_title)?>
@@ -73,7 +73,7 @@ include(dirname(__FILE__)."/load.js.php"); images)>1) || (count($this->videos) && count($this->images)) ) {?> images as $k=>$image){?>
- <?php print htmlspecialchars($image->_title)?> + <?php print htmlspecialchars($image->_title)?>