Version Notes
The MMN items are linked by SKU instead of Product Id
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Manufacturer_Model_Number |
| Version | 2.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.3 to 2.0
- app/code/local/Pektsekye/Mmn/Block/Adminhtml/Mmn/Edit/Tab/Form.php +3 -3
- app/code/local/Pektsekye/Mmn/Block/Adminhtml/Mmn/Grid.php +3 -3
- app/code/local/Pektsekye/Mmn/Helper/Data.php +1 -1
- app/code/local/Pektsekye/Mmn/controllers/Adminhtml/MmnController.php +6 -5
- app/code/local/Pektsekye/Mmn/etc/config.xml +1 -1
- app/code/local/Pektsekye/Mmn/sql/mmn_setup/mysql4-upgrade-0.1.0-0.2.0.php +12 -0
- app/design/frontend/default/default/layout/mmn.xml +3 -0
- package.xml +5 -5
app/code/local/Pektsekye/Mmn/Block/Adminhtml/Mmn/Edit/Tab/Form.php
CHANGED
|
@@ -8,10 +8,10 @@ class Pektsekye_Mmn_Block_Adminhtml_Mmn_Edit_Tab_Form extends Mage_Adminhtml_Blo
|
|
| 8 |
$this->setForm($form);
|
| 9 |
$fieldset = $form->addFieldset('mmn_form', array('legend'=>Mage::helper('mmn')->__('Item information')));
|
| 10 |
|
| 11 |
-
$fieldset->addField('
|
| 12 |
-
'label' => Mage::helper('mmn')->__('
|
| 13 |
'required' => true,
|
| 14 |
-
'name' => '
|
| 15 |
));
|
| 16 |
|
| 17 |
$fieldset->addField('manufacturer', 'text', array(
|
| 8 |
$this->setForm($form);
|
| 9 |
$fieldset = $form->addFieldset('mmn_form', array('legend'=>Mage::helper('mmn')->__('Item information')));
|
| 10 |
|
| 11 |
+
$fieldset->addField('sku', 'text', array(
|
| 12 |
+
'label' => Mage::helper('mmn')->__('SKU'),
|
| 13 |
'required' => true,
|
| 14 |
+
'name' => 'sku',
|
| 15 |
));
|
| 16 |
|
| 17 |
$fieldset->addField('manufacturer', 'text', array(
|
app/code/local/Pektsekye/Mmn/Block/Adminhtml/Mmn/Grid.php
CHANGED
|
@@ -21,10 +21,10 @@ class Pektsekye_Mmn_Block_Adminhtml_Mmn_Grid extends Mage_Adminhtml_Block_Widget
|
|
| 21 |
protected function _prepareColumns()
|
| 22 |
{
|
| 23 |
|
| 24 |
-
$this->addColumn('
|
| 25 |
-
'header' => Mage::helper('mmn')->__('
|
| 26 |
'align' =>'left',
|
| 27 |
-
'index' => '
|
| 28 |
));
|
| 29 |
|
| 30 |
$this->addColumn('manufacturer', array(
|
| 21 |
protected function _prepareColumns()
|
| 22 |
{
|
| 23 |
|
| 24 |
+
$this->addColumn('sku', array(
|
| 25 |
+
'header' => Mage::helper('mmn')->__('SKU'),
|
| 26 |
'align' =>'left',
|
| 27 |
+
'index' => 'sku',
|
| 28 |
));
|
| 29 |
|
| 30 |
$this->addColumn('manufacturer', array(
|
app/code/local/Pektsekye/Mmn/Helper/Data.php
CHANGED
|
@@ -43,7 +43,7 @@ class Pektsekye_Mmn_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 43 |
$read= $resource->getConnection('core_read');
|
| 44 |
$productTable = $resource->getTableName('catalog_product_entity');
|
| 45 |
$mmnTable = $resource->getTableName('mmn');
|
| 46 |
-
$rows = $read->fetchAll("SELECT DISTINCT entity_id FROM $productTable LEFT JOIN $mmnTable USING (
|
| 47 |
|
| 48 |
if(count($rows)>0){
|
| 49 |
foreach ($rows as $r)
|
| 43 |
$read= $resource->getConnection('core_read');
|
| 44 |
$productTable = $resource->getTableName('catalog_product_entity');
|
| 45 |
$mmnTable = $resource->getTableName('mmn');
|
| 46 |
+
$rows = $read->fetchAll("SELECT DISTINCT entity_id FROM $productTable LEFT JOIN $mmnTable USING (sku) WHERE $where");
|
| 47 |
|
| 48 |
if(count($rows)>0){
|
| 49 |
foreach ($rows as $r)
|
app/code/local/Pektsekye/Mmn/controllers/Adminhtml/MmnController.php
CHANGED
|
@@ -52,7 +52,7 @@ class Pektsekye_Mmn_Adminhtml_MmnController extends Mage_Adminhtml_Controller_ac
|
|
| 52 |
public function saveAction() {
|
| 53 |
if ($data = $this->getRequest()->getPost()) {
|
| 54 |
|
| 55 |
-
$data ['
|
| 56 |
$data ['manufacturer'] = trim(preg_replace('/[^\w\s-]/','',$data ['manufacturer']));
|
| 57 |
$data ['model'] = trim(preg_replace('/[^\w\s-]/','',$data ['model']));
|
| 58 |
$data ['number'] = trim(preg_replace('/[^\w\s-]/','',$data ['number']));
|
|
@@ -211,7 +211,7 @@ class Pektsekye_Mmn_Adminhtml_MmnController extends Mage_Adminhtml_Controller_ac
|
|
| 211 |
$number = 0;
|
| 212 |
/** checks columns */
|
| 213 |
$csvFields = array(
|
| 214 |
-
0 => Mage::helper('mmn')->__('
|
| 215 |
1 => Mage::helper('mmn')->__('Printer Manufacturer'),
|
| 216 |
2 => Mage::helper('mmn')->__('Printer Model'),
|
| 217 |
3 => Mage::helper('mmn')->__('Printer Number')
|
|
@@ -232,8 +232,9 @@ class Pektsekye_Mmn_Adminhtml_MmnController extends Mage_Adminhtml_Controller_ac
|
|
| 232 |
Mage::getSingleton('adminhtml/session')->addError(Mage::helper('mmn')->__('Invalid file upload attempt'));
|
| 233 |
}
|
| 234 |
|
| 235 |
-
if (!empty($v[0])
|
| 236 |
|
|
|
|
| 237 |
$v[1] = trim(preg_replace('/[^\w\s-]/','',$v[1]));
|
| 238 |
$v[2] = trim(preg_replace('/[^\w\s-]/','',$v[2]));
|
| 239 |
$v[3] = trim(preg_replace('/[^\w\s-]/','',$v[3]));
|
|
@@ -243,7 +244,7 @@ class Pektsekye_Mmn_Adminhtml_MmnController extends Mage_Adminhtml_Controller_ac
|
|
| 243 |
$mmnTable = $resource->getTableName('mmn');
|
| 244 |
$select = $read->select()
|
| 245 |
->from($mmnTable,array('mmn_id'))
|
| 246 |
-
->where("
|
| 247 |
->where("manufacturer=?",$v[1])
|
| 248 |
->where("model=?",$v[2])
|
| 249 |
->where("number=?",$v[3])
|
|
@@ -254,7 +255,7 @@ class Pektsekye_Mmn_Adminhtml_MmnController extends Mage_Adminhtml_Controller_ac
|
|
| 254 |
}
|
| 255 |
|
| 256 |
$data = array(
|
| 257 |
-
'
|
| 258 |
'manufacturer' => $v[1],
|
| 259 |
'model' => $v[2],
|
| 260 |
'number' => $v[3]
|
| 52 |
public function saveAction() {
|
| 53 |
if ($data = $this->getRequest()->getPost()) {
|
| 54 |
|
| 55 |
+
$data ['sku'] = trim($data ['sku']);
|
| 56 |
$data ['manufacturer'] = trim(preg_replace('/[^\w\s-]/','',$data ['manufacturer']));
|
| 57 |
$data ['model'] = trim(preg_replace('/[^\w\s-]/','',$data ['model']));
|
| 58 |
$data ['number'] = trim(preg_replace('/[^\w\s-]/','',$data ['number']));
|
| 211 |
$number = 0;
|
| 212 |
/** checks columns */
|
| 213 |
$csvFields = array(
|
| 214 |
+
0 => Mage::helper('mmn')->__('SKU'),
|
| 215 |
1 => Mage::helper('mmn')->__('Printer Manufacturer'),
|
| 216 |
2 => Mage::helper('mmn')->__('Printer Model'),
|
| 217 |
3 => Mage::helper('mmn')->__('Printer Number')
|
| 232 |
Mage::getSingleton('adminhtml/session')->addError(Mage::helper('mmn')->__('Invalid file upload attempt'));
|
| 233 |
}
|
| 234 |
|
| 235 |
+
if (!empty($v[0])) {
|
| 236 |
|
| 237 |
+
$v[0] = trim($v[0]);
|
| 238 |
$v[1] = trim(preg_replace('/[^\w\s-]/','',$v[1]));
|
| 239 |
$v[2] = trim(preg_replace('/[^\w\s-]/','',$v[2]));
|
| 240 |
$v[3] = trim(preg_replace('/[^\w\s-]/','',$v[3]));
|
| 244 |
$mmnTable = $resource->getTableName('mmn');
|
| 245 |
$select = $read->select()
|
| 246 |
->from($mmnTable,array('mmn_id'))
|
| 247 |
+
->where("sku=?",$v[0])
|
| 248 |
->where("manufacturer=?",$v[1])
|
| 249 |
->where("model=?",$v[2])
|
| 250 |
->where("number=?",$v[3])
|
| 255 |
}
|
| 256 |
|
| 257 |
$data = array(
|
| 258 |
+
'sku'=>$v[0],
|
| 259 |
'manufacturer' => $v[1],
|
| 260 |
'model' => $v[2],
|
| 261 |
'number' => $v[3]
|
app/code/local/Pektsekye/Mmn/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Pektsekye_Mmn>
|
| 5 |
-
<version>0.
|
| 6 |
</Pektsekye_Mmn>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Pektsekye_Mmn>
|
| 5 |
+
<version>0.2.0</version>
|
| 6 |
</Pektsekye_Mmn>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
app/code/local/Pektsekye/Mmn/sql/mmn_setup/mysql4-upgrade-0.1.0-0.2.0.php
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
//core_resource table
|
| 3 |
+
$installer = $this;
|
| 4 |
+
|
| 5 |
+
$installer->startSetup();
|
| 6 |
+
|
| 7 |
+
$installer->run("
|
| 8 |
+
ALTER TABLE `{$this->getTable('mmn')}`
|
| 9 |
+
CHANGE `entity_id` `sku` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
|
| 10 |
+
");
|
| 11 |
+
|
| 12 |
+
$installer->endSetup();
|
app/design/frontend/default/default/layout/mmn.xml
CHANGED
|
@@ -11,6 +11,9 @@
|
|
| 11 |
<reference name="right">
|
| 12 |
<block type="catalogsearch/layer" name="catalogsearch.leftnav" after="mmn" template="catalog/layer/view.phtml"/>
|
| 13 |
</reference>
|
|
|
|
|
|
|
|
|
|
| 14 |
<reference name="content">
|
| 15 |
<block type="mmn/product_result" name="mmn_products" template="catalogsearch/result.phtml">
|
| 16 |
<block type="catalog/product_list" name="search_result_list" template="catalog/product/list.phtml"></block>
|
| 11 |
<reference name="right">
|
| 12 |
<block type="catalogsearch/layer" name="catalogsearch.leftnav" after="mmn" template="catalog/layer/view.phtml"/>
|
| 13 |
</reference>
|
| 14 |
+
<reference name="root">
|
| 15 |
+
<action method="setTemplate"><template>page/2columns-right.phtml</template></action>
|
| 16 |
+
</reference>
|
| 17 |
<reference name="content">
|
| 18 |
<block type="mmn/product_result" name="mmn_products" template="catalogsearch/result.phtml">
|
| 19 |
<block type="catalog/product_list" name="search_result_list" template="catalog/product/list.phtml"></block>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Manufacturer_Model_Number</name>
|
| 4 |
-
<version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -11,11 +11,11 @@
|
|
| 11 |
|
| 12 |
HOW TO USE:
|
| 13 |
Go to your Magento admin panel ->Mmn -> Manage Items and add MMN items to all your products.</description>
|
| 14 |
-
<notes>
|
| 15 |
<authors><author><name>Stanislav</name><user>auto-converted</user><email>pektsekye@gmail.com</email></author></authors>
|
| 16 |
-
<date>2009-
|
| 17 |
-
<time>
|
| 18 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="mmn.xml" hash="ccce6ec54f314a5cba835ed503aab154"/></dir><dir name="template"><dir name="mmn"><file name="importExport.phtml" hash="23a7b58d473f29f66b943f5ca678dd8f"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="mmn.xml" hash="
|
| 19 |
<compatible/>
|
| 20 |
<dependencies/>
|
| 21 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Manufacturer_Model_Number</name>
|
| 4 |
+
<version>2.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 11 |
|
| 12 |
HOW TO USE:
|
| 13 |
Go to your Magento admin panel ->Mmn -> Manage Items and add MMN items to all your products.</description>
|
| 14 |
+
<notes>The MMN items are linked by SKU instead of Product Id</notes>
|
| 15 |
<authors><author><name>Stanislav</name><user>auto-converted</user><email>pektsekye@gmail.com</email></author></authors>
|
| 16 |
+
<date>2009-10-26</date>
|
| 17 |
+
<time>08:42:37</time>
|
| 18 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="mmn.xml" hash="ccce6ec54f314a5cba835ed503aab154"/></dir><dir name="template"><dir name="mmn"><file name="importExport.phtml" hash="23a7b58d473f29f66b943f5ca678dd8f"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="mmn.xml" hash="068a00f6d22ca11217b89c99178d0da4"/></dir><dir name="template"><dir name="mmn"><file name="mmn.phtml" hash="acb90c007ea2fe8ed684bd5550f4b724"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Pektsekye_Mmn.csv" hash="3b26c323d14dbeb131a21770ab5de639"/></dir></target><target name="mageetc"><dir name="modules"><file name="Pektsekye_Catalog.xml" hash="89e3ec6056b4ba53d06df1370b347d42"/><file name="Pektsekye_CatalogSearch.xml" hash="c1152b8350ae4906db9736369c8e5edf"/><file name="Pektsekye_Mmn.xml" hash="44dbf66ea36b134b159edb1d51878a2a"/></dir></target><target name="magelocal"><dir name="Pektsekye"><dir name="Catalog"><dir name="Model"><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Category.php" hash="581fafac71ce0965cb48543bc8b26d80"/></dir></dir></dir><file name="Category.php" hash="418df457636d063fbcbc0e7266b2cf0b"/></dir></dir><dir name="CatalogSearch"><dir name="Model"><file name="Layer.php" hash="92da80a8187107d6eeebd25eaa718655"/></dir></dir><dir name="Mmn"><dir name="Block"><dir name="Adminhtml"><dir name="Mmn"><dir name="Edit"><dir name="Tab"><file name="Form.php" hash="575e2809962ee019dbe890fe10530ec0"/></dir><file name="Form.php" hash="3e2719346ecd021383a091efa5621611"/><file name="Tabs.php" hash="566c0485654104d853ccc55c78336cc4"/></dir><file name="Edit.php" hash="75610373c3eb5e335a3ff344716a1ea3"/><file name="Grid.php" hash="cb82d2e0d16f5a2872e5e89c95ec1456"/><file name="ImportExport.php" hash="a475879ab7f6c831aa01fc9927fda212"/></dir><file name="Mmn.php" hash="6ff0685d30001b1d32511bc0cd091c02"/></dir><dir name="Product"><file name="Result.php" hash="00641875e34a3bc2851f6785a9975f81"/></dir><file name="Mmn.php" hash="9c6bc640466ef349fc9fac3023f9f332"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="MmnController.php" hash="6e68c74fbff92ccfa31a29dc994271d0"/></dir><file name="IndexController.php" hash="aa43963369f7166820a20bec5c2d1c8b"/><file name="ProductController.php" hash="6f36953551c101f2d0e890b2569b8444"/></dir><dir name="etc"><file name="config.xml" hash="e3d7af623b18f7f8ba3b12f0e068d0b2"/><file name="system.xml" hash="9d2b000bba821307bde419a4e2b2fb13"/></dir><dir name="Helper"><file name="Data.php" hash="93b6eb686e54179e17c3df81e330699f"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Mmn"><file name="Collection.php" hash="7a9240e2cef54b5e1796fb12d2d9369f"/></dir><file name="Mmn.php" hash="c67333dbda050636e9a85e7cfd963bdb"/></dir><file name="Mmn.php" hash="cef143b02735b99c273a8188efee3a38"/><file name="Status.php" hash="7706d422d80badeac80e81985fc2fe79"/></dir><dir name="sql"><dir name="mmn_setup"><file name="mysql4-install-0.1.0.php" hash="e0b1a7ec159b3ff8aa0d16cc4c3d32a0"/><file name="mysql4-upgrade-0.1.0-0.2.0.php" hash="c10c1215a946e1330894e21994c6a9c5"/></dir></dir></dir></dir></target></contents>
|
| 19 |
<compatible/>
|
| 20 |
<dependencies/>
|
| 21 |
</package>
|
