dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 8097

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-17 16:10:20 +00:00
parent 89bc665d48
commit 0aada6cc1e
41 changed files with 107 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminDiscounts.php
+6 -4
View File
@@ -340,7 +340,11 @@ class AdminDiscounts extends AdminTab
</div>
<label>'.$this->l('Minimum amount').'</label>
<div class="margin-form">
<input type="text" size="15" name="minimal" value="'.($this->getFieldValue($obj, 'minimal') ? (float)($this->getFieldValue($obj, 'minimal')) : '0').'" onkeyup="javascript:this.value = this.value.replace(/,/g, \'.\'); " /> <sup>*</sup>
<input type="text" size="15" name="minimal" value="'.($this->getFieldValue($obj, 'minimal') ? (float)($this->getFieldValue($obj, 'minimal')) : '0').'" onkeyup="javascript:this.value = this.value.replace(/,/g, \'.\'); " /> <sup>*</sup>&nbsp;
<select name="include_tax" id="include_tax" style="vertical-align: middle;">
<option value="0">'.$this->l('tax excl.').'</option>
<option value="1">'.$this->l('tax incl.').'</option>
</select>
<p class="clear">'.$this->l('0 if not applicable').'</p>
</div>
<div class="margin-form">
@@ -540,6 +544,4 @@ class AdminDiscounts extends AdminTab
if ($key != 'infos')
self::recurseCategoryForInclude($id_obj, $indexedCategories, $categories, $categories[$id_category][$key], $key, $id_category_default, $has_suite);
}
}
}