Merge pull request #512 from pmhou/pmhou/enhancement/variation-form

Merge #512
silvershop · Jun 29, 2016 · 99701b0 · 99701b0
2 parents 73be24f + f4f7b85
commit 99701b0
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/code/product/variations/VariationForm.php b/code/product/variations/VariationForm.php
@@ -37,11 +37,18 @@ public function __construct($controller, $name = "VariationForm")
 
         if (self::$include_json) {
             $vararray = array();
-
-            if ($vars = $product->Variations()) {
-                foreach ($vars as $var) {
-                    $vararray[$var->ID] = $var->AttributeValues()->map('ID', 'ID')->toArray();
-                }
+
+            $query = $query2 = new SQLQuery();
+
+            $query->setSelect('ID')
+                ->setFrom('ProductVariation')
+                ->setWhere(array('ProductID' => $product->ID));
+
+            foreach ($query->execute()->column('ID') as $variationID) {
+                $query2->setSelect('ProductAttributeValueID')
+                    ->setFrom('ProductVariation_AttributeValues')
+                    ->setWhere(array('ProductVariationID' => $variationID));
+                $vararray[$variationID] = $query2->execute()->keyedColumn();
             }
 
             $fields->push(