abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196 Commits 31 Branches 9 Tags
50e7f58d3581d0bf06b16c8e41030a9c27c0e804
Commit Graph

124 Commits

Author SHA1 Message Date
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
abijah
6adf7e2358 Added some revisit comments for move-out. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@203 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 20:05:56 +00:00
abijah
99504c6de5 Finished basic functionality for Move-Out. This still needs some work to handle the security deposit. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@202 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 20:00:50 +00:00
abijah
e060c16252 Fixed a bug when viewing ledgers (related to the Close change), removed some debug code, added titles to the deposit pages, and fixed a bug with creating new transactions and/or balance transfers for a deposit when there is nothing to deposit. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@201 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 09:33:42 +00:00
abijah
ed673de22f Added a closes table to the schema, so that we can keep track of daily closes, deposits, etc. Moved into the model an operation to close a set of ledgers and make a deposit. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@200 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 09:19:33 +00:00
abijah
dfe61cbc2a Added ability for callers to control the jqGrid sort order 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@199 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 09:16:42 +00:00
abijah
b5d7ecc269 Got the bank deposit working well. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@198 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 07:41:18 +00:00
abijah
ea1ad4764f Implemented a bank deposit routine, to transfer funds out of the till and into the bank. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@196 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-01 11:10:57 +00:00
abijah
dfe20e7ef9 Finally, finally... a working version for payment entry. The current schema is working well, and seems to handle our technical needs. However, it does seem to be very confusing with the extra accounts. Nonetheless, it does work and so I'll keep going down this path. This checkin also includes a mechanism to close the books on an account (by closing the underlying ledger) and start a new ledger. One of the decisions worth revisiting is separating out ledger entries that are really part of the same transaction. Without this change, inspecting a transaction results in the transaction total being off by a factor of two, since all money movement is in their twice (once for the expected reason, and again to hit the invoice/receipt ledger). 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@195 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-01 08:17:31 +00:00
abijah
18e1f4986a Since Lease.number is a VARCHAR, it doesn't sort well. So I added a hidden column for Lease.id, which sorts better. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629/site@192 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-30 17:56:32 +00:00
abijah
9fea9c79f3 Moving back to the Invoice/Receipt mechanism. Seems to work fairly well, even if it's non-standard. 
git-svn-id: file:///svn-source/pmgr/branches/charge_credit_20090629/site@189 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-30 04:47:18 +00:00
abijah
73eacdbcf2 More changes. I just can't seem to come up with a solution that works that I like. The problem now, without invoice/receipt, is that one check cannot cleanly pay for two units. 
git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622/site@182 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-24 00:33:39 +00:00
abijah
009ea6b44d Nowhere near done yet, but checking in a snapshot of semi-working code. There is some simultaneous support for both with and without use of the Invoice/Receipt account. I want to do away with them completely, but will need to change how sitelink payments are mapped (right now, they split a payment into multiple parts to match the charge). 
git-svn-id: file:///svn-source/pmgr/branches/single_AR_20090622/site@181 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-23 19:04:41 +00:00
abijah
eee3d45c5d Prevent grouping of ledger entries by transaction, at least for now. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@178 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 23:40:53 +00:00
abijah
de93c7545b Experiment to group ledger entries by their transaction ID instead of their entry ID. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@177 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 19:03:08 +00:00
abijah
e00e10bbb5 Added a balance column to customer. Like lease, since it's based on additional queries for stats, it's not sortable. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@176 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 17:58:13 +00:00
abijah
788cbde710 Due to the way we're adding in stats for each lease as a separate query, there isn't presently a way to sort by balance. Therefore I've disabled sorting on that column, which can be revisited if we reduce the grid down to a single SQL query. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@174 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 17:46:49 +00:00
abijah
4a064df594 Fixed problem with sorting by entries/debits/credits/balance 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@173 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 17:43:24 +00:00
abijah
3c067f6586 While working on payments, commented out the form reset stuff so I don't have to keep reentering the data with every post. Also, changed the customer ID to be passed outside of 'Customer', which appears to cake as a model that needs to be updated. Finally, added a bogus parameter, until I can figure out why the Model::set() function fails to recognize model fields if the first item in the model array is another Model. This bogus field just ensures Model::set uses all the fields, and bogus is ultimately ignored since it's not a member of LedgerEntry. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@169 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-19 16:17:14 +00:00
abijah
f7bcfef665 Added a ledger listing to the Lease view page, which was otherwise quite empty. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@168 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 04:19:17 +00:00
abijah
d06f34de9a Modified Transaction view to use jqGrid for entries. Also fixed a bug in the ledger entries element, since there is no way for credit/debit to be populated without a ledger_id, it makes sense to base the column displays on the presence of ledger_id. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@167 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 04:07:52 +00:00
abijah
d5388e7767 Although I'm not too happy with the modifications, I do have a working version that minimizes the columns need to display ledger entries. The logic feels screwy to me, but I've beat my head on it long enough. I'll move on to something else and come back to it when my head clears. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@166 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 03:57:43 +00:00
abijah
5a88f29600 Modified to prevent stepping on the user's action if already set. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@165 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 03:45:43 +00:00
abijah
de2319e93d Further progress on payment entries. There is an outstanding charges grid, but it doesn't have amounts due to the way I designed the ledger_entries element. I'll do a bit of rework on that next. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@163 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 00:49:40 +00:00
abijah
fdd3fe2641 Getting the receipt/payment data in order, getting ready to save (or at least experiment with save. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@157 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-17 07:38:39 +00:00
abijah
c340c25eee Fixed bug converting PHP strings to javascript when they contain the single quote (') character 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@156 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-17 07:37:45 +00:00
abijah
b8de98917a More progress on posting payments. Customer selection now works as well as the date picker. At this point, we need to figure out how to insert this data into the database. Of course, significant cleanup is still required, as is beautification. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@155 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-17 05:17:59 +00:00
abijah
d6c7fbb735 Added a refresh button to every jqGrid. I added a search button too, but I feel like the modal dialog needs to be tweaked to be useful. Oh well, good enough for the moment since it comes for free 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@154 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:55:41 +00:00
abijah
5dd3efa12f Added initial support for ledger entry reconciliation (e.g. matching payments to charges). 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@152 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:40:46 +00:00
abijah
212c982851 Removed the lengthy and overly verbose URL from the debug output, since it can be easily determined from clicking on the provided link. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@150 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:37:15 +00:00
abijah
57c73eafdb Eliminated use of ledger name, since a ledger is just one of the books that make up an account. There is no reason to identify a ledger by a name other than the account name. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@142 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 02:18:05 +00:00
abijah
30b3185473 Added accounts to the ledger entry grids, since it's tough to figure out what's going on without them. This exposed a problem with the controller name automatically being determined in the Links function, so it now looks for an optional controller parameter. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@141 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 23:22:38 +00:00
abijah
7ee461d993 Added monetary source into the ledger entry lists. This may be more information than is needed on the listing, but I'll take it out later if so. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@139 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:52:38 +00:00