antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-eanUpgrade' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-22 16:14:07 +02:00
commit 432b96df7f
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
modules/braderie/AdminBraderie.php
View File

@ -163,10 +163,6 @@ class AdminBraderie extends AdminTab
return false;
});
// $("#input_comment").change(function(event) {
// $("#input_storage").focus();
// });
$("#input_storage").change(function(event) {
event.preventDefault();
if ($product_id == undefined || $product_id == 0) {
@ -349,12 +345,19 @@ class AdminBraderie extends AdminTab
.margin-form {padding: 0 0 1em 10px;}
</style>
<fieldset>
<legend>'.$this->l('Braderie').'</legend>';
<legend>'.$this->l('Braderie').'</legend>
<form id="formBraderie" action="?tab=AdminBraderie&token='.$token.'" method="POST">';
if ($this->error) {
$html .= '<p class="margin-form" id="error">'.$this->error.'</p>';
} else {
$html .= '<p class="margin-form" id="error">'.$this->error.'</p>';
}
$html .='<div class="margin-form" id="ean_input_group" style="display: none;">
<label>'.$this->l('Code EAN').' : </label>
<input type="text" name="ean" id="input_ean">
<div id="ean_from_product"></div>
</div>
<hr id="divider" style="display: none;">';
$html .= '<div class="margin-form">
<label>'.$this->l('Ventes').' : </label>
<select class="chosen-select" id="sale" name="sale">
@ -366,7 +369,6 @@ class AdminBraderie extends AdminTab
$html .= ' </select>
</div>
<hr id="divider" style="display: none;">
<div class="margin-form" id="category_input_group" style="display: none;">
<label>'.$this->l('Catégories').' : </label>
<select class="chosen-select" id="category" name="category">
@ -374,32 +376,26 @@ class AdminBraderie extends AdminTab
</select>
<input type="submit" class="button" id="show_current_category_button" value="'.$this->l('Voir cette catégorie').'" style="margin-left: 20px; display: none">
</div>
<form id="formBraderie" action="?tab=AdminBraderie&token='.$token.'" method="POST">
<div class="margin-form" id="ean_input_group" style="display: none;">
<label>'.$this->l('Code EAN').' : </label>
<input type="text" name="ean" id="input_ean">
<div id="ean_from_product"></div>
</div>
<div class="margin-form" id="comment_input_group" style="display: none;">
<label>'.$this->l('Commentaires').' : </label>
<textarea class="other_textarea" cols="49" rows="3" id="input_comment" name="input_comment"></textarea>
</div>
<div class="margin-form" id="storage_input_group" style="display: none;">
<label>'.$this->l('Emplacement').' : </label>
<input type="text" name="storage" id="input_storage">
</div>
<div class="margin-form" id="quantity_input_group" style="display: none;">
<label>'.$this->l('Quantité').' : </label>
<input type="number" name="quantity" id="input_quantity" value="1">
</div>
<div class="margin-form button-container" id="button_input_group" style="display: none;">
<input type="submit" class="button" name="adminbraderie" value="'.$this->l('Ajouter').'" style="margin-left: 200px;" id="add_button">
<input type="submit" class="button" id="check_button" value="'.$this->l('Vérifier').'">
</div>
<input type="hidden" name="product" id="hidden_product_id">
<input type="hidden" name="attribute" id="hidden_attribute_id">
</form>
</fieldset>';
<div class="margin-form" id="quantity_input_group" style="display: none;">
<label>'.$this->l('Quantité').' : </label>
<input type="number" name="quantity" id="input_quantity" value="1">
</div>
<div class="margin-form" id="storage_input_group" style="display: none;">
<label>'.$this->l('Emplacement').' : </label>
<input type="text" name="storage" id="input_storage">
</div>
<div class="margin-form" id="comment_input_group" style="display: none;">
<label>'.$this->l('Commentaires').' : </label>
<textarea class="other_textarea" cols="49" rows="3" id="input_comment" name="input_comment"></textarea>
</div>
<div class="margin-form button-container" id="button_input_group" style="display: none;">
<!--input type="submit" class="button" name="adminbraderie" value="'.$this->l('Ajouter').'" style="margin-left: 200px;" id="add_button"-->
<input type="submit" class="button" id="check_button" value="'.$this->l('Vérifier').'" style="margin-left: 200px;">
</div>
<input type="hidden" name="product" id="hidden_product_id">
<input type="hidden" name="attribute" id="hidden_attribute_id">
</form>
</fieldset>';
return $html;
}