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

// Orders WIP

Browse Source
This commit is contained in:
Kevin Granger
2013-10-08 12:26:48 +02:00
parent b7e13e2e7f
commit 3e6f425bd4
6 changed files with 619 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+4 -4
View File
@@ -1510,7 +1510,7 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i
display: block; display: block;
width: 100%; width: 100%;
height: 27px; height: 27px;
padding: 4px 12px; padding: 4px 8px;
font-size: 12px; font-size: 12px;
line-height: 1.42857; line-height: 1.42857;
color: #555555; color: #555555;
@@ -1732,7 +1732,7 @@ textarea.input-lg, .input-group-lg > textarea, .input-group-lg > textarea.input-
/* line 10, ../bower_components/sass-bootstrap/lib/_buttons.scss */ /* line 10, ../bower_components/sass-bootstrap/lib/_buttons.scss */
.btn { .btn {
display: inline-block; display: inline-block;
padding: 4px 12px; padding: 4px 8px;
margin-bottom: 0; margin-bottom: 0;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
@@ -3170,7 +3170,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
/* line 59, ../bower_components/sass-bootstrap/lib/_input-groups.scss */ /* line 59, ../bower_components/sass-bootstrap/lib/_input-groups.scss */
.input-group-addon { .input-group-addon {
padding: 4px 12px; padding: 4px 8px;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;
@@ -3842,7 +3842,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.pagination > li > a, .pagination > li > span { .pagination > li > a, .pagination > li > span {
position: relative; position: relative;
float: left; float: left;
padding: 4px 12px; padding: 4px 8px;
line-height: 1.42857; line-height: 1.42857;
text-decoration: none; text-decoration: none;
background-color: white; background-color: white;
admin-dev/themes/default/css/bootstrap/_variables.scss
+1 -1
View File
@@ -64,7 +64,7 @@ $headings-font-weight: 300 ;
// Based on 14px font-size and 1.428 line-height (~20px to start) // Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 4px ; $padding-base-vertical: 4px ;
// $padding-base-horizontal: 12px ; $padding-base-horizontal: 8px ;
// $padding-large-vertical: 14px ; // $padding-large-vertical: 14px ;
// $padding-large-horizontal: 16px ; // $padding-large-horizontal: 16px ;
admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+2 -2
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div class="form-horizontal"> <div class="form-horizontal well">
<div class="form-group"> <div class="form-group">
<label class="control-label col-lg-3"> <label class="control-label col-lg-3">
{l s='Name'} {l s='Name'}
@@ -95,7 +95,7 @@
</div> </div>
{/if} {/if}
<div class="form-group"> <div class="row">
<div class="col-lg-9 col-lg-offset-3"> <div class="col-lg-9 col-lg-offset-3">
<button class="btn btn-default" type="button" id="cancel_add_voucher"> <button class="btn btn-default" type="button" id="cancel_add_voucher">
<i class="icon-remove text-danger"></i> <i class="icon-remove text-danger"></i>
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+2 -2
View File
@@ -48,7 +48,7 @@
</td> </td>
<td style="display:none;"> <td style="display:none;">
<div class="form-group"> <div class="row">
<div class="input-group fixed-width-xl"> <div class="input-group fixed-width-xl">
<div class="input-group-addon"> <div class="input-group-addon">
{$currency->sign} {$currency->sign}
@@ -57,7 +57,7 @@
<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" /> <input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="row">
<div class="input-group fixed-width-xl"> <div class="input-group fixed-width-xl">
<div class="input-group-addon"> <div class="input-group-addon">
{$currency->sign} {$currency->sign}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+595 -571
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/template/helpers/list/list_header.tpl
+15 -8
View File
@@ -185,10 +185,8 @@
if (submited) if (submited)
return false; return false;
submited = true; submited = true;
//add hidden input to emulate submit button click when posting the form -> field name posted //add hidden input to emulate submit button click when posting the form -> field name posted
btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />'); btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
$('#{$table}_form').submit(); $('#{$table}_form').submit();
return false; return false;
}); });
@@ -198,7 +196,6 @@
btn_save_and_stay.click(function() { btn_save_and_stay.click(function() {
//add hidden input to emulate submit button click when posting the form -> field name posted //add hidden input to emulate submit button click when posting the form -> field name posted
btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />'); btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
$('#{$table}_form').submit(); $('#{$table}_form').submit();
return false; return false;
}); });
@@ -340,11 +337,21 @@
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option> <option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
</select> </select>
{elseif $params.type == 'date' || $params.type == 'datetime'} {elseif $params.type == 'date' || $params.type == 'datetime'}
<div class="date_range form-group"> <div class="date_range row">
<label>{l s='From'}</label> <div class="input-group fixed-width-xl">
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"{if isset($params.width)} style="width:70px"{/if}/> <span class="input-group-addon">{l s='From'}</span>
<label>{l s='To'}</label> <input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"/>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/> <span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
<div class="input-group fixed-width-xl">
<span class="input-group-addon">{l s='To'}</span>
<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"/>
<span class="input-group-addon">
<i class="icon-calendar"></i>
</span>
</div>
</div> </div>
{elseif $params.type == 'select'} {elseif $params.type == 'select'}
{if isset($params.filter_key)} {if isset($params.filter_key)}