Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25359 from 18alantom/fix_shipment_pickup_to

Browse Source 
fix: shipment pickup_to, pickup_from functionality.
This commit is contained in:
Ankush Menat 2021-04-15 21:16:24 +05:30 committed by GitHub
commit 799b3c26a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
erpnext/stock/doctype/shipment/shipment.js
View File

@ -363,43 +363,6 @@ frappe.ui.form.on('Shipment', {
if (frm.doc.pickup_date < frappe.datetime.get_today()) { if (frm.doc.pickup_date < frappe.datetime.get_today()) {
frappe.throw(__("Pickup Date cannot be before this day")); frappe.throw(__("Pickup Date cannot be before this day"));
} }
if (frm.doc.pickup_date == frappe.datetime.get_today()) {
var pickup_time = frm.events.get_pickup_time(frm);
frm.set_value("pickup_from", pickup_time);
frm.trigger('set_pickup_to_time');
}
},
pickup_from: function(frm) {
var pickup_time = frm.events.get_pickup_time(frm);
if (frm.doc.pickup_from && frm.doc.pickup_date == frappe.datetime.get_today()) {
let current_hour = pickup_time.split(':')[0];
let current_min = pickup_time.split(':')[1];
let pickup_hour = frm.doc.pickup_from.split(':')[0];
let pickup_min = frm.doc.pickup_from.split(':')[1];
if (pickup_hour < current_hour || (pickup_hour == current_hour && pickup_min < current_min)) {
frm.set_value("pickup_from", pickup_time);
frappe.throw(__("Pickup Time cannot be in the past"));
}
}
frm.trigger('set_pickup_to_time');
},
get_pickup_time: function() {
let current_hour = new Date().getHours();
let current_min = new Date().toLocaleString('en-US', {minute: 'numeric'});
if (current_min < 30) {
current_min = '30';
} else {
current_min = '00';
current_hour = Number(current_hour)+1;
}
let pickup_time = current_hour +':'+ current_min;
return pickup_time;
},
set_pickup_to_time: function(frm) {
let pickup_to_hour = Number(frm.doc.pickup_from.split(':')[0])+5;
let pickup_to_min = frm.doc.pickup_from.split(':')[1];
let pickup_to = pickup_to_hour +':'+ pickup_to_min;
frm.set_value("pickup_to", pickup_to);
}, },
clear_pickup_fields: function(frm) { clear_pickup_fields: function(frm) {
let fields = ["pickup_address_name", "pickup_contact_name", "pickup_address", "pickup_contact", "pickup_contact_email", "pickup_contact_person"]; let fields = ["pickup_address_name", "pickup_contact_name", "pickup_address", "pickup_contact", "pickup_contact_email", "pickup_contact_person"];

8
erpnext/stock/doctype/shipment/shipment.json
View File

@ -275,14 +275,16 @@
"default": "09:00", "default": "09:00",
"fieldname": "pickup_from", "fieldname": "pickup_from",
"fieldtype": "Time", "fieldtype": "Time",
"label": "Pickup from" "label": "Pickup from",
"reqd": 1
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"default": "17:00", "default": "17:00",
"fieldname": "pickup_to", "fieldname": "pickup_to",
"fieldtype": "Time", "fieldtype": "Time",
"label": "Pickup to" "label": "Pickup to",
"reqd": 1
}, },
{ {
"fieldname": "column_break_36", "fieldname": "column_break_36",
@ -431,7 +433,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-12-25 15:02:34.891976", "modified": "2021-04-13 17:14:18.181818",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Shipment", "name": "Shipment",