abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
905 Commits 31 Branches 9 Tags
2519f4c8a7c1b04a9dad423f7a96bd3c00a0f2c2
Commit Graph

173 Commits

Author SHA1 Message Date
abijah
dc850f4e8e 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@209 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-05 15:01:18 +00:00
abijah
6a8d21dad7 Changed the relationship between grid visibility and text of the selected item. 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@207 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-04 17:38:22 +00:00
abijah
d77dcfca75 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@204 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-03 06:53:41 +00:00
abijah
1ae1b6a4f3 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@200 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 09:19:33 +00:00
abijah
021c0626a3 Added ability for callers to control the jqGrid sort order 
git-svn-id: file:///svn-source/pmgr/branches/invoice_receipt_20090629@199 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-02 09:16:42 +00:00
abijah
8d87a0698c 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@196 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-01 11:10:57 +00:00
abijah
44df78e69f 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@195 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-07-01 08:17:31 +00:00
abijah
2b2991a13a 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@192 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-30 17:56:32 +00:00
abijah
ce4fa4131a 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@182 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-24 00:33:39 +00:00
abijah
80f8bd36d5 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@181 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-23 19:04:41 +00:00
abijah
bd0bbd768d Prevent grouping of ledger entries by transaction, at least for now. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@178 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 23:40:53 +00:00
abijah
20b8908a00 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@177 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 19:03:08 +00:00
abijah
ab51fd32d2 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@176 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 17:58:13 +00:00
abijah
117e31af69 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@174 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 17:46:49 +00:00
abijah
28b3f35318 Fixed problem with sorting by entries/debits/credits/balance 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@173 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-22 17:43:24 +00:00
abijah
c8b781804a 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@167 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 04:07:52 +00:00
abijah
3e5ac64108 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@166 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 03:57:43 +00:00
abijah
9b6830468e Modified to prevent stepping on the user's action if already set. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@165 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 03:45:43 +00:00
abijah
a2ae522b2d 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@163 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-18 00:49:40 +00:00
abijah
001b156333 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@155 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-17 05:17:59 +00:00
abijah
df1e0daafd 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@154 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:55:41 +00:00
abijah
fae90c3fa9 Added initial support for ledger entry reconciliation (e.g. matching payments to charges). 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@152 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:40:46 +00:00
abijah
4ada3d5bac 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@150 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-16 21:37:15 +00:00
abijah
388dbc0540 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@141 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 23:22:38 +00:00
abijah
1495bb3373 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@139 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:52:38 +00:00
abijah
eaea52a862 Added an element for monetary_sources. Not sure if it will get used, but it was easy enough to do. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@138 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:45:07 +00:00
abijah
271207629b Moved map listings to jqGrid, and fixed cut/paste error in the comments of the transactions controller. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@137 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:34:35 +00:00
abijah
edca01f98c Moved transaction listings to jqGrid, and fixed a bug in the jqGrid element wrt. comment columns 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@136 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:24:42 +00:00
abijah
543e2daa43 Moved the ledger_entries controller/view to jqGrid. 
Changed the app controller jqGrid virtual functions for getting the tables for both count and the full query.  The ExtraTables bit was too confusing, and was only intended to allow the user to specify a subset for count and augment it for full query.  This is easily accomplished by having DataTables just call DataCountTables first... one line solution ends the confusion.

Modified linkable behavior to support a %{MODEL_ALIAS} tag, which is replaced in the relationship conditions at runtime with the actual model alias.  This is experimental at best, and certainly will create a problem for any model that ends up using the conditions in 'contain' instead of 'link'.

Broke the LedgerEntry->findInLedgerContext function out into multiple pieces, so those same pieces could be used in the LedgerEntries controller to populate jqGrid.

Changed the ledger_entries element, as a special case, to also allow listing control from ledger_id and account_type, instead of idlist as a mechanism for populating the grid.

Changed the infobox summary css, which will break several pages until I rework them.

Some next steps include fixing the broken infoboxes, and changing the transactions view to use the ledger_entries element.  This also means the ledger_entries element will need to add support for idlist, or if we have any credit/debit issues, perhaps another custom transaction_id instead.



git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@134 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 19:41:20 +00:00
abijah
39071b39fb Moved ledgers over the jqGrid. Working reasonably well at the moment. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@131 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 06:22:38 +00:00
abijah
3dcdcb03eb Updated accounts to use jqGrid. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@130 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 04:15:55 +00:00
abijah
41636f5c75 Fixed an issue with debug output when including more than one grid on a page. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@129 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 04:15:35 +00:00
abijah
2b9369b823 Added debug mechanism to help track grid loading problems. It will obviously need to be taken out at some point, but I'll wait until things are working well enough. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@127 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 02:48:58 +00:00
abijah
4ec3db7b58 Moved the pagination objects to the right side instead of centered. Also, replaced the jQuery function call for the pager parameter to just the id text. I found this in the manual, and it saves us from having to use the --special exception. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@126 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 00:44:40 +00:00
abijah
31c603c757 Minor tweak to the css to create a margin for each grid, and so added a div to wrap each item listing. Changed the search boxes to only be available for the overall item listing. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@124 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 23:54:48 +00:00
abijah
4d49ad6516 Moved all of the jqGrid search javascript into its own file to prevent duplication when including more than one grid on a page. I also put search boxes directly into the jqGrid element, with the requested fields passed in as a parameter. I've got the autosearch mechanism tied across all grids, but search and reload is grid specific. This was mostly to get the code into an extensible spot, but the layout is not yet desirable. I'll yank the search boxes on the next checkin not that its proven out. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@123 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 23:16:35 +00:00
abijah
015e6b082d Fixed a bug in which jqGrid would fetch data from the current controller, not the controller responsible for populating the data. Added the ability to fetch data based strictly off of an ID list, which is useful for lists that are embedded in other pages, where the list conditions are entirely foreign to the controller responsible for providing the data. To assist with this one jqGrid virtual function needed the model added as a parameter, so I added it to them all and modified the jqGrid functions in the existing derived controllers. Right now the elements (such as contacts.ctp, the only working one) receive a full list of data to populate themselves. I could have simply taken this and passed it directly to jqGrid, with no need for further server interaction. However, this could result in some very large lists, and although pagination will ensure the user is not overwhelmed, the connection or the browser could be. Unless we have a strong performance need, I'll keep it this way. In the meantime, I'll leave the underlying data available to each element, in case I have to switch over. When all is proven out, I can simplify all the queries such that the extra data is never requested in the first place. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@122 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 22:05:44 +00:00
abijah
cdec4c3301 Moved the phpVarToJavascript function into our FormatHelper. It isn't really the ideal place for it, but I don't want to create a new helper (at least, not yet) 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@121 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 20:36:38 +00:00
abijah
404323c6c1 Moved contacts onto jqgrid. Added 'name' and 'longname' formats. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@120 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 20:24:36 +00:00
abijah
c90830d41a Made the app controller include the action by default. Added virtual callouts for data order and limit. Changed fields to use formatting, including a custom format for currency and id. Added a function for auto conversion from PHP variables to javascript. Fixed some minor bugs in the controllers already converted to jqGrid. Moved leases onto jqGrid. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@118 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 19:50:09 +00:00
abijah
f6ca79d1a9 Moved units onto jqGrid. Also generalized the jqGridSetup (now jqGridView) function and moved it into the app controller. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@117 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:33:30 +00:00
abijah
5fab94011b Fixed minor issue where an empty query could continue to persist. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@116 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:14:36 +00:00
abijah
af2d5c38f3 Moved all the jqGrid logic into a separate element, in anticipation of moving all lists to jqGrid 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@115 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:04:41 +00:00
abijah
6b8d05f2a0 Yanked the multicolumn toolbar, and returned to my simple text boxes. I will probably end up going with these search boxes, or the modal box (perhaps with autosearch) if I can't come up with a better idea. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@114 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 04:40:47 +00:00
abijah
336ec3b643 Got the mulitcolumn search toolbar in place, but it's not working. First I haven't managed to get an autosearch working (searching as you type). Second, and much more critically, I don't have the controller correctly responding to search terms, as it was implemented rather poorly. I'm moving on for now. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@113 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 03:22:53 +00:00
abijah
b4d640f7c2 Testing implementation of an autosearch functionality, which works. Probably wasted, as I suspect I can get this directly out of jqGrid 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@112 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 01:27:58 +00:00
abijah
3be775f9b2 Added query ability to the customer grid. There is a bug with the paging code, but it roughly works. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@109 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 21:20:11 +00:00
abijah
0278c77610 Things are finally working fairly well for the customers grid (although I've not yet taken any speed issues into account). I removed the index.ctp file, since it was largely useless and I figured out how to render directly to the element. I also moved most of the jqGrid XML code into the application controller, since it will be reused by most of our controllers. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@108 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 20:46:17 +00:00
abijah
c5bd8b4b16 Another attempt to get the customer table working. Cake's query mechanism is really torquing me, it never seems to be able to do what I need (perhaps because they've generalized it to work with so many SQL engines. I'm just going to pull unit information out all together, and I can add it back in another day if needed. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@106 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 15:52:09 +00:00
abijah
a49b86898e Check in aother snapshot, since I can now pass complex structures from the view back to the jqGrid data provider 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@105 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 07:22:38 +00:00