changement css
This commit is contained in:
Marion Muszynski
parent
a965103db4
commit
3d34054aec
@ -65,6 +65,11 @@ h2 {
|
||||
label{
|
||||
color: #504d8b;
|
||||
}
|
||||
form label{
|
||||
float: none;
|
||||
width: auto;
|
||||
text-align: left;
|
||||
}
|
||||
.panel{
|
||||
border-radius: 0px;
|
||||
-moz-box-shadow: 2px 2px 5px #cccccc;
|
||||
@ -175,6 +180,13 @@ input:focus, textarea:focus {
|
||||
line-height: 28px;
|
||||
}
|
||||
|
||||
input[type="text"],
|
||||
input[type="password"],
|
||||
input[type="file"],
|
||||
textarea {
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* table */
|
||||
table.table-custombordered {
|
||||
border: 1px solid rgba(221,221,221,0.78);
|
||||
|
||||
@ -179,6 +179,8 @@ class AdminInvoices extends AdminTab
|
||||
$("#date_to").inputmask("9999-99-99");
|
||||
$("#date_from2").inputmask("9999-99-99");
|
||||
$("#date_to2").inputmask("9999-99-99");
|
||||
$("#date_from3").inputmask("9999-99-99");
|
||||
$("#date_to3").inputmask("9999-99-99");
|
||||
});
|
||||
</script>';
|
||||
|
||||
@ -321,44 +323,41 @@ class AdminInvoices extends AdminTab
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
<form action="'.$currentIndex.'&token='.$this->token.'" method="post">
|
||||
<form action="'.$currentIndex.'&token='.$this->token.'" method="post" class="form-inline">
|
||||
<div><strong>'.$this->l('Orders from a single sale').'</strong></div>
|
||||
<br />
|
||||
<label style="width:90px">'.$this->l('Select a sale:').' </label>
|
||||
<div class="margin-form" style="padding-left:100px"><br />
|
||||
<select name="id_sale">
|
||||
';
|
||||
// foreach(Sale::getSales(NULL, NULL, NULL, NULL, FALSE, FALSE, '`date_start` DESC') as $sale) {
|
||||
// echo '<option value="'.$sale->id.'">'.$sale->id.' - '.$sale->title[(int) $cookie->id_lang].'</option>';
|
||||
// }
|
||||
<div class="form-group">
|
||||
<label>'.$this->l('Select a sale:').' </label>
|
||||
<select class="form-control" name="id_sale" disabled="disabled">
|
||||
<option>Fonction inactive</option>
|
||||
';
|
||||
// foreach(Sale::getSales(NULL, NULL, NULL, NULL, FALSE, FALSE, '`date_start` DESC') as $sale) {
|
||||
// echo '<option value="'.$sale->id.'">'.$sale->id.' - '.$sale->title[(int) $cookie->id_lang].'</option>';
|
||||
// }
|
||||
$form .= '</select>
|
||||
<div class="clear"></div>
|
||||
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrintOneSale" class="btn btn-primary btn-sm" disabled="disabled"/>
|
||||
</div>
|
||||
<div class="margin-form" style="padding-left:100px">
|
||||
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrintOneSale" class="button" />
|
||||
</div>
|
||||
|
||||
<br />
|
||||
|
||||
<div class="ln_solid-small"></div>
|
||||
<div><strong>'.$this->l('Orders from multiple sales').'</strong></div>
|
||||
<br />
|
||||
<label style="width:90px">'.$this->l('From:').' </label>
|
||||
<div class="margin-form" style="padding-left:100px">
|
||||
<input type="text" size="4" maxlength="10" name="date_from" value="'.(date('Y-m-d')).'" style="width: 120px;" /> <sup>*</sup>
|
||||
<p class="clear">'.$this->l('Format: 2007-12-31 (inclusive)').'</p>
|
||||
</div>
|
||||
<label style="width:90px">'.$this->l('To:').' </label>
|
||||
<div class="margin-form" style="padding-left:100px">
|
||||
<input type="text" size="4" maxlength="10" name="date_to" value="'.(date('Y-m-d')).'" style="width: 120px;" /> <sup>*</sup>
|
||||
<p class="clear">'.$this->l('Format: 2008-12-31 (inclusive)').'</p>
|
||||
</div>
|
||||
<div class="margin-form" style="padding-left:100px">
|
||||
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrintMultipleSales" class="button" />
|
||||
</div>
|
||||
<div class="small"><sup>*</sup> '.$this->l('Required fields').'</div>
|
||||
<br>
|
||||
<div>
|
||||
<div class="form-group">
|
||||
<div class="input-group col-md-4">
|
||||
<div class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></div>
|
||||
<input type="text" class="form-control" name="date_from" value="'.(date('Y-m-d')).'" id="date_from3">
|
||||
</div>
|
||||
<label>'.$this->l('To:').' </label>
|
||||
<div class="input-group col-md-4">
|
||||
<div class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></div>
|
||||
<input type="text" class="form-control" name="date_to" value="'.(date('Y-m-d')).'" id="date_to3">
|
||||
</div>
|
||||
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrintMultipleSales" class="btn btn-primary btn-sm" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
</form>
|
||||
<br /><br />
|
||||
<div style="padding-left:100px">';
|
||||
<div class="ln_solid-small"></div>
|
||||
<div class="text-center">';
|
||||
if(Tools::getValue('check_print')) {
|
||||
$check = '';
|
||||
$token = Tools::getAdminTokenLite('AdminOrders');
|
||||
@ -375,7 +374,7 @@ class AdminInvoices extends AdminTab
|
||||
}
|
||||
$form .= '<strong>'.$this->l('Unprinted orders:').'</strong><ul>'.$check.'</ul>';
|
||||
} else {
|
||||
$form .= '<a class="button" href="'.$_SERVER['REQUEST_URI'].'&check_print=1">'.$this->l('Display unprinted orders').'</a>';
|
||||
$form .= '<a class="btn btn-primary" href="'.$_SERVER['REQUEST_URI'].'&check_print=1">'.$this->l('Display unprinted orders').'</a>';
|
||||
}
|
||||
$form .= '</div>
|
||||
<br />
|
||||
@ -393,22 +392,21 @@ class AdminInvoices extends AdminTab
|
||||
<div class="panel-content">
|
||||
<form action="'.$currentIndex.'&token='.$this->token.'" method="post">
|
||||
<label style="width:90px">'.$this->l('Statuses').' :</label>
|
||||
<div class="margin-form" style="padding-left:100px">
|
||||
<ul>';
|
||||
<div class="margin-form" style="padding-left:100px">';
|
||||
foreach ($statuses as $status)
|
||||
$form .= ' <li style="list-style: none;">
|
||||
$form .= '<div class="checkbox">
|
||||
<label for="id_order_state_'.(int)$status['id_order_state'].'" style="'.((isset($statusStats[$status['id_order_state']]) AND $statusStats[$status['id_order_state']]) ? 'font-weight: bold;' : 'font-weight:normal;').'color:#000">
|
||||
<input type="checkbox" name="id_order_state[]" value="'.(int)$status['id_order_state'].'" id="id_order_state_'.(int)$status['id_order_state'].'">
|
||||
<label for="id_order_state_'.(int)$status['id_order_state'].'" style="float:none;'.((isset($statusStats[$status['id_order_state']]) AND $statusStats[$status['id_order_state']]) ? '' : 'font-weight:normal;').'padding:0;text-align:left;width:100%;color:#000">
|
||||
<img src="../img/admin/charged_'.($status['invoice'] ? 'ok' : 'ko').'.gif" alt="" />
|
||||
'.$status['name'].' ('.((isset($statusStats[$status['id_order_state']]) AND $statusStats[$status['id_order_state']]) ? $statusStats[$status['id_order_state']] : '0').')
|
||||
</label>
|
||||
</li>';
|
||||
$form .= ' </ul>
|
||||
<p class="clear">'.$this->l('You can also export orders which have not been charged yet.').'(<img src="../img/admin/charged_ko.gif" alt="" />)</p>
|
||||
</div>
|
||||
<div class="margin-form">
|
||||
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrint2" class="button" />
|
||||
</label>
|
||||
</div>';
|
||||
$form .= '<p class="clear">'.$this->l('You can also export orders which have not been charged yet.').'(<img src="../img/admin/charged_ko.gif" alt="" />)</p>
|
||||
</div>
|
||||
<div class="ln_solid-small"></div>
|
||||
<div class="form-group text-right">
|
||||
<input type="submit" value="'.$this->l('Generate PDF file').'" name="submitPrint2" class="btn btn-primary" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@ -466,6 +464,104 @@ class AdminInvoices extends AdminTab
|
||||
return parent::displayForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* @Override Antadis Options lists
|
||||
*/
|
||||
public function displayOptionsList()
|
||||
{
|
||||
global $currentIndex, $cookie, $tab;
|
||||
|
||||
if (!isset($this->_fieldsOptions) OR !sizeof($this->_fieldsOptions))
|
||||
return false;
|
||||
|
||||
$defaultLanguage = (int)Configuration::get('PS_LANG_DEFAULT');
|
||||
$this->_languages = Language::getLanguages(false);
|
||||
$tab = Tab::getTab((int)$cookie->id_lang, Tab::getIdFromClassName($tab));
|
||||
echo '<br /><br />';
|
||||
echo '
|
||||
<script type="text/javascript">
|
||||
id_language = Number('.$defaultLanguage.');
|
||||
</script>
|
||||
<div class="panel">
|
||||
<div class="panel-title">
|
||||
<h2>'.(isset($this->optionTitle) ? '<h2>'.$this->optionTitle.'</h2>' : '').'</h2>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
<form action="'.$currentIndex.'" id="'.$tab['name'].'" name="'.$tab['name'].'" method="post" class="form-horizontal">';
|
||||
foreach ($this->_fieldsOptions AS $key => $field)
|
||||
{
|
||||
$val = Tools::getValue($key, Configuration::get($key));
|
||||
if ($field['type'] != 'textLang')
|
||||
if (!Validate::isCleanHtml($val))
|
||||
$val = Configuration::get($key);
|
||||
|
||||
echo '<div class="form-group">
|
||||
<label class="col-sm-2 col-offset-sm-2 control-label">'.$field['title'].' </label>
|
||||
<div class="col-sm-6">';
|
||||
switch ($field['type'])
|
||||
{
|
||||
case 'select':
|
||||
echo '<select class="form-control" name="'.$key.'">';
|
||||
foreach ($field['list'] AS $value)
|
||||
echo '<option
|
||||
value="'.(isset($field['cast']) ? $field['cast']($value[$field['identifier']]) : $value[$field['identifier']]).'"'.($val == $value[$field['identifier']] ? ' selected="selected"' : '').'>'.$value['name'].'</option>';
|
||||
echo '</select>';
|
||||
break;
|
||||
case 'bool':
|
||||
echo '<label class="radio-inline" for="'.$key.'_on">
|
||||
<input type="radio" name="'.$key.'" id="'.$key.'_on" value="1"'.($val ? ' checked="checked"' : '').' /> <span><span class="anticon anticon-checkmark text-green-light"></span> '.$this->l('Yes').'</span>
|
||||
</label>
|
||||
<label class="radio-inline" for="'.$key.'_off">
|
||||
<input type="radio" name="'.$key.'" id="'.$key.'_off" value="0" '.(!$val ? 'checked="checked"' : '').'/> <span><span class="anticon anticon-cross text-rose"></span> '.$this->l('No').'</span>
|
||||
</label>';
|
||||
break;
|
||||
case 'textLang':
|
||||
foreach ($this->_languages as $language)
|
||||
{
|
||||
$val = Tools::getValue($key.'_'.$language['id_lang'], Configuration::get($key, $language['id_lang']));
|
||||
if (!Validate::isCleanHtml($val))
|
||||
$val = Configuration::get($key);
|
||||
echo '
|
||||
<div id="'.$key.'_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';">
|
||||
<input class="form-control" size="'.$field['size'].'" type="text" name="'.$key.'_'.$language['id_lang'].'" value="'.$val.'" />
|
||||
</div>';
|
||||
}
|
||||
$this->displayFlags($this->_languages, $defaultLanguage, $key, $key);
|
||||
echo '<br style="clear:both">';
|
||||
break;
|
||||
case 'textareaLang':
|
||||
foreach ($this->_languages as $language)
|
||||
{
|
||||
$val = Configuration::get($key, $language['id_lang']);
|
||||
echo '
|
||||
<div id="'.$key.'_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';">
|
||||
<textarea class="form-control" rows="3" name="'.$key.'_'.$language['id_lang'].'">'.str_replace('\r\n', "\n", $val).'</textarea>
|
||||
</div>';
|
||||
}
|
||||
$this->displayFlags($this->_languages, $defaultLanguage, $key, $key);
|
||||
echo '<br style="clear:both">';
|
||||
break;
|
||||
case 'text':
|
||||
default:
|
||||
echo '<input type="text" class="form-control" name="'.$key.'" value="'.$val.'" size="'.$field['size'].'" />'.(isset($field['suffix']) ? $field['suffix'] : '');
|
||||
}
|
||||
|
||||
echo (isset($field['desc']) ? '<span class="help-block">'.$field['desc'].'</span>' : '');
|
||||
echo '<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>';
|
||||
}
|
||||
echo '<div class="ln_solid-small"></div>
|
||||
<div class="text-right">
|
||||
<input type="submit" value="'.$this->l(' Save ').'" name="submitOptions'.$this->table.'" class="btn btn-primary" />
|
||||
</div>
|
||||
<input type="hidden" name="token" value="'.$this->token.'" />
|
||||
</form>
|
||||
</div>
|
||||
</div>';
|
||||
}
|
||||
|
||||
|
||||
public function ajaxProcessResetPrintM2Plus()
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user