omnissiah/westech-r2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: intake page updates, customer_intake fixes, module dir

Browse Source
This commit is contained in:
vagrant
2026-05-25 14:44:40 +00:00
parent 0997de940e
commit d4ed4b1d89
153 changed files with 38708 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
westech_r2/page/intake/intake.js
+50 -61
View File
@@ -40,19 +40,19 @@ frappe.pages['intake'].on_page_load = function(wrapper) {
</div>
<div class="form-group">
<label>Contact Name</label>
<input type="text" id="contact_name" class="form-control" readonly style="background:#f8f9fa;">
<input type="text" id="contact_name" class="form-control">
</div>
<div class="form-group">
<label>Contact #</label>
<input type="tel" id="contact_number" class="form-control" readonly style="background:#f8f9fa;">
<input type="tel" id="contact_number" class="form-control">
</div>
<div class="form-group">
<label>Contact Email</label>
<input type="email" id="contact_email" class="form-control" readonly style="background:#f8f9fa;">
<input type="email" id="contact_email" class="form-control">
</div>
<div class="form-group">
<label>Address</label>
<input type="text" id="address_line" class="form-control" readonly style="background:#f8f9fa;">
<input type="text" id="address_line" class="form-control">
</div>
</div>
<div class="col-md-4">
@@ -104,7 +104,7 @@ frappe.pages['intake'].on_page_load = function(wrapper) {
<textarea id="legacy_notes" class="form-control" rows="2" readonly style="background:#fafafa;" title="Auto-filled from Customer record"></textarea>
</div>
</div>
<div class="col-md-4">
<div class="col-md-4" id="load-info-section" style="display:none;">
<h5 style="color:#6f42c1;">Items & Weight</h5>
<div class="form-group">
<label>Barcode</label>
@@ -145,7 +145,7 @@ frappe.pages['intake'].on_page_load = function(wrapper) {
<div class="row" style="margin-top: 20px;">
<div class="col-md-12">
<button type="submit" class="btn btn-primary btn-lg" style="background: linear-gradient(135deg, #6f42c1, #28a745); border: none;">
Save Customer
Save Contact Info
</button>
<button type="button" class="btn btn-default btn-lg" id="btn-print-labels" disabled>
Print Labels
@@ -204,7 +204,20 @@ frappe.pages['intake'].on_page_load = function(wrapper) {
}
}, 200);
load_customer_list();
// Show/hide load info based on pickup dropdown
.on('change', function() {
var val = .val();
if (val) {
.show();
} else {
.hide();
}
});
// Initial state - hide if blank
.trigger('change');
load_customer_list();
$('#received_date').on('change', function() {
var d = new Date($(this).val() + 'T12:00:00');
@@ -214,7 +227,7 @@ frappe.pages['intake'].on_page_load = function(wrapper) {
$('#intake-form').on('submit', function(e) {
e.preventDefault();
save_pallet();
save_customer();
});
$('#btn-cancel').on('click', function() {
@@ -504,60 +517,36 @@ function edit_pallet(name) {
});
}
function save_pallet() {
var pallet_name = $('#intake-form-container').data('pallet-name');
var doc = {
doctype: 'Pallet',
received_date: $('#received_date').val(),
customer_number: customer_number_control ? customer_number_control.get_value() : '',
driver: driver_control ? driver_control.get_value() : '',
company_name: $('#company_name').val(),
pickup: $('#pickup').val(),
data_status: $('#data_status').val(),
red_r2: $('#red_r2').val(),
barcode: $('#barcode').val(),
total_items: parseInt($('#total_items').val()) || 0,
num_labels: parseInt($('#num_labels').val()) || 1,
contact_name: $('#contact_name').val(),
contact_number: $('#contact_number').val(),
contact_email: $('#contact_email').val(),
address_line: $('#address_line').val(),
weights: $('#weights').val(),
invoice_check_request: $('#invoice_check_request').val(),
amount: parseFloat($('#amount').val()) || 0,
paid_received: $('#paid_received').val(),
notes: $('#notes').val(),
legacy_notes: $('#legacy_notes').val(),
hours_of_operation: $('#hours_of_operation').val(),
};
if (pallet_name) {
doc.name = pallet_name;
frappe.call({
method: 'frappe.client.update',
args: {doc: doc},
callback: function(r) {
if (r.message) {
frappe.msgprint('Pallet updated successfully!');
$('#save-status').html('<span style="color:green;">Saved!</span>');
}
}
});
} else {
frappe.call({
method: 'frappe.client.insert',
args: {doc: doc},
callback: function(r) {
if (r.message) {
$('#intake-form-container').data('pallet-name', r.message.name);
frappe.msgprint('Pallet created: ' + r.message.name);
$('#save-status').html('<span style="color:green;">Created!</span>');
$('#btn-print-labels').prop('disabled', false);
$('#btn-generate-cor').prop('disabled', false);
}
}
});
function save_customer() {
var customer_name = customer_number_control ? customer_number_control.get_value() : null;
if (!customer_name) {
frappe.msgprint("Please select a customer first.");
return;
}
frappe.call({
method: "frappe.client.get",
args: { doctype: "Customer", name: customer_name },
callback: function(r) {
if (r.message) {
var doc = r.message;
doc.contact_persons = .val();
doc.mobile_no = .val();
doc.email_id = .val();
doc.hours_of_operation = .val();
doc.legacy_notes = .val();
frappe.call({
method: "frappe.client.save",
args: { doc: doc },
callback: function(r2) {
if (r2.message) {
frappe.msgprint("Customer updated!");
.html("<span style=\"color:green;\">Saved!</span>");
}
}
});
}
}
});
}
function generate_cor_report() {
westech_r2/page/intake/intake.json
+1 -1
View File
@@ -4,7 +4,7 @@
"docstatus": 0,
"doctype": "Page",
"idx": 0,
"modified": "2026-05-21 18:32:29.966134",
"modified": "2026-05-23 01:31:28.579759",
"modified_by": "Administrator",
"module": "Westech R2",
"name": "intake",