Skip to content

Commit c17ca51

Browse files
intelliant01intelliant01
committed
Complete structural overhaul of the extension. Major refactoring, code cleanup and feature release.
Bug-fixes: The extension is now independent of any frontend theme changes. Earlier theme changes required porting of frontend section to the new theme. Added missing refrential integrity for 'default' attributeset that needs to be associated with products that have an empty attributesetid. Fixed attribute value import for text, textarea and boolean attributes. New features: Import screen secured and accessible only via the backend admin. User with Role Catalog Import can only access the importer at Catalog -> Catalog Import. 1 External image URL can now be configured as priority image or as a fallback image vis-a-vis internal image. 2 Support for automatic "New Product" date config during first time import of a product. 3 Default turning off of visibility in search results for simple products associated to configurable ones. Built in import of special price and related dates. Logs for each run are emailed to a backend configured email id (Store Email Addresses - Custom Email 1). Inventory import implemented. ATP quantity and ability to control backordering of products. Major improvements: Several major logging improvements. Improved error-handling, tolerance and reporting for missing elements in the import file. Report the issue and continue with the next element instead of aborting the process. Performance improvements related to categories and attributes import.
1 parent 5ed01f3 commit c17ca51

File tree

49 files changed

+3020
-2168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3020
-2168
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.idea/*

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GNU AFFERO GENERAL PUBLIC LICENSE
1+
GNU AFFERO GENERAL PUBLIC LICENSE
22
Version 3, 19 November 2007
33

44
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Magento-Catalog-Import
22
======================
33

4-
Import categories, products, and attributes into Magento
4+
Incremental import of categories, attributes and products into Magento

‎app/code/local/Gec/Customimport/Block/Catalogimport.php ‎app/code/local/Gec/Customimport/Block/Adminhtml/Catalogimport.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -17,7 +18,7 @@
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1819
**/
1920

20-
class Gec_Customimport_Block_Catalogimport extends Mage_Core_Block_Template
21+
class Gec_Customimport_Block_Adminhtml_Catalogimport extends Mage_Adminhtml_Block_Template
2122
{
2223
public $_log_array = array();
2324
public $_xmlObj;
@@ -38,4 +39,4 @@ class Gec_Customimport_Block_Catalogimport extends Mage_Core_Block_Template
3839
public $_store_id;
3940
public $_default_category_id;
4041
}
41-
?>
42+
?>

‎app/code/local/Gec/Customimport/Block/Adminhtml/Customimport.php

+2,129
Large diffs are not rendered by default.

‎app/code/local/Gec/Customimport/Block/Catalog/Product/Attribute/Edit/Tab/Options.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -15,7 +16,7 @@
1516
#
1617
# You should have received a copy of the GNU Affero General Public License
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-
**/
19+
**/
1920

2021
class Gec_Customimport_Block_Catalog_Product_Attribute_Edit_Tab_Options extends Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Options
2122
{

‎app/code/local/Gec/Customimport/Block/Customimport.php

-1,563
This file was deleted.

‎app/code/local/Gec/Customimport/Helper/Catalog/Image.php

+121-40
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -15,7 +16,7 @@
1516
#
1617
# You should have received a copy of the GNU Affero General Public License
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-
**/
19+
**/
1920

2021
class Gec_Customimport_Helper_Catalog_Image extends Mage_Catalog_Helper_Image
2122
{
@@ -89,53 +90,133 @@ public function init(Mage_Catalog_Model_Product $product, $attributeName, $image
8990
*/
9091
public function __toString()
9192
{
92-
try {
93-
// echo $this->_requestedImage;
94-
95-
$model = $this->_getModel();
96-
if ($this->getImageFile()) {
97-
$model->setBaseFile($this->getImageFile());
98-
} else {
99-
$model->setBaseFile($this->getProduct()->getData($model->getDestinationSubdir()));
100-
}
93+
if(Mage::getStoreConfig("catalog/proimgusage/imgusage")){
94+
try {
95+
$model = $this->_getModel();
96+
if ($this->getImageFile()) {
97+
$model->setBaseFile($this->getImageFile());
98+
} else {
99+
$path = Mage::getBaseDir('media').'/catalog/product';
100+
if($this->getProduct()->getData($model->getDestinationSubdir()) == "no_selection" || !is_file($path.$this->getProduct()->getData($model->getDestinationSubdir()))){
101+
try{
102+
$model = $this->_getModel();
103+
if ($this->getImageFile()) {
104+
$model->setBaseFile($this->getImageFile());
105+
} else {
106+
$model->setBaseFile($this->getProduct()->getData($model->getDestinationSubdir()));
107+
}
108+
109+
if($this->_requestedImage == 'image' || $this->_requestedImage == 'small_image' || $this->_requestedImage == 'thumbnail'){
110+
$external_attribute = 'external_'.$this->_requestedImage;
111+
$_product = Mage::getModel('catalog/product')->load($this->getProduct()->getId());
112+
$externalImg = $_product->getData($external_attribute);
113+
114+
}
115+
if ($model->isCached()) {
116+
if($externalImg){
117+
return $externalImg;
118+
}
119+
return $model->getUrl();
120+
} else {
121+
if ($this->_scheduleRotate) {
122+
$model->rotate($this->getAngle());
123+
}
124+
125+
if ($this->_scheduleResize) {
126+
$model->resize();
127+
}
128+
129+
if ($this->getWatermark()) {
130+
$model->setWatermark($this->getWatermark());
131+
}
132+
133+
$url = $model->saveFile()->getUrl();
134+
if($externalImg){
135+
$url = $externalImg;
136+
}
137+
}
138+
}catch (Exception $e) {
139+
$url = Mage::getDesign()->getSkinUrl($this->getPlaceholder());
140+
}
141+
return $url;
142+
}else{
143+
$model->setBaseFile($this->getProduct()->getData($model->getDestinationSubdir()));
144+
}
145+
}
101146

102-
if($this->_requestedImage == 'image' || $this->_requestedImage == 'small_image' || $this->_requestedImage == 'thumbnail'){
103-
$external_attribute = 'external_'.$this->_requestedImage;
104-
$_product = Mage::getModel('catalog/product')->load($this->getProduct()->getId());
105-
$externalImg = $_product->getData($external_attribute);
147+
if ($model->isCached()) {
148+
return $model->getUrl();
149+
} else {
150+
if ($this->_scheduleRotate) {
151+
$model->rotate($this->getAngle());
152+
}
106153

107-
}
154+
if ($this->_scheduleResize) {
155+
$model->resize();
156+
}
108157

158+
if ($this->getWatermark()) {
159+
$model->setWatermark($this->getWatermark());
160+
}
109161

110-
if ($model->isCached()) {
111-
// return 'http://staging.serenusinfotech.com/smikum/gec/skin/frontend/default/default/images/media/col_left_callout.jpg';
112-
if($externalImg){
113-
return $externalImg;
162+
$url = $model->saveFile()->getUrl();
114163
}
115-
return $model->getUrl();
116-
} else {
117-
if ($this->_scheduleRotate) {
118-
$model->rotate($this->getAngle());
164+
} catch (Exception $e) {
165+
$url = Mage::getDesign()->getSkinUrl($this->getPlaceholder());
166+
}
167+
return $url;
168+
} else {
169+
170+
try {
171+
// echo $this->_requestedImage;
172+
173+
$model = $this->_getModel();
174+
if ($this->getImageFile()) {
175+
$model->setBaseFile($this->getImageFile());
176+
} else {
177+
$model->setBaseFile($this->getProduct()->getData($model->getDestinationSubdir()));
119178
}
120179

121-
if ($this->_scheduleResize) {
122-
$model->resize();
123-
}
180+
if($this->_requestedImage == 'image' || $this->_requestedImage == 'small_image' || $this->_requestedImage == 'thumbnail'){
181+
$external_attribute = 'external_'.$this->_requestedImage;
182+
$_product = Mage::getModel('catalog/product')->load($this->getProduct()->getId());
183+
$externalImg = $_product->getData($external_attribute);
124184

125-
if ($this->getWatermark()) {
126-
$model->setWatermark($this->getWatermark());
127185
}
128186

129-
$url = $model->saveFile()->getUrl();
130-
if($externalImg){
131-
$url = $externalImg;
187+
188+
if ($model->isCached()) {
189+
// return 'http://staging.serenusinfotech.com/smikum/gec/skin/frontend/default/default/images/media/col_left_callout.jpg';
190+
if($externalImg){
191+
return $externalImg;
192+
}
193+
return $model->getUrl();
194+
} else {
195+
if ($this->_scheduleRotate) {
196+
$model->rotate($this->getAngle());
197+
}
198+
199+
if ($this->_scheduleResize) {
200+
$model->resize();
201+
}
202+
203+
if ($this->getWatermark()) {
204+
$model->setWatermark($this->getWatermark());
205+
}
206+
207+
$url = $model->saveFile()->getUrl();
208+
if($externalImg){
209+
$url = $externalImg;
210+
}
132211
}
212+
} catch (Exception $e) {
213+
$url = Mage::getDesign()->getSkinUrl($this->getPlaceholder());
133214
}
134-
} catch (Exception $e) {
135-
$url = Mage::getDesign()->getSkinUrl($this->getPlaceholder());
136-
}
137-
return $url;
138-
// return 'http://staging.serenusinfotech.com/smikum/gec/skin/frontend/default/default/images/media/col_left_callout.jpg';
139-
}
140-
141-
}
215+
return $url;
216+
// return 'http://staging.serenusinfotech.com/smikum/gec/skin/frontend/default/default/images/media/col_left_callout.jpg';
217+
218+
} // If condition over
219+
220+
} // Function over
221+
222+
} // Class over

‎app/code/local/Gec/Customimport/Helper/Data.php

+71-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -15,9 +16,75 @@
1516
#
1617
# You should have received a copy of the GNU Affero General Public License
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-
**/
19+
**/
1920

2021
class Gec_Customimport_Helper_Data extends Mage_Core_Helper_Abstract
2122
{
22-
23-
}
23+
public function writeCustomLog($msg, $path = null) {
24+
if($path == null){
25+
$path = Mage::getBaseDir('log').'/customimport.log';
26+
}
27+
error_log("[".date('Y:m:d H:i:s', time())."] : ".print_r($msg, true)."<br/> \r\n", 3, $path);
28+
}
29+
30+
public function sendLogEmail($logPath = '')
31+
{
32+
$logPath = Mage::getBaseDir('log').'/customimport.log';
33+
$logMessage = file_get_contents($logPath);
34+
if($logMessage) {
35+
$finalImportStatus = null;
36+
$logSubject = 'Catalog Import Report - '.$_SERVER['SERVER_NAME'].' - '.date('Y:m:d H:i:s T', time());
37+
$emailTemplate = Mage::getModel('core/email_template')->loadDefault('import_status');
38+
$senderName = Mage::getStoreConfig('trans_email/ident_general/name');
39+
$senderEmail = Mage::getStoreConfig('trans_email/ident_general/email');
40+
$emailTemplateVariables = array();
41+
$emailTemplateVariables['msgcol'] = $logMessage;
42+
$emailTemplateVariables['finalstatus'] = $finalImportStatus;
43+
$processedTemplate = $emailTemplate->getProcessedTemplate($emailTemplateVariables);
44+
$reciverEmail= Mage::getStoreConfig('trans_email/ident_custom1/email');
45+
$mail = Mage::getModel('core/email')
46+
->setToName($senderName)
47+
->setToEmail($reciverEmail)
48+
->setBody($processedTemplate)
49+
->setSubject($logSubject)
50+
->setFromEmail($senderEmail)
51+
->setFromName($senderName)
52+
->setType('html');
53+
try{
54+
$mail->send();
55+
}
56+
catch(Exception $error)
57+
{
58+
Mage::getSingleton('core/session')->addError($error->getMessage());
59+
return false;
60+
}
61+
} else {
62+
Mage::getSingleton('core/session')->addError('there were no log report generated...!');
63+
return false;
64+
}
65+
66+
}
67+
68+
public function getCurrentLocaleDateTime($defaultUTCDate)
69+
{
70+
return date('Y-m-d H:i:s', Mage::getModel('core/date')->timestamp(strtotime($defaultUTCDate)));
71+
}
72+
73+
public function reportInfo($msg){
74+
$msg = '<span style="color:blue;">'.$msg.'</span>';
75+
$this->writeCustomLog($msg);
76+
echo "<br/><br/>".$msg;
77+
}
78+
79+
public function reportError($msg){
80+
$msg = '<span style="color:red;">'.$msg.'</span>';
81+
$this->writeCustomLog($msg);
82+
echo "<br/><br/>".$msg;
83+
}
84+
85+
public function reportSuccess($msg){
86+
$msg = '<span style="color:#009900;">'.$msg.'</span>';
87+
$this->writeCustomLog($msg);
88+
echo "<br/><br/>".$msg;
89+
}
90+
}

‎app/code/local/Gec/Customimport/Model/Attrgroup.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -15,7 +16,7 @@
1516
#
1617
# You should have received a copy of the GNU Affero General Public License
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-
**/
19+
**/
1920

2021
class Gec_Customimport_Model_Attrgroup extends Mage_Core_Model_Abstract {
2122
/**

‎app/code/local/Gec/Customimport/Model/Attrsetmapping.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -15,7 +16,7 @@
1516
#
1617
# You should have received a copy of the GNU Affero General Public License
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-
**/
19+
**/
1920

2021
class Gec_Customimport_Model_Attrsetmapping extends Mage_Core_Model_Abstract
2122
{

‎app/code/local/Gec/Customimport/Model/Catalog/Resource/Eav/Mysql4/Attribute.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
/**
3-
# Copyright (C) 2013 Global Era (http://www.globalera.com). All Rights Reserved
3+
# Copyright (C) 2013-2015 Global Era Commerce (http://www.globalera.com). All Rights Reserved
44
# @author Serenus Infotech <[email protected]>
5+
# @author Intelliant <[email protected]>
56
#
67
# This program is free software: you can redistribute it and/or modify
78
# it under the terms of the GNU Affero General Public License as
@@ -15,7 +16,7 @@
1516
#
1617
# You should have received a copy of the GNU Affero General Public License
1718
# along with this program. If not, see <http://www.gnu.org/licenses/>.
18-
**/
19+
**/
1920

2021
class Gec_Customimport_Model_Catalog_Resource_Eav_Mysql4_Attribute extends Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute
2122
{

0 commit comments

Comments
 (0)