Merge pull request #15 from ravilrrr/master

FIX главная категория и показывать в категориях.
myopencart · Sep 13, 2013 · 7f1d60a · 7f1d60a
2 parents e941f63 + 8117014
commit 7f1d60a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/admin/controller/catalog/product.php b/admin/controller/catalog/product.php
@@ -1490,7 +1490,15 @@ protected function getForm() {
 			$this->data['main_category_id'] = $this->model_catalog_product->getProductMainCategoryId($this->request->get['product_id']);
 		} else {
 			$this->data['main_category_id'] = 0;
-		}	
+		}
+
+		if (isset($this->request->post['product_category'])) {
+			$this->data['product_category'] = $this->request->post['product_category'];
+		} elseif (isset($this->request->get['product_id'])) {
+			$this->data['product_category'] = $this->model_catalog_product->getProductCategories($this->request->get['product_id']);
+		} else {
+			$this->data['product_category'] = array();
+		}		
 
 		if (isset($this->request->post['product_related'])) {
 			$products = $this->request->post['product_related'];
@@ -1694,4 +1702,4 @@ public function autocomplete() {
 		$this->response->setOutput(json_encode($json));
 	}
 }
-?>
+?>
diff --git a/admin/view/template/catalog/product_form.tpl b/admin/view/template/catalog/product_form.tpl
@@ -253,7 +253,7 @@
               <td><?php echo $entry_main_category; ?></td>
               <td><select name="main_category_id">
                 <option value="0" selected="selected"><?php echo $text_none; ?></option>
-                <?php foreach ($product_categories as $product_categories) { ?>
+                <?php foreach ($categories as $product_categories) { ?>
                 <?php if ($product_categories['category_id'] == $main_category_id) { ?>
                 <option value="<?php echo $product_categories['category_id']; ?>" selected="selected"><?php echo $product_categories['name']; ?></option>
                 <?php } else { ?>
@@ -270,7 +270,7 @@
                   <?php $class = ($class == 'even' ? 'odd' : 'even'); ?>
 
                   <div class="<?php echo $class; ?>">
-                    <?php if (in_array($category['category_id'], $product_categories)) { ?>
+                    <?php if (in_array($category['category_id'], $product_category)) { ?>
                     <input type="checkbox" name="product_category[]" value="<?php echo $category['category_id']; ?>" checked="checked" />
                     <?php echo $category['name']; ?>
                     <?php } else { ?>