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

// fix table features, quantities, accounting

Browse Source
This commit is contained in:
vKham
2012-01-04 17:04:45 +00:00
parent d209e2ac04
commit b076099180
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin.css
+2
View File
@@ -225,6 +225,7 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
/*tab-pane*/ /*tab-pane*/
form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;} form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;}
#content form.adminstockmanagement {margin-left:0px;} #content form.adminstockmanagement {margin-left:0px;}
form#product_form h3 { font-size:14px; font-weight:normal;}
form#product_form h4 { font-size:18px; font-weight:normal;} form#product_form h4 { font-size:18px; font-weight:normal;}
.tab-row {} .tab-row {}
.tab-row .tab {background:#EFEFEF;width:100px;} .tab-row .tab {background:#EFEFEF;width:100px;}
@@ -420,6 +421,7 @@ select#show_modules { font-size:12px;}
label.text { padding:1px 12px 0 0;} label.text { padding:1px 12px 0 0;}
label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em} label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
.listForm {} .listForm {}
ul.listForm {} ul.listForm {}
ul.listForm li {padding-bottom:3px;} ul.listForm li {padding-bottom:3px;}
admin-dev/themes/default/template/products/accounting.tpl
+1 -3
View File
@@ -43,11 +43,10 @@
{if !empty($error)} {if !empty($error)}
<div class="hint" style="display:block">{$error}</div> <div class="hint" style="display:block">{$error}</div>
{else} {else}
<fieldset>
<legend>{l s='Account number'}</legend>
<div class="hint" style="display:block"> <div class="hint" style="display:block">
{l s='Configure the account number of the product for each zone, if a field is empty, it will use the default one of the shop set in the Accounting Management tab'} {l s='Configure the account number of the product for each zone, if a field is empty, it will use the default one of the shop set in the Accounting Management tab'}
</div> </div>
<h3>{l s='Account number'}</h3>
<br /> <br />
{foreach from=$productAccountNumberList['zones'] key=id_zone item=currentZone} {foreach from=$productAccountNumberList['zones'] key=id_zone item=currentZone}
<label>{$currentZone['name']}</label> <label>{$currentZone['name']}</label>
@@ -60,7 +59,6 @@
<i>{l s='These fields are used for the accounting export'}</i> <i>{l s='These fields are used for the accounting export'}</i>
</div> </div>
<div class="separation"></div> <div class="separation"></div>
</fieldset>
{/if} {/if}
{/if} {/if}
admin-dev/themes/default/template/products/combinaison/list_footer.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
{block name="after"} {block name="after"}
<div class="hint clear" style="display:block"> <div class="hint" style="display:block">
<ul> <ul>
<li>{l s='The row in blue is the default combination.'}</li> <li>{l s='The row in blue is the default combination.'}</li>
<li>{l s='A default combination must be designated for each product.'}</li> <li>{l s='A default combination must be designated for each product.'}</li>
admin-dev/themes/default/template/products/features.tpl
+1 -1
View File
@@ -85,7 +85,7 @@
<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" /> <input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
<span>{l s='N/A'} - <span>{l s='N/A'} -
<a href="{$link->getAdminLink('AdminFeatures')}&amp;addfeature_value&id_feature={$available_feature.id_feature}" <a href="{$link->getAdminLink('AdminFeatures')}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
class="confirm_leave button">{l s='Add pre-defined values first'}</a> class="confirm_leave button"><img src="../img/admin/add.gif" alt="values_first" title="{l s='Add pre-defined values first'}" />&nbsp;{l s='Add pre-defined values first'}</a>
</span> </span>
{/if} {/if}
</td> </td>
admin-dev/themes/default/template/products/quantities.tpl
+9 -3
View File
@@ -83,7 +83,7 @@
</tr> </tr>
<tr> <tr>
<td valign="top" style="text-align:left;vertical-align:top;"> <td valign="top" style="text-align:left;vertical-align:top;">
<table class="table" cellpadding="0" cellspacing="0" style="width:50%;"> <table class="table" cellpadding="0" cellspacing="0" style="width:100%;">
<colgroup> <colgroup>
<col width="50"></col> <col width="50"></col>
<col></col> <col></col>
@@ -115,12 +115,16 @@
<tr> <tr>
<td class="col-left"><label>{l s='When out of stock:'}</label></td> <td class="col-left"><label>{l s='When out of stock:'}</label></td>
<td style="padding-bottom:5px;"> <td style="padding-bottom:5px;">
<ul class="listForm">
<li>
<input {if $product->out_of_stock == 0} checked="checked" {/if} id="out_of_stock_1" type="radio" checked="checked" value="0" class="out_of_stock" name="out_of_stock"> <input {if $product->out_of_stock == 0} checked="checked" {/if} id="out_of_stock_1" type="radio" checked="checked" value="0" class="out_of_stock" name="out_of_stock">
<label id="label_out_of_stock_1" class="t" for="out_of_stock_1">{l s='Deny orders'}</label> <label id="label_out_of_stock_1" class="t" for="out_of_stock_1">{l s='Deny orders'}</label>
<br> </li>
<li>
<input {if $product->out_of_stock == 1} checked="checked" {/if} id="out_of_stock_2" type="radio" value="1" class="out_of_stock" name="out_of_stock"> <input {if $product->out_of_stock == 1} checked="checked" {/if} id="out_of_stock_2" type="radio" value="1" class="out_of_stock" name="out_of_stock">
<label id="label_out_of_stock_2" class="t" for="out_of_stock_2">{l s='Allow orders'}</label> <label id="label_out_of_stock_2" class="t" for="out_of_stock_2">{l s='Allow orders'}</label>
<br> </li>
<li>
<input {if $product->out_of_stock == 2} checked="checked" {/if} id="out_of_stock_3" type="radio" value="2" class="out_of_stock" name="out_of_stock"> <input {if $product->out_of_stock == 2} checked="checked" {/if} id="out_of_stock_3" type="radio" value="2" class="out_of_stock" name="out_of_stock">
<label id="label_out_of_stock_3" class="t" for="out_of_stock_3"> <label id="label_out_of_stock_3" class="t" for="out_of_stock_3">
{l s='Default'}: {l s='Default'}:
@@ -129,6 +133,8 @@
{l s='as set in Preferences'} {l s='as set in Preferences'}
</a> </a>
</label> </label>
</li>
</ul>
</td> </td>
</tr> </tr>
</tbody> </tbody>