don't display custom masks if they are not used
This commit is contained in:
parent
3bc896be57
commit
4e77a0d16a
@ -1649,21 +1649,30 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
|
|||||||
|
|
||||||
print '<script type="text/javascript">
|
print '<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$("#field_mask, #mask_option").addClass("hideobject");
|
$("#field_mask").parent().addClass("hideobject");
|
||||||
var preselect = $("#status_batch option:selected");
|
var preselect = $("#status_batch option:selected");';
|
||||||
if (preselect !== "0") {
|
if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)
|
||||||
$("#field_mask, #mask_option").toggleClass("hideobject");
|
{
|
||||||
|
print 'if (preselect == "2") {
|
||||||
|
$("#field_mask").parent().toggleClass("hideobject");
|
||||||
|
}';
|
||||||
}
|
}
|
||||||
$("#status_batch").on("change", function () {
|
if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS)
|
||||||
|
{
|
||||||
|
print 'if (preselect == "1") {
|
||||||
|
$("#field_mask").parent().toggleClass("hideobject");
|
||||||
|
}';
|
||||||
|
}
|
||||||
|
print '$("#status_batch").on("change", function () {
|
||||||
console.log("We change batch status");
|
console.log("We change batch status");
|
||||||
var optionSelected = $("option:selected", this);
|
var optionSelected = $("option:selected", this);
|
||||||
var valueSelected = this.value;
|
var valueSelected = this.value;
|
||||||
$("#field_mask, #mask_option").addClass("hideobject");
|
$("#field_mask").parent().addClass("hideobject");
|
||||||
';
|
';
|
||||||
if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
|
if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
|
||||||
print '
|
print '
|
||||||
if (this.value == 1) {
|
if (this.value == 1) {
|
||||||
$("#field_mask, #mask_option").toggleClass("hideobject");
|
$("#field_mask").parent().toggleClass("hideobject");
|
||||||
$("#batch_mask_input").val("'.$inherited_mask_lot.'");
|
$("#batch_mask_input").val("'.$inherited_mask_lot.'");
|
||||||
}
|
}
|
||||||
';
|
';
|
||||||
@ -1671,7 +1680,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
|
|||||||
if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
|
if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
|
||||||
print '
|
print '
|
||||||
if (this.value == 2) {
|
if (this.value == 2) {
|
||||||
$("#field_mask, #mask_option").toggleClass("hideobject");
|
$("#field_mask").parent().toggleClass("hideobject");
|
||||||
$("#batch_mask_input").val("'.$inherited_mask_sn.'");
|
$("#batch_mask_input").val("'.$inherited_mask_sn.'");
|
||||||
}
|
}
|
||||||
';
|
';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user