diff --git a/site/views/customers/receipt.ctp b/site/views/customers/receipt.ctp index 251591d..0d8c8f9 100644 --- a/site/views/customers/receipt.ctp +++ b/site/views/customers/receipt.ctp @@ -25,13 +25,19 @@ Configure::write('debug', '0'); beforeSubmit: verifyRequest, // pre-submit callback success: showResponse, // post-submit callback + url: "url(array('controller' => 'transactions', + 'action' => 'postReceipt', 0)); ?>", + // other available options: //clearForm: true, // clear all form fields after successful submit //resetForm: true, // reset the form after successful submit }; // bind form using 'ajaxForm' - $('#receipt-form').ajaxForm(options); + if ($('#receipt-form').ajaxForm != null) + $('#receipt-form').ajaxForm(options); + else + $('#repeat, label[for=repeat]').remove(); }); // pre-submit callback diff --git a/site/views/leases/invoice.ctp b/site/views/leases/invoice.ctp index b17e0f5..de740e9 100644 --- a/site/views/leases/invoice.ctp +++ b/site/views/leases/invoice.ctp @@ -27,19 +27,34 @@ Configure::write('debug', '0'); // prepare the form when the DOM is ready $(document).ready(function() { + $("#debug").append('doc ready1' + '
'); var options = { target: '#output-debug', // target element(s) to be updated with server response beforeSubmit: verifyRequest, // pre-submit callback success: showResponse, // post-submit callback + + url: "url(array('controller' => 'transactions', + 'action' => 'postInvoice', 0)); ?>", // other available options: //clearForm: true, // clear all form fields after successful submit //resetForm: true, // reset the form after successful submit - }; + }; + + if ($('#invoice-form').ajaxForm != null) + $("#debug").append('ajax present' + '
'); + else + $("#debug").append('ajax not present' + '
'); // bind form using 'ajaxForm' - $('#invoice-form').ajaxForm(options); - }); + if ($('#invoice-form').ajaxForm != null) { + $("#debug").append('go ajax' + '
'); + $('#invoice-form').ajaxForm(options); + $("#debug").append('ajax set' + '
'); + } + else + $('#repeat, label[for=repeat]').remove(); + }); // pre-submit callback function verifyRequest(formData, jqForm, options) { @@ -116,11 +131,13 @@ function showResponse(responseText, statusText) { // Reset the form function resetForm(nocharge) { + $("#debug").append('reset form: ' + nocharge + '
'); $('#charge-entry-id').val(1); $('#charges').html(''); if (!nocharge) addChargeSource(false); + $("#debug").append('reset form done' + '
'); } @@ -146,6 +163,7 @@ function onRowSelect(grid_id, lease_id) { } function onGridState(grid_id, state) { + $("#debug").append('on grid state: ' + grid_id + '; ' + state + '
'); if (state == 'visible') { $(".lease-selection-invalid").hide(); $(".lease-selection-valid").hide(); @@ -159,9 +177,11 @@ function onGridState(grid_id, state) { $(".lease-selection-invalid").show(); } } + $("#debug").append('on grid state done' + '
'); } function addChargeSource(flash) { + $("#debug").append('add charge source' + '
'); var id = $("#charge-entry-id").val(); addDiv('charge-entry-id', 'charge', 'charges', flash, // HTML section @@ -198,10 +218,14 @@ function addChargeSource(flash) { '' ); + $("#debug").append('add div complete' + '
'); + $("#debug").append('add datepicker1' + '
'); datepicker("Entry"+id+"EffectiveDate"); + $("#debug").append('add datepicker2' + '
'); datepicker("Entry"+id+"ThroughDate"); + $("#debug").append('add charge source complete' + '
'); return id; } @@ -265,6 +289,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 '
' . "\n"; */ /* echo ' Invoice' . "\n"; */ @@ -319,6 +349,7 @@ Configure::write('debug', '0'); }; $(document).ready(function(){ + $("#debug").append('doc ready2' + '
'); datepicker('TransactionStamp'); $("#lease-id").val(0); @@ -331,11 +362,13 @@ Configure::write('debug', '0'); + $("#debug").append('movein empty' + '
'); resetForm(); datepickerNow('TransactionStamp'); + $("#debug").append('movein not empty' + '
'); var id; resetForm(true);