Change 'Rack' to 'Bin'
This commit is contained in:
+33
-33
@@ -97,10 +97,10 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mb-3 col-lg-6" id="group_rack">
|
||||
<label for="rack" class="form-label" id="label_rack">Rack</label>
|
||||
<select name="rack" id="rack" class="form-select" required>
|
||||
<option value="">Please select rack</option>
|
||||
<div class="mb-3 col-lg-6" id="group_bin">
|
||||
<label for="bin" class="form-label" id="label_bin">Bin</label>
|
||||
<select name="bin" id="bin" class="form-select" required>
|
||||
<option value="">Please select bin</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
// custom.js globals: set_select_value(), load_location_config(), init_lot_search_inputs()
|
||||
|
||||
var advanced = false;
|
||||
var label_rack = 'Location';
|
||||
var label_bin = 'Location';
|
||||
var label_zone = 'Zone';
|
||||
var label_aisle = 'Aisle';
|
||||
var scan_sku_ready = false;
|
||||
@@ -150,15 +150,15 @@
|
||||
$('#group_aisle').show();
|
||||
$('#label_zone').text(label_zone);
|
||||
$('#label_aisle').text(label_aisle);
|
||||
$('#label_rack').text(label_rack);
|
||||
$('#label_bin').text(label_bin);
|
||||
$('#zone').attr('placeholder', 'Please select ' + label_zone.toLowerCase());
|
||||
$('#aisle').attr('placeholder', 'Please select ' + label_aisle.toLowerCase());
|
||||
$('#rack').attr('placeholder', 'Please select ' + label_rack.toLowerCase());
|
||||
$('#bin').attr('placeholder', 'Please select ' + label_bin.toLowerCase());
|
||||
} else {
|
||||
$('#group_zone').hide();
|
||||
$('#group_aisle').hide();
|
||||
$('#label_rack').text(label_rack);
|
||||
$('#rack').attr('placeholder', 'Please select ' + label_rack.toLowerCase());
|
||||
$('#label_bin').text(label_bin);
|
||||
$('#bin').attr('placeholder', 'Please select ' + label_bin.toLowerCase());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
$('#warehouse').val('');
|
||||
$('#zone').val('');
|
||||
$('#aisle').val('');
|
||||
$('#rack').val('');
|
||||
$('#bin').val('');
|
||||
$('#product_sku').trigger('blur');
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
set_select_value('#zone', data.zone, data.zone);
|
||||
set_select_value('#aisle', data.aisle, data.aisle);
|
||||
}
|
||||
set_select_value('#rack', data.rack, data.rack);
|
||||
set_select_value('#bin', data.bin, data.bin);
|
||||
scan_location_ready = true;
|
||||
});
|
||||
}
|
||||
@@ -207,7 +207,7 @@
|
||||
warehouse_id: data.warehouse_id,
|
||||
zone: data.zone,
|
||||
aisle: data.aisle,
|
||||
rack: data.rack,
|
||||
bin: data.bin,
|
||||
product_sku: $('#product_sku').attr('secondary') || $('#product_sku').val(),
|
||||
lot_number: $('#lot_number').val(),
|
||||
serial_number: $('#serial_number').val()
|
||||
@@ -230,7 +230,7 @@
|
||||
$('#warehouse').val('');
|
||||
$('#zone').val('');
|
||||
$('#aisle').val('');
|
||||
$('#rack').val('');
|
||||
$('#bin').val('');
|
||||
scan_sku_ready = false;
|
||||
scan_location_ready = false;
|
||||
$('#product_sku').focus();
|
||||
@@ -241,7 +241,7 @@
|
||||
bootbox.alert('Scan the SKU label first.');
|
||||
return;
|
||||
}
|
||||
if (!scan_location_ready && !$('#rack').val()) {
|
||||
if (!scan_location_ready && !$('#bin').val()) {
|
||||
bootbox.alert('Scan the location label before saving.');
|
||||
return;
|
||||
}
|
||||
@@ -250,17 +250,17 @@
|
||||
|
||||
function manage_stock_in() {
|
||||
|
||||
var rack_val = $('#rack').val();
|
||||
var zone_val = advanced ? $('#zone').val() : rack_val;
|
||||
var aisle_val = advanced ? $('#aisle').val() : rack_val;
|
||||
var bin_val = $('#bin').val();
|
||||
var zone_val = advanced ? $('#zone').val() : bin_val;
|
||||
var aisle_val = advanced ? $('#aisle').val() : bin_val;
|
||||
var warehouse_val = $('#warehouse').val();
|
||||
var sku_val = $('#product_sku').attr('secondary') || $('#product_sku').val();
|
||||
var quantity_val = $('#quantity').val();
|
||||
|
||||
// Mirror to hidden inputs for autoPrepare consistency (simple mode)
|
||||
if (!advanced) {
|
||||
$('#zone').val(rack_val);
|
||||
$('#aisle').val(rack_val);
|
||||
$('#zone').val(bin_val);
|
||||
$('#aisle').val(bin_val);
|
||||
}
|
||||
|
||||
return ajax_request({
|
||||
@@ -275,7 +275,7 @@
|
||||
'serial_number': $('#serial_number').val(),
|
||||
'zone': zone_val,
|
||||
'aisle': aisle_val,
|
||||
'rack': rack_val,
|
||||
'bin': bin_val,
|
||||
'product_sku': sku_val,
|
||||
'quantity': quantity_val,
|
||||
'warehouse': warehouse_val,
|
||||
@@ -398,10 +398,10 @@
|
||||
|
||||
|
||||
|
||||
function retrieve_rack(type, callback) {
|
||||
function retrieve_bin(type, callback) {
|
||||
|
||||
return ajax_request({
|
||||
url: "<?php echo $server_url?>ics/api/engine/retrieve_rack.php",
|
||||
url: "<?php echo $server_url?>ics/api/engine/retrieve_bin.php",
|
||||
autoPrepare: true,
|
||||
checkRequired: 0,
|
||||
noLoading: true,
|
||||
@@ -411,11 +411,11 @@
|
||||
},
|
||||
action: 'read',
|
||||
onSuccess: function(res) {
|
||||
var option = '<option value="">Please select ' + label_rack.toLowerCase() + '</option>';
|
||||
var option = '<option value="">Please select ' + label_bin.toLowerCase() + '</option>';
|
||||
$.each(res.output, function(key, item) {
|
||||
option += '<option value="' + item + '">' + item + '</option>';
|
||||
});
|
||||
$('select#rack').html(option);
|
||||
$('select#bin').html(option);
|
||||
|
||||
if (callback) callback(); // ← add this
|
||||
}
|
||||
@@ -445,7 +445,7 @@
|
||||
|
||||
function populate_fields() {
|
||||
$.each(data, function(key, item) {
|
||||
if (!['warehouse', 'zone', 'aisle', 'rack'].includes(key)) {
|
||||
if (!['warehouse', 'zone', 'aisle', 'bin'].includes(key)) {
|
||||
$('#' + key).val(item);
|
||||
}
|
||||
});
|
||||
@@ -478,16 +478,16 @@
|
||||
$('select#zone').val(data.zone).attr('disabled', true);
|
||||
retrieve_aisle('to', function() {
|
||||
$('#aisle').val(data.aisle).attr('disabled', true);
|
||||
retrieve_rack('to', function() {
|
||||
$('#rack').val(data.rack).attr('disabled', true);
|
||||
retrieve_bin('to', function() {
|
||||
$('#bin').val(data.bin).attr('disabled', true);
|
||||
populate_fields();
|
||||
});
|
||||
});
|
||||
});
|
||||
} else {
|
||||
// Simple mode — skip zone/aisle cascade
|
||||
retrieve_rack('to', function() {
|
||||
$('#rack').val(data.rack).attr('disabled', true);
|
||||
retrieve_bin('to', function() {
|
||||
$('#bin').val(data.bin).attr('disabled', true);
|
||||
populate_fields();
|
||||
});
|
||||
}
|
||||
@@ -536,11 +536,11 @@
|
||||
if (advanced) {
|
||||
retrieve_zone('to', function() {
|
||||
retrieve_aisle('to', function() {
|
||||
retrieve_rack('to');
|
||||
retrieve_bin('to');
|
||||
});
|
||||
});
|
||||
} else {
|
||||
retrieve_rack('to');
|
||||
retrieve_bin('to');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -615,7 +615,7 @@
|
||||
if (advanced) {
|
||||
retrieve_zone('to');
|
||||
} else {
|
||||
retrieve_rack('to');
|
||||
retrieve_bin('to');
|
||||
}
|
||||
});
|
||||
|
||||
@@ -624,7 +624,7 @@
|
||||
});
|
||||
|
||||
$("select#aisle").change(function() {
|
||||
if (advanced) retrieve_rack('to');
|
||||
if (advanced) retrieve_bin('to');
|
||||
});
|
||||
|
||||
<?php } ?>
|
||||
|
||||
Reference in New Issue
Block a user