|
|
|
@ -376,63 +376,82 @@ function addPackageByAddress(number, street, citystate, type, callback) {
|
|
|
|
|
}, 750);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (type == "express") {
|
|
|
|
|
if (getStorage("deadlinealarm_minutes") == null) {
|
|
|
|
|
setStorage("deadlinealarm_minutes", 20);
|
|
|
|
|
}
|
|
|
|
|
var minutes = getStorage("deadlinealarm_minutes");
|
|
|
|
|
app.dialog.create({
|
|
|
|
|
title: 'Express Item',
|
|
|
|
|
text: 'Set a reminder for ' + minutes + ' minutes before:',
|
|
|
|
|
buttons: [
|
|
|
|
|
{
|
|
|
|
|
text: '10:30 AM',
|
|
|
|
|
close: true
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: '12:00 PM',
|
|
|
|
|
close: true
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: '3:00 PM',
|
|
|
|
|
close: true
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: "No reminder",
|
|
|
|
|
color: "red",
|
|
|
|
|
close: true
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
verticalButtons: true,
|
|
|
|
|
onClick: function (dialog, index) {
|
|
|
|
|
deadline = new Date();
|
|
|
|
|
switch (index) {
|
|
|
|
|
case 0:
|
|
|
|
|
deadline.setMinutes(30);
|
|
|
|
|
deadline.setHours(10);
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
deadline.setMinutes(00);
|
|
|
|
|
deadline.setHours(12);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
deadline.setMinutes(00);
|
|
|
|
|
deadline.setHours(12 + 3);
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
default:
|
|
|
|
|
deadline = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
var prelookup = function () {
|
|
|
|
|
if (type == "express") {
|
|
|
|
|
if (getStorage("deadlinealarm_minutes") == null) {
|
|
|
|
|
setStorage("deadlinealarm_minutes", 20);
|
|
|
|
|
}
|
|
|
|
|
var minutes = getStorage("deadlinealarm_minutes");
|
|
|
|
|
app.dialog.create({
|
|
|
|
|
title: 'Express Item',
|
|
|
|
|
text: 'Set a reminder for ' + minutes + ' minutes before:',
|
|
|
|
|
buttons: [
|
|
|
|
|
{
|
|
|
|
|
text: '10:30 AM',
|
|
|
|
|
close: true
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: '12:00 PM',
|
|
|
|
|
close: true
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: '3:00 PM',
|
|
|
|
|
close: true
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
text: "No reminder",
|
|
|
|
|
color: "red",
|
|
|
|
|
close: true
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
verticalButtons: true,
|
|
|
|
|
onClick: function (dialog, index) {
|
|
|
|
|
deadline = new Date();
|
|
|
|
|
switch (index) {
|
|
|
|
|
case 0:
|
|
|
|
|
deadline.setMinutes(30);
|
|
|
|
|
deadline.setHours(10);
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
deadline.setMinutes(00);
|
|
|
|
|
deadline.setHours(12);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
deadline.setMinutes(00);
|
|
|
|
|
deadline.setHours(12 + 3);
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
default:
|
|
|
|
|
deadline = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (deadline != false) {
|
|
|
|
|
deadline = deadline.getTime() / 1000;
|
|
|
|
|
if (deadline != false) {
|
|
|
|
|
deadline = deadline.getTime() / 1000;
|
|
|
|
|
}
|
|
|
|
|
ajaxlookup();
|
|
|
|
|
}
|
|
|
|
|
ajaxlookup();
|
|
|
|
|
}
|
|
|
|
|
}).open();
|
|
|
|
|
}).open();
|
|
|
|
|
} else {
|
|
|
|
|
ajaxlookup();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var deliverable = isDeliverable(number, street);
|
|
|
|
|
|
|
|
|
|
if (deliverable.ok) {
|
|
|
|
|
prelookup();
|
|
|
|
|
} else {
|
|
|
|
|
ajaxlookup();
|
|
|
|
|
app.dialog.confirm(
|
|
|
|
|
"A route note says this address is " + deliverable.reason + ". Add item anyways?",
|
|
|
|
|
"Confirm",
|
|
|
|
|
function () {
|
|
|
|
|
prelookup();
|
|
|
|
|
},
|
|
|
|
|
function () {
|
|
|
|
|
// cancel
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|