// Fix SpecificPriceRule form and multishop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11502 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/template/specific_price_rule/form.tpl

@@ -115,6 +115,9 @@
 		</div>
 	</div>
 </fieldset>
+{if !$is_multishop}
+	<input type="hidden" name="id_shop" value=1 />
+{/if}
 {/block}
 
 {block name="script"}

classes/helper/HelperForm.php

@@ -81,10 +81,13 @@ class HelperFormCore extends Helper
 		$color = true;
 		$date = true;
 		$tinymce = true;
-		foreach ($this->fields_form as $fieldset)
+		foreach ($this->fields_form as $fieldset_key => $fieldset)
 			if (isset($fieldset['form']['input']))
 				foreach ($fieldset['form']['input'] as $key => $params)
 				{
+					// If the condition is not met, the field will not be displayed
+					if (isset($params['condition']) && !$params['condition'])
+						unset($this->fields_form[$fieldset_key]['form']['input'][$key]);
 					switch ($params['type'])
 					{
 						case 'categories':

controllers/admin/AdminSpecificPriceRuleController.php

@@ -93,12 +93,10 @@ class AdminSpecificPriceRuleController extends AdminController
 			'from' => array(
 				'title' => $this->l('From'),
 				'align' => 'center',
-				
 			),
 			'to' => array(
 				'title' => $this->l('To'),
 				'align' => 'center',
-				
 			),
 		);
 		
@@ -129,6 +127,7 @@ class AdminSpecificPriceRuleController extends AdminController
 						'id' => 'id_shop',
 						'name' => 'name'
 					),
+					'condition' => Shop::isFeatureActive()
 				),
 				array(
 					'type' => 'select',
@@ -166,7 +165,8 @@ class AdminSpecificPriceRuleController extends AdminController
 					'name' => 'from_quantity',
 					'size' => 6,
 					'maxlength' => 10,
-					'value' => '1'
+					'value' => '1',
+					'required' => true
 				),
 				array(
 					'type' => 'text',
@@ -182,12 +182,14 @@ class AdminSpecificPriceRuleController extends AdminController
 					'label' => $this->l('From:'),
 					'name' => 'from',
 					'size' => 12,
+					'required' => true
 				),
 				array(
 					'type' => 'date',
 					'label' => $this->l('To:'),
 					'name' => 'to',
 					'size' => 12,
+					'required' => true
 				),
 				array(
 					'type' => 'select',
@@ -236,7 +238,8 @@ class AdminSpecificPriceRuleController extends AdminController
 										'attributes_group' => $attribute_groups,
 										'features' => $features,
 										'categories' => Category::getSimpleCategories((int)$this->context->language->id),
-										'conditions' => $this->object->getConditions()
+										'conditions' => $this->object->getConditions(),
+										'is_multishop' => Shop::isFeatureActive()
 										);
 		
 		return parent::renderForm();
@@ -260,7 +263,7 @@ class AdminSpecificPriceRuleController extends AdminController
 					$object->addConditions($conditions);
 				}
 			}
+			$object->apply();
 		}
-		$object->apply();
 	}
 }