Commit Graph

156 Commits

Author SHA1 Message Date
abijah
ba82eabcbc Fixed a bug created with each form table when that element was modified to ignore fields set to null. The original intention was that null simply meant 'no special configuration'. However, we needed a way to programatically enable/disable fields, so null was an obvious choice to use. Now that I'm about to check in, I think I should have just made a minor change to use false to skip a field, which would have been backwards compatible (except for the one place using null to exclude the field). However, it's done now, so what the heck.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@290 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 16:07:19 +00:00
abijah
e15f053c5c Changed the list of payment types to be dynamically generated. This works OK, but the list is longer than is probably useful, and more importantly, some of these types need to be associated with a lease, such as a security deposit. Not sure how I'll handle that.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@289 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 09:20:04 +00:00
abijah
0c8035b402 Removed monetary_source_type. It was redundant, and it's entirely unclear what purpose it ultimately would or could serve. Our use of different accounts for Check, Cash, etc likely obsoleted any intention we might have had for monetary_source_type
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@288 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 08:28:34 +00:00
abijah
fb29380ac5 Added ACH and Concession entry. Like everything else, I haven't tested too robustly, but it does seem to work. I might want to change the monetary source id for Concession. Right now each concession gets its own monetary source, but we could probably use a common one without issue.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@284 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 06:10:00 +00:00
abijah
a45fd6879d Removed the comment from lease move-out, and tweaked the form_table to support it
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@277 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 02:57:29 +00:00
abijah
09090d1b3c Consolidated the move out/in pages. I'm really not happy with this checkin, as it has actually reduced functionality. We used to be able to click move-out on a customer and be presented with a list of units to move out of. This was the intention, but I've gotten frustrated with the fact that I'm working on non-MUST functionality. Things are working good enough at the moment, so I'm checking in and will have to come back to this later.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@276 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 02:19:14 +00:00
abijah
dbd914ff78 Changed move_out to use datepicker in the same way as move_in. I'll probably be wiping this out later to have move_out behave more like move_in and present customer and unit selection boxes.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@273 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 00:40:24 +00:00
abijah
222758b20f Modified the datepickerNow() function to return results without the time (just date). Updated the move_in datepicker to use it and added a link for the user.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@272 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 00:31:56 +00:00
abijah
233b08df59 Made the same layout changes from H2 to CSS with the move_in page
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@271 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 00:21:48 +00:00
abijah
849077bb9a Made layout changes to invoices and receipts to use CSS instead of simple H2/H3 tags. Also, as a temporary measure, I make the lease/customer numbers hyperlink to the view page. At some point we'll figure out what should happen after entering a receipt or invoice, and this hack should go away.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@270 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-09 00:00:29 +00:00
abijah
75c44d1b3a Removed the pages controller and view, as well as the default route. I can't believe I let it linger for so long...
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@268 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 23:30:13 +00:00
abijah
7e0d8a9da2 Modified which columns are displayed for ledger entries
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@263 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 20:57:11 +00:00
abijah
4d123b63f0 Moved all grid elements onto the grid helper. Basic testing done, but more testing needs to be done.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@262 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 20:40:44 +00:00
abijah
a88f5829ce Moved the leases element onto the new grid helper.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@261 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 19:22:22 +00:00
abijah
5c29200428 Minor tweak to allow more size selections in the drop down list.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@260 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 19:19:42 +00:00
abijah
33fa8e732c The grid helper now functions. We may need to tweak it when looking at some of the more complicated elements like ledger_entries.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@259 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 19:19:05 +00:00
abijah
6c62d66068 Actually, we need to get away from calling things jqGrid except at the lowest point. We don't want to switch vendors and have all these items continuing to be called jqGrid. Just Grid will work.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@258 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 17:35:36 +00:00
abijah
4e2b073110 Added a helper to jqGrid, since duplicated code is getting spread through each element. The implementation is nowhere near complete, but the basic idea is there.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@257 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 17:33:43 +00:00
abijah
abd166cb98 Modified effective dates to be part of the ledger entry, not the transaction. This is the logically correct way, as a transaction is simply a collection of entries which might be anywhere from completely aligned to totally disjoint from one another (more likely the former). As a practical example, consider a move-in invoice, with security deposit (effective immediately with no end date), a prorated rent (effective move-in day through the end of the first month), and first full months rent (effective beginning of next month through the end of next month). There is certainly more work to be done on this, and testing was minimal. It does seem to be functioning though, so I'm checking in.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@256 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 16:04:53 +00:00
abijah
c455b383f5 Updated the balance algorithm for units and customers as was done for leases.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@253 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-08 00:34:03 +00:00
abijah
011c05d098 Implemented the balance field of Leases as part of a single query. This not only reduces the number of queries required, it also allows balance to be a sortable column, so that we can determine which customers are overdue.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@251 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 16:08:56 +00:00
abijah
aa2e647199 Added mechanism for user to know the rent amount on the invoice screen.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@250 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 09:00:54 +00:00
abijah
9c65d408fa Added a flag to accounts, indicating whether they can be used for charges and/or payments. Invoice has already switch to this mechanism, but we're keeping receipt the same for now since I have bigger fish to fry.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@247 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 07:52:41 +00:00
abijah
ae85ed7907 Experiment to provide a fieldset around the transaction details. I didn't care too much for the looks of it, so I commented it out for the moment. Ultimately though, there is going to be confusion over having two comment fields, so if we intend to keep them both, we'll need to clearly distinguish the purpose of each.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@246 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 07:21:22 +00:00
abijah
019b97fe53 Modified to dynamically determine eligible charge accounts, instead of the two that were hardcoded.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@244 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 07:14:18 +00:00
abijah
ae442db01f First pass at having invoice support multiple charges, just like receipt/payment. It works well, but I know we still need a better solution for income accounts, and it hasn't been robustly tested yet.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@243 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 04:37:04 +00:00
abijah
d4ceca3aeb The only functional change was to start payment numbers at 1 instead of zero. All other changes are just white space and code movement.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@241 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 04:33:06 +00:00
abijah
4ea8f1ae42 Took some of the new learnings from invoice generation and put into receipt generations. Also moved some shared functions to pmgr.js, and renamed things for consistency.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@239 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 02:55:55 +00:00
abijah
5f8ae73049 Charge/Invoice assessment is working fairly well. Still need to accept multiple charges on a single invoice, have client side validation, and post through ajax to allow posting repeated invoices.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@236 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-07 00:43:41 +00:00
abijah
66e2647c05 Moved the debug grid query link into the caption bar to minimize layout distractions.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@234 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 23:17:53 +00:00
abijah
85756975ae Modified the form table to support a variety of extra texts and/or columns
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@232 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 19:22:27 +00:00
abijah
58d3cbf66b First pass at entering charges for a lease. This works, but does not have the ability to add multiple charges, and does not mirror the payment method, which is ajax based.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@231 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 18:34:44 +00:00
abijah
4dac7a7f0c Added empty view for debugging.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@226 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 15:40:32 +00:00
abijah
d51c29bc91 Added a datepicker to the move-out view and put the input fields of both move-in and move-out into a table to tidy things up a bit.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@225 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 04:32:14 +00:00
abijah
8237ca1f9d Changed leases element to understand some common fields
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@224 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 04:30:03 +00:00
abijah
fbd43fbbb2 Cleaned up and got rid of the word Tenant in most places. The original thought was to minimize confusion in our specific case (since we don't sell POS items) by simply refering to customers as tenants. However, I don't think customers is a very confusing term and so I decided to clear up the inconsistency. I did leave it in a couple places, where the customers in questions are clearly tenants
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@222 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 03:34:33 +00:00
abijah
826874b2a5 Changed layout to enlarge the detail table on the edit page. Changed edit action to redirect to the view page.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@221 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 03:09:54 +00:00
abijah
eab49091ae Implemented ability to add a customer, and fixed the problem with flagging of the primary contact.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@220 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 03:01:28 +00:00
abijah
e150237fd8 Implemented edit functionality for customer. Like with contacts, the interface leaves much to be desired, since it's limited in functionality. Namely, you can add a contact, but you can't add contact methods (phone/mail/email). Also, it doesn't use jqGrid to present the selection choices, and so the user is stuck with the fields we've chosen to display, as well as the sort order we've chosen. Enhancement is possible someday, but for now, it gets the job done.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@219 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 02:06:23 +00:00
abijah
207808d6d5 Added ability to add a new contact, which also fixes the glaring omission of saving changes to contact details on the edit page (previously we were only saving contact methods, not any contact details.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@218 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-06 00:42:57 +00:00
abijah
dc787bd9e7 Finished implementation of contact edit. This is now saving everything to the database. I hope to now leverage it for a new contact. This checkin includes a bit of code in the sitelink2pmgr script that sets the customer display name. It should have been checked in several revisions ago.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@217 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 23:43:35 +00:00
abijah
61af7693cd Changed order to Phone/Address/Email to be consistent with other areas
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@216 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 23:33:47 +00:00
abijah
ae276d310a Moved the customer edit page to include address and email fields. This is largely all the work on the presentation side, now I just need to take the data and update the database.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@214 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 20:01:06 +00:00
abijah
41aa3f81a8 Got the existing contact phone numbers to populate correctly. I've chosen to disallow editing of these numbers, since a) it's tricky to do this in place, and b) it will be too confusing at the moment to handle this on a separate page, and c) I don't want to implement a modal ajax box at the moment, and d) doing so would probably be a user error liability, since folks would choose to edit a shared number instead of adding a new one when the situation would warrant the latter.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@212 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 18:32:54 +00:00
abijah
bb78a85d1b Changed the dynamic div generation to occur under PHP instead of directly under Javascript. This allows us to create a div on the server side making it directly part of the page (which is how we'll populate it with existing values).
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@211 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 17:30:59 +00:00
abijah
90604bf672 Doh! That's what happens when you make a seemingly innocuous change right before checkin...
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@210 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 15:04:09 +00:00
abijah
bb5c44f19f First shot at an actual working form to enter contact information. It only handles phone numbers at the moment, and it does NOT handle existing ones. It's a decent start though, and worth checking in. Next I'll have to handle existing phone numbers, and then addresses and emails. Of course, after that, I'll have to actually save everything to the database.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@209 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 15:01:18 +00:00
abijah
6c656b07c3 Nowhere near complete, but a quick checkin to the contacts edit view so I can clean up some of the commented code that's getting intrusive.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@208 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-05 02:48:23 +00:00
abijah
5f82404a4f Changed the relationship between grid visibility and text of the selected item.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@207 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-04 17:38:22 +00:00
abijah
3a1fb00527 Added ability to move an existing customer into a vacant unit. Changed out all of the 'amount' fields with 'rent', since it's much more self-explanatory. We still need the ability to add customers and contacts. I'll consider doing this by using the insert row ability of jqGrid.
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@204 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-07-03 06:53:41 +00:00