merge in most forks

app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Block/Product/View/Type/Configurable.php

@@ -14,7 +14,8 @@ public function getJsonConfig()
             $productId  = $product->getId();
             $childProducts[$productId] = array(
                 "price" => $this->_registerJsPrice($this->_convertPrice($product->getPrice())),
-                "finalPrice" => $this->_registerJsPrice($this->_convertPrice($product->getFinalPrice()))
+                "finalPrice" => $this->_registerJsPrice($this->_convertPrice($product->getFinalPrice())),
+                "sku" => $product->getSku(),
             );
 
             if (Mage::getStoreConfig('SCP_options/product_page/change_name')) {
@@ -34,13 +35,36 @@ public function getJsonConfig()
                     ->toHtml();
             }
 
+            $bChangeStock = Mage::getStoreConfig('SCP_options/product_page/change_stock');
+            if ($bChangeStock) {
+                // Stock status HTML
+                $oStockBlock = $this->getLayout()->createBlock('catalog/product_view_type_simple')->setTemplate('catalog/product/view/scpavailability.phtml');
+                $childProducts[$productId]["stockStatus"] = $oStockBlock->setProduct($product)->toHtml();
+
+                // Add to cart button
+                $oAddToCartBlock = $this->getLayout()->createBlock('catalog/product_view_type_simple')->setTemplate('catalog/product/view/addtocart.phtml');
+                $childProducts[$productId]["addToCart"] = $oAddToCartBlock->setProduct($product)->toHtml();
+            }
+
+            $bShowProductAlerts = Mage::getStoreConfig(Mage_ProductAlert_Model_Observer::XML_PATH_STOCK_ALLOW);
+            if ($bShowProductAlerts && !$product->isAvailable()) {
+                $oAlertBlock = $this->getLayout()->createBlock('productalert/product_view')
+                        ->setTemplate('productalert/product/view.phtml')
+                        ->setSignupUrl(Mage::helper('productalert')->setProduct($product)->getSaveUrl('stock'));;
+                $childProducts[$productId]["alertHtml"] = $oAlertBlock->toHtml();
+            }
+
             #if image changing is enabled..
             if (Mage::getStoreConfig('SCP_options/product_page/change_image')) {
                 #but dont bother if fancy image changing is enabled
                 if (!Mage::getStoreConfig('SCP_options/product_page/change_image_fancy')) {
                     #If image is not placeholder...
                     if($product->getImage()!=='no_selection') {
-                        $childProducts[$productId]["imageUrl"] = (string)Mage::helper('catalog/image')->init($product, 'image');
+                        $productMag = Mage::getModel('catalog/product')->load($productId);
+                        foreach($productMag->getMediaGalleryImages() as $image)
+                        {
+                            $childProducts[$productId]["imageUrl"][] = (string)Mage::helper('catalog/image')->init($product, 'image', $image->getFile());
+                        }
                     }
                 }
             }
@@ -75,14 +99,25 @@ public function getJsonConfig()
         $config['shortDescription'] = $this->helper('catalog/output')->productAttribute($p, nl2br($p->getShortDescription()), 'short_description');
 
         if (Mage::getStoreConfig('SCP_options/product_page/change_image')) {
-            $config["imageUrl"] = (string)Mage::helper('catalog/image')->init($p, 'image');
+            foreach($p->getMediaGalleryImages() as $image)
+            {
+                $config["imageUrl"][] = (string)Mage::helper('catalog/image')->init($p, 'image', $image->getFile());
+            }
         }
 
         $childBlock = $this->getLayout()->createBlock('catalog/product_view_attributes');
         $config["productAttributes"] = $childBlock->setTemplate('catalog/product/view/attributes.phtml')
             ->setProduct($this->getProduct())
             ->toHtml();
 
+        $bShowProductAlerts = Mage::getStoreConfig(Mage_ProductAlert_Model_Observer::XML_PATH_STOCK_ALLOW);
+        if ($bShowProductAlerts && !Mage::registry('child_product')->isAvailable()) {
+            $oAlertBlock = $this->getLayout()->createBlock('productalert/product_view')
+                    ->setTemplate('productalert/product/view.phtml')
+                    ->setSignupUrl(Mage::helper('productalert')->setProduct(Mage::registry('child_product'))->getSaveUrl('stock'));;
+            $config["alertHtml"] = $oAlertBlock->toHtml();
+        }
+
         if (Mage::getStoreConfig('SCP_options/product_page/change_image')) {
             if (Mage::getStoreConfig('SCP_options/product_page/change_image_fancy')) {
                 $childBlock = $this->getLayout()->createBlock('catalog/product_view_media');

app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Product/Type/Simple.php

@@ -35,7 +35,7 @@ public function prepareForCart(Varien_Object $buyRequest, $product = null)
     public function hasConfigurableProductParentId()
     {
         $cpid = $this->getCpid();
-        Mage::log("cpid: ". $cpid);
+        //Mage::log("cpid: ". $cpid);
         return !empty($cpid);
     }
 

app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Resource/Product/Collection.php

@@ -0,0 +1,56 @@
+<?php
+class OrganicInternet_SimpleConfigurableProducts_Catalog_Model_Resource_Product_Collection
+    extends Mage_Catalog_Model_Resource_Product_Collection
+{
+    /**
+     * Adds an additional indexed_price column to as the regular price gets over-ridden elsewhere\
+     * 
+     * This field seems to only appear when the collection has ->addPriceData();
+     * 
+     * @see Mage_Catalog_Model_Resource_Product_Collection::_productLimitationJoinPrice()
+     */
+    protected function _productLimitationPrice($joinLeft = false)
+    {
+        $filters = $this->_productLimitationFilters;
+        if (empty($filters['use_price_index'])) {
+            return $this;
+        }
+
+        $helper     = Mage::getResourceHelper('core');
+        $connection = $this->getConnection();
+	$select     = $this->getSelect();
+        $joinCond = join(' AND ', array(
+            'price_index.entity_id = e.entity_id',
+            $connection->quoteInto('price_index.website_id = ?', $filters['website_id']),
+            $connection->quoteInto('price_index.customer_group_id = ?', $filters['customer_group_id'])
+        ));
+
+        $fromPart = $select->getPart(Zend_Db_Select::FROM);
+        if (!isset($fromPart['price_index'])) {
+        	$least       = $connection->getLeastSql(array('price_index.min_price', 'price_index.tier_price'));
+            $minimalExpr = $connection->getCheckSql('price_index.tier_price IS NOT NULL',
+                $least, 'price_index.min_price');
+            $indexedExpr = new Zend_Db_Expr('price_index.price');
+            $colls = array('indexed_price'=>$indexedExpr,'price', 'tax_class_id', 'final_price', 
+            	'minimal_price'=>$minimalExpr , 'min_price', 'max_price', 'tier_price');
+            $tableName = array('price_index' => $this->getTable('catalog/product_index_price'));
+	    if ($joinLeft) {
+                $select->joinLeft($tableName, $joinCond, $colls);
+            } else {
+                $select->join($tableName, $joinCond, $colls);
+            }
+            // Set additional field filters
+            foreach ($this->_priceDataFieldFilters as $filterData) {
+                $select->where(call_user_func_array('sprintf', $filterData));
+            }
+
+        } else {
+            $fromPart['price_index']['joinCondition'] = $joinCond;
+            $select->setPart(Zend_Db_Select::FROM, $fromPart);
+        }
+        //Clean duplicated fields
+        $helper->prepareColumnsList($select);
+
+        return $this;
+    }
+}

app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php → app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Resource/Product/Indexer/Price.php

@@ -1,24 +1,36 @@
 <?php
-
-class OrganicInternet_SimpleConfigurableProducts_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price
-    extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price
+class OrganicInternet_SimpleConfigurableProducts_Catalog_Model_Resource_Product_Indexer_Price
+    extends Mage_Catalog_Model_Resource_Product_Indexer_Price
 {
-    #Returns array of pairs (childProductId:childProductType)
+    /**
+     * Get an array of child IDs by parent product ID
+     * 
+     * @param integer $parentId
+     * 
+     * @return array child_id => child_product type_id
+     */
     private function getChildIdsByParent($parentId)
     {
         $read = $this->_getReadAdapter();
         $select = $read->select()
-            #->from(array('pr' => $this->getTable('catalog/product_relation')), array('child_id'))
             ->from(array('p' => $this->getTable('catalog/product')), array('entity_id'))
             ->join(
-                #array('p' => $this->getTable('catalog/product')),
                 array('pr' => $this->getTable('catalog/product_relation')),
                 'pr.child_id=p.entity_id',
                 array('p.type_id'))
             ->where('pr.parent_id=?', $parentId);
         return $read->fetchPairs($select);
     }
 
+    /**
+     * Get product type from product id
+     * 
+     * catalog_product_entity has the product type.  Not exactly sure why
+     * we're using a join here, but it works.
+     * 
+     * @param integer $id
+     * @return string Product type
+     */
     private function getProductTypeById($id)
     {
         $read = $this->_getReadAdapter();
@@ -30,20 +42,21 @@ private function getProductTypeById($id)
                 array('p.type_id'))
             ->where('pr.parent_id=?', $id);
         $data = $read->fetchRow($select);
-        #Mage::log("SCP: getProductTypeById: result is: " . print_r($data, true));
         return $data['type_id'];
     }
 
 
-    #This is modified to pull in all sibling associated products' tier prices.
-    #Without this, indexed price updates only consider the tier prices of the specific
-    #associated product that's being saved, and it's parent
-    #This will often result in a non-lowest tier price being displayed, or no tier price being
-    #displayed when there is one (on a sibling)
-    #It's also updated to reindex child tier prices when a parent is saved
-
-    #Surely it's not just tier prices but all related prices this acts on?
-    #does copyRelationIndexData followed by reindexEntity do this itself? (just not for tier prices?)
+    /**
+     * Modified to pull in all sibling associated products' tier prices and
+     * to reindex child tier prices when a parent is saved.
+     * 
+     * Process product save.
+     * Method is responsible for index support
+     * when product was saved and changed attribute(s) has an effect on price.
+     *
+     * @param Mage_Index_Model_Event $event
+     * @return Mage_Catalog_Model_Resource_Product_Indexer_Price
+     */
     public function catalogProductSave(Mage_Index_Model_Event $event)
     {
         $productId = $event->getEntityPk();
@@ -55,55 +68,40 @@ public function catalogProductSave(Mage_Index_Model_Event $event)
         if (!isset($data['reindex_price'])) {
             return $this;
         }
-        $this->cloneIndexTable(true);
+
+        $this->clearTemporaryIndexTable();
         $this->_prepareWebsiteDateTable();
 
         $indexer = $this->_getIndexer($data['product_type_id']);
         $processIds = array($productId);
-
         if ($indexer->getIsComposite()) {
-            #Mage::log("catalogProductSave: " . "saving composite");
             if ($this->getProductTypeById($productId) == 'configurable') {
-                #Mage::log("catalogProductSave: " . "saving composite - is configurable");
                 $children = $this->getChildIdsByParent($productId);
                 $processIds = array_merge($processIds, array_keys($children));
-                #Ignore tier price data for actual configurable product
+                //Ignore tier and group price data for actual configurable product
                 $tierPriceIds = array_keys($children);
             } else {
                 $tierPriceIds = $productId;
             }
-            #Mage::log("catalogProductSave: " . "copyRelationIndexData for: " . $productId);
             $this->_copyRelationIndexData($productId);
-            #Mage::log("catalogProductSave: " . "_prepareTierPriceIndex for: " . print_r($tierPriceIds, true));
             $this->_prepareTierPriceIndex($tierPriceIds);
-            #Mage::log("catalogProductSave: " . "reindexEntity for: " . $productId);
+            $this->_prepareGroupPriceIndex($tierPriceIds);
             $indexer->reindexEntity($productId);
         } else {
-            #Mage::log("catalogProductSave: " . "saving non-composite");
             $parentIds = $this->getProductParentsByChild($productId);
-
             if ($parentIds) {
-                #Mage::log("catalogProductSave: " . "non-composite product: " . $productId . " has parents: " . print_r($parentIds, true));
-
-                #Prepare to process parents too
                 $processIds = array_merge($processIds, array_keys($parentIds));
-
                 $siblingIds = array();
                 foreach (array_keys($parentIds) as $parentId) {
                     $childIds = $this->getChildIdsByParent($parentId);
-                    #Mage::log("catalogProductSave: For parent_id: $parentId, adding childIds of: " . print_r($childIds, true));
                     $siblingIds = array_merge($siblingIds, array_keys($childIds));
                 }
-                #Mage::log("catalogProductSave: siblingIds are: " . print_r($siblingIds, true));
                 if(count($siblingIds)>0) {
                     $processIds = array_unique(array_merge($processIds, $siblingIds));
                 }
-                #Mage::log("catalogProductSave: " . "copyRelationIndexData for: " . print_r(array_keys($parentIds), true) . "ignoring relation: " . $productId);
                 $this->_copyRelationIndexData(array_keys($parentIds), $productId);
-
-                #Mage::log("catalogProductSave: " . "_prepareTierPriceIndex for: " . print_r($processIds, true));
                 $this->_prepareTierPriceIndex($processIds);
-                #Mage::log("catalogProductSave: " . "reindexEntity for: " . $productId);
+               	$this->_prepareGroupPriceIndex($processIds);
                 $indexer->reindexEntity($productId);
 
                 $parentByType = array();
@@ -112,13 +110,11 @@ public function catalogProductSave(Mage_Index_Model_Event $event)
                 }
 
                 foreach ($parentByType as $parentType => $entityIds) {
-                    #Mage::log("catalogProductSave: " . "reindexEntity using indexer of type: " . $parentType . " for: " . print_r($entityIds, true));
                     $this->_getIndexer($parentType)->reindexEntity($entityIds);
                 }
-
             } else {
-                #Mage::log("catalogProductSave: " . "non-composite product: " . $productId . " has no parents");
                 $this->_prepareTierPriceIndex($productId);
+                $this->_prepareGroupPriceIndex($productId);
                 $indexer->reindexEntity($productId);
             }
         }

app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php → app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php

@@ -1,5 +1,5 @@
 <?php
-class OrganicInternet_SimpleConfigurableProducts_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable
+class OrganicInternet_SimpleConfigurableProducts_Catalog_Model_Resource_Product_Indexer_Price_Configurable
     extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Configurable
 {
     protected function _isManageStock()
@@ -84,8 +84,8 @@ protected function _prepareFinalPriceData($entityIds = null)
             'max_price'         => new Zend_Db_Expr('pi.final_price'),
             'tier_price'        => new Zend_Db_Expr('pi.tier_price'),
             'base_tier'         => new Zend_Db_Expr('pi.tier_price'),
-             'group_price'         => new Zend_Db_Expr('pi.tier_price'),
-         'base_group_price'         => new Zend_Db_Expr('pi.tier_price'),
+            'group_price'       => new Zend_Db_Expr('pi.group_price'),
+            'base_group_price'  => new Zend_Db_Expr('pi.group_price'),
         ));
 
 
@@ -130,7 +130,6 @@ protected function _prepareFinalPriceData($entityIds = null)
             'base_tier',
             'group_price',
             'base_group_price',
-            #'base_tier',
             #'child_entity_id'
         ));
       # Mage::log("SCP Price inner query: " . $select->__toString());
@@ -140,6 +139,23 @@ protected function _prepareFinalPriceData($entityIds = null)
         $write->query($query);
 
 
+	/**
+         * Add possibility modify prices from external events
+        */
+        $select = $write->select()
+            ->join(array('wd' => $this->_getWebsiteDateTable()),
+                'i.website_id = wd.website_id',
+                array());
+        Mage::dispatchEvent('prepare_catalog_product_price_index_table', array(
+            'index_table'       => array('i' => $this->_getDefaultFinalPriceTable()),
+            'select'            => $select,
+            'entity_id'         => 'i.entity_id',
+            'customer_group_id' => 'i.customer_group_id',
+            'website_id'        => 'i.website_id',
+            'website_date'      => 'wd.website_date',
+            'update_fields'     => array('price', 'min_price', 'max_price')
+        ));
+
         return $this;
     }
 }