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

101 Commits

Author SHA1 Message Date
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
abijah
365b2295af 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/site@138 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:45:07 +00:00
abijah
dfb0d90246 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/site@137 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:34:35 +00:00
abijah
af32d88605 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/site@136 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:24:42 +00:00
abijah
c9c06a9fb4 Updated all the view.ctp files to use the new style infobox. I should probably create an element for it, but I'll hold off for now. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@135 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 21:01:22 +00:00
abijah
c3139220ee 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/site@134 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 19:41:20 +00:00
abijah
e3b838d62a Moved ledgers over the jqGrid. Working reasonably well at the moment. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@131 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 06:22:38 +00:00
abijah
5fd7483ac1 Updated accounts to use jqGrid. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@130 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 04:15:55 +00:00
abijah
274ed13644 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/site@129 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 04:15:35 +00:00
abijah
3c5a31aaff 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/site@127 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 02:48:58 +00:00
abijah
fd155aaaeb 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/site@126 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-15 00:44:40 +00:00
abijah
352e3487cc 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/site@124 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 23:54:48 +00:00
abijah
b02695631e 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/site@123 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 23:16:35 +00:00
abijah
b6317d3ee9 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/site@122 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 22:05:44 +00:00
abijah
2cbd5da8ee 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/site@121 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 20:36:38 +00:00
abijah
960ac108b8 Moved contacts onto jqgrid. Added 'name' and 'longname' formats. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@120 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 20:24:36 +00:00
abijah
92d8387e8c 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/site@118 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 19:50:09 +00:00
abijah
67d640b1a0 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/site@117 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:33:30 +00:00
abijah
ddf4d5cb29 Fixed minor issue where an empty query could continue to persist. 
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@116 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:14:36 +00:00
abijah
2143960ce9 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/site@115 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 05:04:41 +00:00
abijah
06a4a25be8 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/site@114 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 04:40:47 +00:00
abijah
25677ffa5e 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/site@113 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 03:22:53 +00:00
abijah
f06d831329 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/site@112 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-14 01:27:58 +00:00
abijah
cf0da7d3c2 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/site@109 97e9348a-65ac-dc4b-aefc-98561f571b83
 2009-06-13 21:20:11 +00:00