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

[+] BO : Product "For"

Browse Source
This commit is contained in:
Jérôme Nadaud
2013-07-25 14:33:14 +02:00
parent d6b38635f9
commit 3f83dd9222
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/associations.tpl
+2 -2
View File
@@ -64,7 +64,7 @@
</div>
<div class="row">
<label class="control-label col-lg-3">
<label class="control-label col-lg-3" for="product_autocomplete_input">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}{l s='(Do not forget to save the product afterward)'}">
{l s='Accessories:'}
@@ -93,7 +93,7 @@
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Manufacturer:'}</label>
<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label>
<div class="col-lg-9">
<div class="row">
<div class="col-lg-7">
admin-dev/themes/default/template/controllers/products/informations.tpl
+10 -10
View File
@@ -94,7 +94,7 @@
<div id="warn_virtual_combinations" class="alert alert-block" style="display:none">{l s='You cannot use combinations with a virtual product.'}</div>
<div class="row">
<label class="control-label col-lg-3">{$bullet_common_field} {l s='Type:'}</label>
<label class="control-label col-lg-3" for="simple_product">{$bullet_common_field} {l s='Type:'}</label>
<div class="col-lg-9">
<div class="radio">
<label for="simple_product">
@@ -197,7 +197,7 @@
<div class="row redirect_product_options" style="display:none">
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
<label class="control-label col-lg-3">{l s='Redirect:'}</label>
<label class="control-label col-lg-3" for="redirect_type">{l s='Redirect:'}</label>
<div class="col-lg-5">
<select name="redirect_type" id="redirect_type">
<option value="404" {if $product->redirect_type == '404'} selected="selected" {/if}>{l s='No redirect (404)'}</option>
@@ -218,7 +218,7 @@
<div class="row redirect_product_options redirect_product_options_product_choise" style="display:none">
{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
<label class="control-label col-lg-3">{l s='Related product:'}</label>
<label class="control-label col-lg-3" for="related_product_autocomplete_input">{l s='Related product:'}</label>
<div class="col-lg-7">
<input type="hidden" value="" name="id_product_redirected" />
@@ -243,7 +243,7 @@
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
<label class="control-label col-lg-3">{l s='Visibility:'}</label>
<label class="control-label col-lg-3" for="visibility">{l s='Visibility:'}</label>
<div class="col-lg-3">
<select name="visibility" id="visibility">
<option value="both" {if $product->visibility == 'both'}selected="selected"{/if} >{l s='Everywhere'}</option>
@@ -264,7 +264,7 @@
</div>
{/if}
<div class="row">
<label class="control-label col-lg-3">{l s='Options:'}</label>
<label class="control-label col-lg-3" for="available_for_order">{l s='Options:'}</label>
<div class="col-lg-5">
<p class="checkbox">
<input type="checkbox" name="available_for_order" id="available_for_order" value="1" {if $product->available_for_order}checked="checked"{/if} />
@@ -282,7 +282,7 @@
</div>
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="condition" type="default"}
<label class="control-label col-lg-3">{l s='Condition:'}</label>
<label class="control-label col-lg-3" for="condition">{l s='Condition:'}</label>
<div class="col-lg-3">
<select name="condition" id="condition">
<option value="new" {if $product->condition == 'new'}selected="selected"{/if} >{l s='New'}</option>
@@ -342,12 +342,12 @@
<div id="createImageDescription" class="panel" style="display:none">
<div class="row">
<label class="control-label col-lg-3">{l s='Select your image:'}</label>
<label class="control-label col-lg-3" for="smallImage_{$key}">{l s='Select your image:'}</label>
<div class="col-lg-9">
<ul class="list-inline">
{foreach from=$images item=image key=key}
<li>
<input type="radio" name="smallImage" id="smallImage_{$key}" value="{$image.id_image}" {if $key == 0}checked="checked"{/if} >
<input type="radio" name="smallImage" id=" for="smallImage_{$key}"" value="{$image.id_image}" {if $key == 0}checked="checked"{/if} >
<label for="smallImage_{$key}" class="t">
<img src="{$image.src}" alt="{$image.legend}" />
</label>
@@ -357,7 +357,7 @@
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Position:'}</label>
<label class="control-label col-lg-3" for="leftRight_1">{l s='Position:'}</label>
<div class="col-lg-5">
<p class="checkbox">
<input type="radio" name="leftRight" id="leftRight_1" value="left" checked>
@@ -370,7 +370,7 @@
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Select the type of picture:'}</label>
<label class="control-label col-lg-3" for="imageTypes_{$key}">{l s='Select the type of picture:'}</label>
<div class="col-lg-5">
{foreach from=$imagesTypes key=key item=type}
<p class="checkbox">
admin-dev/themes/default/template/controllers/products/prices.tpl
+14 -14
View File
@@ -144,7 +144,7 @@ $(document).ready(function () {
<div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="id_tax_rules_group" type="default"}
<label class="control-label col-lg-3">{l s='Tax rule:'}</label>
<label class="control-label col-lg-3" for="id_tax_rules_group">{l s='Tax rule:'}</label>
<div class="col-lg-8">
<script type="text/javascript">
noTax = {if $tax_exclude_taxe_option}true{else}false{/if};
@@ -193,7 +193,7 @@ $(document).ready(function () {
<div class="row" {if !$ps_use_ecotax} style="display:none;"{/if}>
{include file="controllers/products/multishop/checkbox.tpl" field="ecot" type="default"}
<label class="control-label col-lg-3">
<label class="control-label col-lg-3" for="ecotax">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='already included in price'}">
{l s='Eco-tax (tax incl.):'}
@@ -206,7 +206,7 @@ $(document).ready(function () {
</div>
<div class="row" {if !$country_display_tax_label || $tax_exclude_taxe_option}style="display:none;"{/if} >
<label class="control-label col-lg-3">{l s='Retail price with tax:'}</label>
<label class="control-label col-lg-3" for="priceTI">{l s='Retail price with tax:'}</label>
<div class="input-group col-lg-2">
<span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
<input id="priceType" name="priceType" type="hidden" value="TE" />
@@ -308,7 +308,7 @@ $(document).ready(function () {
<div class="col-lg-12">
<div class="row">
<label class="control-label col-lg-3">{l s='For:'}</label>
<label class="control-label col-lg-3" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For:'}</label>
<div class="col-lg-9">
<div class="row">
{if !$multi_shop}
@@ -352,7 +352,7 @@ $(document).ready(function () {
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Customer:'}</label>
<label class="control-label col-lg-3" for="customer">{l s='Customer:'}</label>
<div class="col-lg-9">
<input type="hidden" name="sp_id_customer" id="id_customer" value="0" />
<input type="text" name="customer" value="{l s='All customers'}" id="customer" autocomplete="off" />
@@ -363,7 +363,7 @@ $(document).ready(function () {
{if $combinations|@count != 0}
<div class="row">
<label class="control-label col-lg-3">{l s='Combination:'}</label>
<label class="control-label col-lg-3" for="sp_id_product_attribute">{l s='Combination:'}</label>
<div class="col-lg-4">
<select id="sp_id_product_attribute" name="sp_id_product_attribute">
<option value="0">{l s='Apply to all combinations'}</option>
@@ -376,7 +376,7 @@ $(document).ready(function () {
{/if}
<div class="row">
<label class="control-label col-lg-3">{l s='Available from:'}</label>
<label class="control-label col-lg-3" for="sp_from">{l s='Available from:'}</label>
<div class="input-group col-lg-4">
<input class="datepicker" type="text" name="sp_from" value="" style="text-align: center" id="sp_from" />
<span class="input-group-addon">{l s='to'}</span>
@@ -385,15 +385,15 @@ $(document).ready(function () {
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Starting at'}</label>
<label class="control-label col-lg-3" for="sp_from_quantity">{l s='Starting at'}</label>
<div class="input-group col-lg-4">
<span class="input-group-addon">{l s='unit'}</span>
<input type="text" name="sp_from_quantity" value="1" />
<input type="text" name="sp_from_quantity" id="sp_from_quantity" value="1" />
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Product price'}
<label class="control-label col-lg-3" for="sp_price">{l s='Product price'}
{if $country_display_tax_label}
{l s='(tax excl.):'}
{/if}
@@ -406,7 +406,7 @@ $(document).ready(function () {
</div>
<div class="col-lg-8">
<p class="checkbox">
<label>{l s='Leave base price:'}</label>
<label for="leave_bprice">{l s='Leave base price:'}</label>
<input id="leave_bprice" type="checkbox" value="1" checked="checked" name="leave_bprice" />
</p>
</div>
@@ -415,14 +415,14 @@ $(document).ready(function () {
</div>
<div class="row">
<label class="control-label col-lg-3">{l s='Apply a discount of:'}</label>
<label class="control-label col-lg-3" for="sp_reduction">{l s='Apply a discount of:'}</label>
<div class="col-lg-4">
<div class="row">
<div class="col-lg-6">
<input type="text" name="sp_reduction" value="0.00"/>
<input type="text" name="sp_reduction" id="sp_reduction" value="0.00"/>
</div>
<div class="col-lg-6">
<select name="sp_reduction_type">
<select name="sp_reduction_type" id="sp_reduction_type">
<option selected="selected">---</option>
<option value="amount">{l s='Amount'}</option>
<option value="percentage">{l s='Percentage'}</option>
controllers/admin/AdminProductsController.php
+2 -2
View File
@@ -3307,9 +3307,9 @@ class AdminProductsControllerCore extends AdminController
$content .= '
<div class="row">
<label class="control-label col-lg-3">'.$this->l('Priorities:').'</label>
<label class="control-label col-lg-3" for="specificPricePriority1">'.$this->l('Priorities:').'</label>
<div class="input-group col-lg-9">
<select name="specificPricePriority[]">
<select id="specificPricePriority1" name="specificPricePriority[]">
<option value="id_shop"'.($specific_price_priorities[0] == 'id_shop' ? ' selected="selected"' : '').'>'.$this->l('Shop').'</option>
<option value="id_currency"'.($specific_price_priorities[0] == 'id_currency' ? ' selected="selected"' : '').'>'.$this->l('Currency').'</option>
<option value="id_country"'.($specific_price_priorities[0] == 'id_country' ? ' selected="selected"' : '').'>'.$this->l('Country').'</option>