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

// BO Stats : Date Picker + Layout WIP

Browse Source
This commit is contained in:
Kevin Granger committed 2013-09-02 10:47:07 +02:00
1 parent 252eb868d9
commit 0a8a4dcece
7 files changed
+67 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
@@ -30,4 +30,4 @@
* Email: dave@fontawesome.io * Email: dave@fontawesome.io
* Twitter: http://twitter.com/byscuits * Twitter: http://twitter.com/byscuits
* Work: Lead Product Designer @ Kyruus - http://kyruus.com * Work: Lead Product Designer @ Kyruus - http://kyruus.com
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,.panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,[class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,[class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,#header_notifs_icon_wrapper [class^="icon-"].icon-large,#header_employee_box [class^="icon-"].icon-large,#header_quick [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large,#header_notifs_icon_wrapper [class*=" icon-"].icon-large,#header_employee_box [class*=" icon-"].icon-large,#header_quick [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,#header_notifs_icon_wrapper [class^="icon-"].icon-spin,#header_employee_box [class^="icon-"].icon-spin,#header_quick [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin,#header_notifs_icon_wrapper [class*=" icon-"].icon-spin,#header_employee_box [class*=" icon-"].icon-spin,#header_quick [class*=" icon-"].icon-spin{display:inline-blockLine truncated */@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,.panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,[class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,[class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,#header_notifs_icon_wrapper [class^="icon-"].icon-large,#header_employee_box [class^="icon-"].icon-large,#header_quick [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large,#header_notifs_icon_wrapper [class*=" icon-"].icon-large,#header_employee_box [class*=" icon-"].icon-large,#header_quick [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,#header_notifs_icon_wrapper [class^="icon-"].icon-spin,#header_employee_box [class^="icon-"].icon-spin,#header_quick [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin,#header_notifs_icon_wrapper [class*=" icon-"].icon-spin,#header_employee_box [class*=" icon-"].icon-spin,#header_quick [class*=" icon-"].icon-spin{display:inline-blockLine truncated
admin-dev/themes/default/css/admin-theme.sass
+2 -2
View File
@@ -299,7 +299,6 @@ html, body
@include transition-duration(0.4s) @include transition-duration(0.4s)
@include transition-timing-function(ease-out) @include transition-timing-function(ease-out)
ul.submenu ul.submenu
@include box-shadow(rgba(black,0.3) 2px 2px 4px)
a a
display: block display: block
padding: 2px 5px 2px 10px padding: 2px 5px 2px 10px
@@ -335,10 +334,11 @@ html, body
span.title span.title
display: none display: none
ul.submenu ul.submenu
display: none!important
padding-top: 38px padding-top: 38px
position: relative position: relative
top: 0 top: 0
display: none!important @include box-shadow(rgba(black,0.3) 2px 2px 4px)
> ul > li:hover > ul > li:hover
width: 250px!important width: 250px!important
position: relative position: relative
admin-dev/themes/default/template/controllers/stats/calendar.tpl
+38 -16
View File
@@ -23,22 +23,44 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div id="statsContainer"> <div id="statsContainer" class="col-lg-9">
<div id="calendar"> <div id="calendar" class="panel">
<form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}{if isset($smarty.get.module)}&module={$smarty.get.module|escape}{/if}{if isset($smarty.get.id_product)}&id_product={$smarty.get.id_product|escape}{/if}" method="post" id="calendar_form" name="calendar_form"> <form action="{$current}&token={$token}{if $action && $table}&{$action|escape}{$table|escape}{/if}{if $identifier && $id}&{$identifier|escape}={$id|escape}{/if}{if isset($smarty.get.module)}&module={$smarty.get.module|escape}{/if}{if isset($smarty.get.id_product)}&id_product={$smarty.get.id_product|escape}{/if}" method="post" id="calendar_form" name="calendar_form" class="form-inline">
<input type="submit" name="submitDateDay" class="button submitDateDay" value="{$translations.Day}"> <div class="row">
<input type="submit" name="submitDateMonth" class="button submitDateMonth" value="{$translations.Month}"> <div class="col-lg-6">
<input type="submit" name="submitDateYear" class="button submitDateYear" value="{$translations.Year}"> <div class="btn-group">
<input type="submit" name="submitDateDayPrev" class="button submitDateDayPrev" value="{$translations.Day}-1"> <input type="submit" name="submitDateDay" class="btn btn-default submitDateDay" value="{$translations.Day}">
<input type="submit" name="submitDateMonthPrev" class="button submitDateMonthPrev" value="{$translations.Month}-1"> <input type="submit" name="submitDateMonth" class="btn btn-default submitDateMonth" value="{$translations.Month}">
<input type="submit" name="submitDateYearPrev" class="button submitDateYearPrev" value="{$translations.Year}-1"> <input type="submit" name="submitDateYear" class="btn btn-default submitDateYear" value="{$translations.Year}">
<p><span>{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</span> <input type="submit" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" value="{$translations.Day}-1">
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker"> <input type="submit" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" value="{$translations.Month}-1">
</p> <input type="submit" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" value="{$translations.Year}-1">
<p><span>{if isset($translations.To)}{$translations.To}{else}<span>{l s='From:'}</span>{/if}</span> </div>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker"> </div>
</p> <div class="col-lg-6">
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="button" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}" /> <div class="row">
<div class="col-md-8">
<div class="row">
<div class="col-xs-6">
<div class="input-group">
<label class="input-group-addon">{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</label>
<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="form-control datepicker">
</div>
</div>
<div class="col-xs-6">
<div class="input-group">
<label class="input-group-addon">{if isset($translations.To)}{$translations.To}{else}{l s='From:'}{/if}</label>
<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker form-control">
</div>
</div>
</div>
</div>
<div class="col-md-4">
<input type="submit" name="submitDatePicker" id="submitDatePicker" class="btn btn-default pull-right" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}" />
</div>
</div>
</div>
</div>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
admin-dev/themes/default/template/controllers/stats/engines.tpl
+11 -11
View File
@@ -23,12 +23,11 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<br/> <div class="blocEngine panel">
<div class="blocEngine"> <form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form" class="form-horizontal">
<form action="{$smarty.server.REQUEST_URI|escape}" method="post" id="settings_form" name="settings_form"> <h3><i class="icon-cog"></i> {l s='Settings'}</h3>
<h3 class="icon-{l s='Settings'}">{l s='Settings'}</h3>
<div class="rowForm"> <div class="form-group">
<label for="engine_stats_render">{l s='Graph engine'} </label> <label for="engine_stats_render">{l s='Graph engine'} </label>
{if count($array_graph_engines)} {if count($array_graph_engines)}
<select name="PS_STATS_RENDER" id="engine_stats_render"> <select name="PS_STATS_RENDER" id="engine_stats_render">
@@ -36,13 +35,12 @@
<option value="{$k}" {if $k == $graph_engine}selected="selected"{/if}>{$value[0]}</option> <option value="{$k}" {if $k == $graph_engine}selected="selected"{/if}>{$value[0]}</option>
{/foreach} {/foreach}
</select> </select>
{else} {else}
{l s='No graph engine module has been installed.'} {l s='No graph engine module has been installed.'}
{/if} {/if}
</div> </div>
<div class="rowForm"> <div class="form-group">
<label for="engine_grid_render">{l s='Grid engine'} </label> <label for="engine_grid_render">{l s='Grid engine'} </label>
{if count($array_grid_engines)} {if count($array_grid_engines)}
<select name="PS_STATS_GRID_RENDER" id="engine_grid_render"> <select name="PS_STATS_GRID_RENDER" id="engine_grid_render">
@@ -55,7 +53,7 @@
{/if} {/if}
</div> </div>
<div class="rowForm"> <div class="form-group">
<label for="engine_auto_clean">{l s='Auto-clean period'}</label> <label for="engine_auto_clean">{l s='Auto-clean period'}</label>
<select name="PS_STATS_OLD_CONNECT_AUTO_CLEAN" id="engine_auto_clean"> <select name="PS_STATS_OLD_CONNECT_AUTO_CLEAN" id="engine_auto_clean">
{foreach $array_auto_clean as $k => $value} {foreach $array_auto_clean as $k => $value}
@@ -63,8 +61,10 @@
{/foreach} {/foreach}
</select> </select>
</div> </div>
<p><input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="button" /></p>
</form>
</div>
<p>
<input type="submit" value="{l s='Save'}" name="submitSettings" id="submitSettings" class="btn btn-default" />
</p>
</form>
</div>
</div> </div>
admin-dev/themes/default/template/controllers/stats/menu.tpl
+5 -11
View File
@@ -22,22 +22,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div id="container"> <div id="container" class="row">
<div class="sidebar navigation"> <div class="sidebar navigation col-lg-3">
<h3>{l s='Navigation'}</h3> <nav class="list-group categorieList">
<ul class="categorieList">
{if count($modules)} {if count($modules)}
{foreach $modules as $module} {foreach $modules as $module}
{if $module_instance[$module.name]} {if $module_instance[$module.name]}
<li> <a class="list-group-item" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
<a href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
</li>
{/if} {/if}
{/foreach} {/foreach}
{else} {else}
{l s='No module has been installed.'} {l s='No module has been installed.'}
{/if} {/if}
</ul> </nav>
admin-dev/themes/default/template/controllers/stats/stats.tpl
+3 -5
View File
@@ -23,7 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<div> <div class="panel">
{if $module_name} {if $module_name}
{if $module_instance && $module_instance->active} {if $module_instance && $module_instance->active}
{$hook} {$hook}
@@ -33,8 +33,6 @@
{else} {else}
<h3 class="space">{l s='Please select a module from the left column.'}</h3> <h3 class="space">{l s='Please select a module from the left column.'}</h3>
{/if} {/if}
</div>
</div>
</div> </div>
</div>
</div>
controllers/admin/AdminOrderPreferencesController.php
+7 -7
View File
@@ -61,7 +61,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
'fields' => array( 'fields' => array(
'PS_ORDER_PROCESS_TYPE' => array( 'PS_ORDER_PROCESS_TYPE' => array(
'title' => $this->l('Order process type'), 'title' => $this->l('Order process type'),
'desc' => $this->l('Please choose either the five-step, or one-page, checkout process.'), 'hint' => $this->l('Please choose either the five-step, or one-page, checkout process.'),
'validation' => 'isInt', 'validation' => 'isInt',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'select', 'type' => 'select',
@@ -70,35 +70,35 @@ class AdminOrderPreferencesControllerCore extends AdminController
), ),
'PS_GUEST_CHECKOUT_ENABLED' => array( 'PS_GUEST_CHECKOUT_ENABLED' => array(
'title' => $this->l('Enable guest checkout'), 'title' => $this->l('Enable guest checkout'),
'desc' => $this->l('Guests can place an order without registering'), 'hint' => $this->l('Guests can place an order without registering'),
'validation' => 'isBool', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool' 'type' => 'bool'
), ),
'PS_PURCHASE_MINIMUM' => array( 'PS_PURCHASE_MINIMUM' => array(
'title' => $this->l('Minimum purchase total required in order to validate the order'), 'title' => $this->l('Minimum purchase total required in order to validate the order'),
'desc' => $this->l('Set to 0 to disable this feature'), 'hint' => $this->l('Set to 0 to disable this feature'),
'validation' => 'isFloat', 'validation' => 'isFloat',
'cast' => 'floatval', 'cast' => 'floatval',
'type' => 'price' 'type' => 'price'
), ),
'PS_ALLOW_MULTISHIPPING' => array( 'PS_ALLOW_MULTISHIPPING' => array(
'title' => $this->l('Allow multishipping'), 'title' => $this->l('Allow multishipping'),
'desc' => $this->l('Allow the customer to ship orders to multiple addresses. This option will convert the customer\'s cart into one or more orders.'), 'hint' => $this->l('Allow the customer to ship orders to multiple addresses. This option will convert the customer\'s cart into one or more orders.'),
'validation' => 'isBool', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool' 'type' => 'bool'
), ),
'PS_SHIP_WHEN_AVAILABLE' => array( 'PS_SHIP_WHEN_AVAILABLE' => array(
'title' => $this->l('Delayed shipping'), 'title' => $this->l('Delayed shipping'),
'desc' => $this->l('This option allows you to delay shipping at your customers\' request. '), 'hint' => $this->l('This option allows you to delay shipping at your customers\' request. '),
'validation' => 'isBool', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool' 'type' => 'bool'
), ),
'PS_CONDITIONS' => array( 'PS_CONDITIONS' => array(
'title' => $this->l('Terms of service'), 'title' => $this->l('Terms of service'),
'desc' => $this->l('Require customers to accept or decline terms of service before processing an order.'), 'hint' => $this->l('Require customers to accept or decline terms of service before processing an order.'),
'validation' => 'isBool', 'validation' => 'isBool',
'cast' => 'intval', 'cast' => 'intval',
'type' => 'bool', 'type' => 'bool',
@@ -109,7 +109,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
), ),
'PS_CONDITIONS_CMS_ID' => array( 'PS_CONDITIONS_CMS_ID' => array(
'title' => $this->l('Conditions of use for the CMS page'), 'title' => $this->l('Conditions of use for the CMS page'),
'desc' => $this->l('Choose the conditions of use for the CMS page.'), 'hint' => $this->l('Choose the conditions of use for the CMS page.'),
'validation' => 'isInt', 'validation' => 'isInt',
'type' => 'select', 'type' => 'select',
'list' => $cms_tab, 'list' => $cms_tab,