From 42a714fcda18c83a67a3afc1bc71f49c3f42e559 Mon Sep 17 00:00:00 2001 From: anhtuan Date: Wed, 24 Aug 2022 16:25:14 +0700 Subject: [PATCH 1/4] REDSHOP-6211: Exporting categories misses category's image --- plugins/redshop_export/category/category.php | 39 +++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/plugins/redshop_export/category/category.php b/plugins/redshop_export/category/category.php index cc5919bd003..bde01d9a8ea 100644 --- a/plugins/redshop_export/category/category.php +++ b/plugins/redshop_export/category/category.php @@ -204,11 +204,40 @@ protected function processData(&$data) $item = (array)$item; foreach ($item as $column => $value) { - if ($column == 'category_full_image' && $value != "") { - if (JFile::exists(REDSHOP_FRONT_IMAGES_RELPATH . 'category/' . $value)) { - $item[$column] = REDSHOP_FRONT_IMAGES_ABSPATH . 'category/' . $value; - } else { - $item[$column] = ""; + $idCate = $item['id']; + $db = JFactory::getDbo(); + if ($column == 'category_thumb_image' || $column == 'category_full_image') { + if ($item['category_full_image'] == "") { + $sqlFullImage = $this->db->getQuery(true) + ->select($this->db->qn(array('media_name'))) + ->from($this->db->qn('#__redshop_media')) + ->where($this->db->qn('section_id') . ' = ' . $idCate) + ->where($this->db->qn('media_section') . ' = ' . $db->quote('category')) + ->where($this->db->qn('scope') . ' = ' . $db->quote('full')); + $db->setQuery($sqlFullImage); + $results = $db->loadObjectList(); + $imageName = $results[0]->media_name; + if (is_null($imageName)) { + $item['category_full_image'] = ''; + } else { + $item['category_full_image'] = $imageName; + } + } + if ($item['category_thumb_image'] == "") { + $sqlThumbImage = $this->db->getQuery(true) + ->select($this->db->qn(array('media_name'))) + ->from($this->db->qn('#__redshop_media')) + ->where($this->db->qn('section_id') . ' = ' . $idCate) + ->where($this->db->qn('media_section') . ' = ' . $db->quote('category')) + ->where($this->db->qn('scope') . ' = ' . $db->quote('back')); + $db->setQuery($sqlThumbImage); + $results = $db->loadObjectList(); + $imageName = $results[0]->media_name; + if (is_null($imageName)) { + $item['category_thumb_image'] = ''; + } else { + $item['category_thumb_image'] = $imageName; + } } } else { $item[$column] = str_replace(array("\n", "\r"), "", $value); From b99bd573c65b110579368709a2ce167f04286e98 Mon Sep 17 00:00:00 2001 From: anhtuan Date: Thu, 25 Aug 2022 16:56:34 +0700 Subject: [PATCH 2/4] fix if and using Media library --- plugins/redshop_export/category/category.php | 50 +++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/plugins/redshop_export/category/category.php b/plugins/redshop_export/category/category.php index bde01d9a8ea..2ab6156390d 100644 --- a/plugins/redshop_export/category/category.php +++ b/plugins/redshop_export/category/category.php @@ -206,45 +206,39 @@ protected function processData(&$data) foreach ($item as $column => $value) { $idCate = $item['id']; $db = JFactory::getDbo(); - if ($column == 'category_thumb_image' || $column == 'category_full_image') { + + //using Media helper libraries + $redMediaHelper = JPATH_SITE . "/libraries/redshop/helper/media.php"; + if (file_exists($redMediaHelper)) { + include_once $redMediaHelper; + $redmedia_helper = new RedshopHelperMedia; if ($item['category_full_image'] == "") { - $sqlFullImage = $this->db->getQuery(true) - ->select($this->db->qn(array('media_name'))) - ->from($this->db->qn('#__redshop_media')) - ->where($this->db->qn('section_id') . ' = ' . $idCate) - ->where($this->db->qn('media_section') . ' = ' . $db->quote('category')) - ->where($this->db->qn('scope') . ' = ' . $db->quote('full')); - $db->setQuery($sqlFullImage); - $results = $db->loadObjectList(); - $imageName = $results[0]->media_name; - if (is_null($imageName)) { + $fullImage = $redmedia_helper->getMedia('category',$idCate,'full','images'); + $fullImageName = $fullImage[0]->media_name; + if (is_null($fullImageName)) { $item['category_full_image'] = ''; } else { - $item['category_full_image'] = $imageName; + //if (JFile::exists(glob('components/com_redshop/assets/images/product/thumb/'.$fullImageName))) { + $item['category_full_image'] = $fullImageName; + //} else { + //$item['category_full_image'] = ''; + //} } - } - if ($item['category_thumb_image'] == "") { - $sqlThumbImage = $this->db->getQuery(true) - ->select($this->db->qn(array('media_name'))) - ->from($this->db->qn('#__redshop_media')) - ->where($this->db->qn('section_id') . ' = ' . $idCate) - ->where($this->db->qn('media_section') . ' = ' . $db->quote('category')) - ->where($this->db->qn('scope') . ' = ' . $db->quote('back')); - $db->setQuery($sqlThumbImage); - $results = $db->loadObjectList(); - $imageName = $results[0]->media_name; - if (is_null($imageName)) { + } elseif ($item['category_thumb_image'] == "") { + $thumbImage = $redmedia_helper->getMedia('category',$idCate,'back','images'); + $thumbImageName = $thumbImage[0]->media_name; + if (is_null($thumbImageName)) { $item['category_thumb_image'] = ''; } else { - $item['category_thumb_image'] = $imageName; + $item['category_thumb_image'] = $thumbImageName; } + } else { + $item[$column] = str_replace(array("\n", "\r"), "", $value); } - } else { - $item[$column] = str_replace(array("\n", "\r"), "", $value); } } $data[$index] = $item; } } -} +} \ No newline at end of file From 55f1f0a910b4ca1f0aaccb54a1179ae2232bdf2b Mon Sep 17 00:00:00 2001 From: anhtuan Date: Thu, 25 Aug 2022 17:48:58 +0700 Subject: [PATCH 3/4] fix link category image check --- plugins/redshop_export/category/category.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/redshop_export/category/category.php b/plugins/redshop_export/category/category.php index 2ab6156390d..c6a8863c95e 100644 --- a/plugins/redshop_export/category/category.php +++ b/plugins/redshop_export/category/category.php @@ -218,11 +218,16 @@ protected function processData(&$data) if (is_null($fullImageName)) { $item['category_full_image'] = ''; } else { - //if (JFile::exists(glob('components/com_redshop/assets/images/product/thumb/'.$fullImageName))) { - $item['category_full_image'] = $fullImageName; - //} else { - //$item['category_full_image'] = ''; - //} + for($i = 0; $i <= 50; $i++) { + if (file_exists(JPATH_SITE . '/media/com_redshop/images/category/' . $i .'/'.$fullImageName)) { + $item['category_full_image'] = $fullImageName; + if ($item['category_full_image'] != '') { + break; + } + } else { + $item['category_full_image'] = ""; + } + } } } elseif ($item['category_thumb_image'] == "") { $thumbImage = $redmedia_helper->getMedia('category',$idCate,'back','images'); @@ -241,4 +246,4 @@ protected function processData(&$data) $data[$index] = $item; } } -} \ No newline at end of file +} From b373dd24301546fe4a348b77e4d12b44d5a2b0a3 Mon Sep 17 00:00:00 2001 From: anhtuan Date: Thu, 25 Aug 2022 18:01:32 +0700 Subject: [PATCH 4/4] fix link category image check --- plugins/redshop_export/category/category.php | 49 +++++++++----------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/plugins/redshop_export/category/category.php b/plugins/redshop_export/category/category.php index c6a8863c95e..a6775692360 100644 --- a/plugins/redshop_export/category/category.php +++ b/plugins/redshop_export/category/category.php @@ -207,39 +207,32 @@ protected function processData(&$data) $idCate = $item['id']; $db = JFactory::getDbo(); - //using Media helper libraries - $redMediaHelper = JPATH_SITE . "/libraries/redshop/helper/media.php"; - if (file_exists($redMediaHelper)) { - include_once $redMediaHelper; - $redmedia_helper = new RedshopHelperMedia; - if ($item['category_full_image'] == "") { - $fullImage = $redmedia_helper->getMedia('category',$idCate,'full','images'); - $fullImageName = $fullImage[0]->media_name; - if (is_null($fullImageName)) { - $item['category_full_image'] = ''; + if ($item['category_full_image'] == "") { + $fullImage = RedshopHelperMedia::getMedia('category',$idCate,'full','images'); + $fullImageName = $fullImage[0]->media_name; + if (is_null($fullImageName)) { + $item['category_full_image'] = ''; + } else { + if (file_exists(JPATH_SITE . '/media/com_redshop/images/category/' . $idCate .'/'.$fullImageName)) { + $item['category_full_image'] = $fullImageName; } else { - for($i = 0; $i <= 50; $i++) { - if (file_exists(JPATH_SITE . '/media/com_redshop/images/category/' . $i .'/'.$fullImageName)) { - $item['category_full_image'] = $fullImageName; - if ($item['category_full_image'] != '') { - break; - } - } else { - $item['category_full_image'] = ""; - } - } + $item['category_full_image'] = ""; } - } elseif ($item['category_thumb_image'] == "") { - $thumbImage = $redmedia_helper->getMedia('category',$idCate,'back','images'); - $thumbImageName = $thumbImage[0]->media_name; - if (is_null($thumbImageName)) { - $item['category_thumb_image'] = ''; - } else { + } + } elseif ($item['category_thumb_image'] == "") { + $thumbImage = RedshopHelperMedia::getMedia('category',$idCate,'back','images'); + $thumbImageName = $thumbImage[0]->media_name; + if (is_null($thumbImageName)) { + $item['category_thumb_image'] = ''; + } else { + if (file_exists(JPATH_SITE . '/media/com_redshop/images/category/' . $idCate .'/'.$thumbImageName)) { $item['category_thumb_image'] = $thumbImageName; + } else { + $item['category_thumb_image'] = ""; } - } else { - $item[$column] = str_replace(array("\n", "\r"), "", $value); } + } else { + $item[$column] = str_replace(array("\n", "\r"), "", $value); } }