Merge in from pre_0.1 branch
git-svn-id: file:///svn-source/pmgr/trunk/site@847 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -27,25 +27,60 @@ Configure::write('debug', '0');
|
||||
|
||||
// prepare the form when the DOM is ready
|
||||
$(document).ready(function() {
|
||||
var options = {
|
||||
var options = {
|
||||
target: '#output-debug', // target element(s) to be updated with server response
|
||||
beforeSubmit: verifyRequest, // pre-submit callback
|
||||
success: showResponse, // post-submit callback
|
||||
|
||||
|
||||
// other available options:
|
||||
//clearForm: true, // clear all form fields after successful submit
|
||||
//resetForm: true, // reset the form after successful submit
|
||||
};
|
||||
|
||||
// bind form using 'ajaxForm'
|
||||
url: "<?php echo $html->url(array('controller' => 'transactions',
|
||||
'action' => 'postInvoice', 0)); ?>"
|
||||
};
|
||||
|
||||
// bind form using 'ajaxForm'
|
||||
if ($('#invoice-form').ajaxForm != null)
|
||||
$('#invoice-form').ajaxForm(options);
|
||||
});
|
||||
else
|
||||
$('#repeat, label[for=repeat]').remove();
|
||||
});
|
||||
|
||||
// pre-submit callback
|
||||
function verifyRequest(formData, jqForm, options) {
|
||||
//$("#debug").html('');
|
||||
for (var i = 0; i < formData.length; ++i) {
|
||||
//$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
|
||||
if (formData[i]['name'] == "data[Lease][id]" &&
|
||||
!(formData[i]['value'] > 0)) {
|
||||
//$("#debug").append('<P>Missing Lease ID');
|
||||
alert("Must select a lease first");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (formData[i]['name'] == "data[Transaction][stamp]" &&
|
||||
formData[i]['value'] == '') {
|
||||
//$("#debug").append('<P>Bad Stamp');
|
||||
alert("Must enter a valid date stamp");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Terrible way to accomplish this...
|
||||
/* for (var j = 0; j < 20; ++j) { */
|
||||
/* if (formData[i]['name'] == "data[Entry]["+j+"][amount]" && */
|
||||
/* !(formData[i]['value'] > 0)) { */
|
||||
/* //$("#debug").append('<P>Bad Amount'); */
|
||||
/* alert("Must enter a valid amount"); */
|
||||
/* return false; */
|
||||
/* } */
|
||||
/* } */
|
||||
}
|
||||
|
||||
//$("#debug").append('OK');
|
||||
//return false;
|
||||
|
||||
$('#results').html('Working <BLINK>...</BLINK>');
|
||||
// here we could return false to prevent the form from being submitted;
|
||||
// returning anything other than false will allow the form submit to continue
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -99,20 +134,7 @@ function onRowSelect(grid_id, lease_id) {
|
||||
// Set the item id that will be returned with the form
|
||||
$("#lease-id").val(lease_id);
|
||||
|
||||
// Get the item names from the grid
|
||||
//$("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
|
||||
// REVISIT <AP>: 20090708
|
||||
// This is not intended as a long term solution,
|
||||
// but I need a way to enter data and then view
|
||||
// the results. This link will help.
|
||||
$("#invoice-lease").html('<A HREF="' +
|
||||
"<?php echo $html->url(array('controller' => 'leases',
|
||||
'action' => 'view')); ?>"
|
||||
+ "/" +
|
||||
$(grid_id).getCell(lease_id, 'Lease-id').replace(/^#/,'') +
|
||||
'">' +
|
||||
$(grid_id).getCell(lease_id, 'Lease-number') +
|
||||
'</A>');
|
||||
$("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
|
||||
$("#invoice-unit").html($(grid_id).getCell(lease_id, 'Unit-name'));
|
||||
$("#invoice-customer").html($(grid_id).getCell(lease_id, 'Customer-name'));
|
||||
$("#invoice-rent").html($(grid_id).getCell(lease_id, 'Lease-rent'));
|
||||
@@ -183,19 +205,8 @@ function addChargeSource(flash) {
|
||||
'</FIELDSET>'
|
||||
);
|
||||
|
||||
$("#Entry"+id+"EffectiveDate")
|
||||
.attr('autocomplete', 'off')
|
||||
.datepicker({ constrainInput: true,
|
||||
numberOfMonths: [1, 1],
|
||||
showCurrentAtPos: 0,
|
||||
dateFormat: 'mm/dd/yy' });
|
||||
|
||||
$("#Entry"+id+"ThroughDate")
|
||||
.attr('autocomplete', 'off')
|
||||
.datepicker({ constrainInput: true,
|
||||
numberOfMonths: [1, 1],
|
||||
showCurrentAtPos: 0,
|
||||
dateFormat: 'mm/dd/yy' });
|
||||
datepicker("Entry"+id+"EffectiveDate");
|
||||
datepicker("Entry"+id+"ThroughDate");
|
||||
|
||||
return id;
|
||||
}
|
||||
@@ -222,6 +233,7 @@ if (empty($movein))
|
||||
array('gridstate' =>
|
||||
'onGridState("#"+$(this).attr("id"), gridstate)'),
|
||||
),
|
||||
'exclude' => array('Closed'),
|
||||
'action' => 'active',
|
||||
'nolinks' => true,
|
||||
'limit' => 10,
|
||||
@@ -259,6 +271,12 @@ echo $form->input("Lease.id",
|
||||
'type' => 'hidden',
|
||||
'value' => 0));
|
||||
|
||||
if (!empty($movein))
|
||||
echo $form->input("Customer.id",
|
||||
array('id' => 'customer-id',
|
||||
'type' => 'hidden',
|
||||
'value' => $customer['id']));
|
||||
|
||||
/* echo '<fieldset CLASS="invoice">' . "\n"; */
|
||||
/* echo ' <legend>Invoice</legend>' . "\n"; */
|
||||
|
||||
@@ -313,13 +331,9 @@ Configure::write('debug', '0');
|
||||
};
|
||||
|
||||
$(document).ready(function(){
|
||||
$("#TransactionStamp")
|
||||
.attr('autocomplete', 'off')
|
||||
.datepicker({ constrainInput: true,
|
||||
numberOfMonths: [1, 1],
|
||||
showCurrentAtPos: 0,
|
||||
dateFormat: 'mm/dd/yy' });
|
||||
datepicker('TransactionStamp');
|
||||
|
||||
$("#lease-id").val(0);
|
||||
$("#invoice-lease").html("INTERNAL ERROR");
|
||||
$("#invoice-unit").html("INTERNAL ERROR");
|
||||
$("#invoice-customer").html("INTERNAL ERROR");
|
||||
@@ -337,7 +351,7 @@ Configure::write('debug', '0');
|
||||
var id;
|
||||
resetForm(true);
|
||||
|
||||
$("#TransactionStamp").datepicker('disable');
|
||||
$("#TransactionStamp").attr('disabled', true);
|
||||
$("#TransactionStamp").val("<?php echo date('m/d/Y', $movein['time']); ?>");
|
||||
$('#TransactionStamp').after
|
||||
('<input type="hidden"' +
|
||||
@@ -399,15 +413,7 @@ Configure::write('debug', '0');
|
||||
|
||||
<?php if (isset($lease['id'])): ?>
|
||||
$("#lease-id").val(<?php echo $lease['id']; ?>);
|
||||
//$("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
|
||||
$("#invoice-lease").html('<A HREF="' +
|
||||
"<?php echo $html->url(array('controller' => 'leases',
|
||||
'action' => 'view')); ?>"
|
||||
+ "/" +
|
||||
"<?php echo $lease['id']; ?>" +
|
||||
'">#' +
|
||||
"<?php echo $lease['number']; ?>" +
|
||||
'</A>');
|
||||
$("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
|
||||
$("#invoice-unit").html("<?php echo $unit['name']; ?>");
|
||||
$("#invoice-customer").html("<?php echo $customer['name']; ?>");
|
||||
$("#invoice-rent").html("<?php echo FormatHelper::currency($lease['rent']); ?>");
|
||||
|
||||
Reference in New Issue
Block a user