Commit Graph
100 Commits
Author SHA1 Message Date
Jonathan Rosenbaum a960dbda55 Adds the new prefix conf for etherpad which also was added for individual reports, part of #39. 2017-12-11 02:15:10 +00:00
Jonathan Rosenbaum 8789a289b7 New configurations for etherpad; more documentation on the wiki coming. 2017-12-11 02:13:58 +00:00
Jonathan Rosenbaum 5d6a1ab384 One of the steps for #39 - include header behavior
* getting 2 iframes to behave properly so that etherpad isn't constantly reloading at the front sign-in was a little tricky and required slight alteration of some of the include headers.
2017-12-11 02:05:39 +00:00
Jonathan Rosenbaum 77be1aa86e Adds etherpad.js plugin library for #39! 2017-12-09 07:19:13 +00:00
Jonathan Rosenbaum 959fc08092 This implements etherpad (#39) for individual_history_log! 2017-12-09 07:09:35 +00:00
Jonathan Rosenbaum 655d009766 Fixes #38 with TIMEDIFF. 2017-12-09 00:38:33 +00:00
Jonathan Rosenbaum a7decc5735 Closes #29! 2017-11-26 05:35:50 +00:00
Jonathan Rosenbaum e99d2863b8 This fixes a bug introduced by the 34650c9be fix.
* There is an issue if the spinner is used, when the transaction is complete, the function is called infinitely.
2017-11-26 04:44:27 +00:00
Jonathan Rosenbaum 16c6b39d02 Fixes #36, swap intval with floatval. 2017-11-18 05:41:30 +00:00
Jonathan Rosenbaum 8ba910b37b Adds better error output, fixes #34. 2017-11-17 02:54:44 +00:00
Jonathan Rosenbaum a2a0b10077 Actually no for #23, doesen't resolve seconds or even ti/to. 2017-11-16 03:27:53 +00:00
Jonathan Rosenbaum 4574410744 Fixes #23 - time skewed by one step! 2017-11-16 02:13:43 +00:00
Jonathan Rosenbaum 34650c9be0 Mozilla, not chrome, picked up on the strict javascript requirement.
* some javascript libraries failed, but not all
* put volunteer_hours_to_membership_discount() in the right place, right above redeemable().
* Fixed!
2017-11-15 02:53:25 +00:00
Jonathan Rosenbaum f471c24339 Had to comment out disabled of amount as introduced with 956faaa279
* amount.val was saved because input was disabled
2017-11-14 08:02:51 +00:00
Jonathan Rosenbaum 956faaa279 Because #4 creates a special type of transaction, amount is disabled.
* enabled on sold_to.change
2017-11-14 06:32:57 +00:00
Jonathan Rosenbaum 2e0568c107 This fixes #4 with option 1, but introduces #29. 2017-11-14 05:06:06 +00:00
Jonathan Rosenbaum beeab5e775 Fixes #28. 2017-11-13 22:34:33 +00:00
Jonathan Rosenbaum 62a51320e3 This fixes #21, and cleans up the code a little. 2017-11-13 22:00:18 +00:00
Jonathan Rosenbaum cc41801975 Just a spelling correction. 2017-11-13 08:07:13 +00:00
Jonathan Rosenbaum 69b9c5e433 Two minor fixes.
* If sum is really large it is fixed(2) so that difference in transaction_log is correct and it turns green, etc.
* typeof amount.val() is check for undefined to avoid unneccesary error output.
2017-11-13 07:27:44 +00:00
Jonathan Rosenbaum 98965c8b19 If redeemed hours in NaN, converted to 0. 2017-11-13 07:25:40 +00:00
Jonathan Rosenbaum 52069d9b52 Fixes a bug introduced by adding datetime with enh #26.
* links for shop_log weren't opening up the latest shop, or any shop.
2017-11-13 05:45:59 +00:00
Jonathan Rosenbaum 104de44dc5 This closes #25!
* Requires mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
2017-11-13 00:38:01 +00:00
Jonathan Rosenbaum 68061f3408 CanEdit now proper for change from date to datetime. 2017-11-12 16:50:45 +00:00
Jonathan Rosenbaum 463a54a951 Closes #26, date to datetime, much nicer! 2017-11-12 16:14:56 +00:00
Jonathan Rosenbaum 57ecbab44a Modifies date in shops from date to datetime for #26. 2017-11-12 16:13:25 +00:00
Jonathan Rosenbaum d7aefb1416 This allows you to update in place without closing. Nice. 2017-11-12 08:57:18 +00:00
Jonathan Rosenbaum d8ddb34d1f This mostly closes #15, not all the enhancements, but nice enough. 2017-11-12 08:18:46 +00:00
Jonathan Rosenbaum 7fd089809f Enh: Added day of the week at the top. 2017-11-12 06:45:37 +00:00
Jonathan Rosenbaum 6b79915686 Corrects a spelling mistake. 2017-11-12 06:30:27 +00:00
Jonathan Rosenbaum 5928a936d2 Adds sold_to field in regards to #19.
* Sold By or
* Performed by
2017-11-12 06:28:47 +00:00
Jonathan Rosenbaum f7d389551a This resolves #23
* Adds LIST_MINUTE_INTERVAL
* Creates a new generic function from list_min15() .. list_min() with one new arguement, the minute interval that 60 should divide by cleanly.
* May clean up the $elapsed_hours, but currently have LIST_MINUTE_INTERVAL set to 1, so we are happy!
2017-11-12 04:21:35 +00:00
Jonathan Rosenbaum d065279477 Amount breakdown now being properly displayed for donations / monetary donation.
* basically, there isn't a breakdown.
2017-11-12 03:30:04 +00:00
Jonathan Rosenbaum 3f870cf60e Fixes #24. 2017-11-12 03:05:10 +00:00
Jonathan Rosenbaum 424c279e9e Fixes #22 with escape() 2017-11-12 02:35:42 +00:00
Jonathan Rosenbaum 3e9c23c676 Provides more information in amount title if has paid history.
* Original Price
* Paid
* Redeemed Hours
2017-11-11 22:47:50 +00:00
Jonathan Rosenbaum 3d02473e03 This should fix #22. 2017-11-11 22:46:04 +00:00
Jonathan Rosenbaum 080357c2f3 Resolves #17 2017-11-08 09:17:51 +00:00
Jonathan Rosenbaum adeb4f8854 Adds moment library to stats header. 2017-11-05 01:18:18 +00:00
Jonathan Rosenbaum 8be7a8a9b3 Removes unneccesary code. 2017-11-05 01:16:52 +00:00
Jonathan Rosenbaum 44748ca740 Changing Sale Date to Donation Date for all Donations. 2017-11-03 03:12:57 +00:00
Jonathan Rosenbaum a26ab11123 Temporary solution for #14. 2017-11-01 08:42:58 +00:00
Jonathan Rosenbaum 1f38eb1f9a Closes #13 by removing unncessary logic check.
* Hopefully, no reason for checking for new account.
2017-11-01 08:03:06 +00:00
Jonathan Rosenbaum 8396b66a76 Corrects a bug where comparisons req. Number cast. 2017-10-31 07:54:34 +00:00
Jonathan Rosenbaum bc3c7450fd Handles when contact_id exceeds greatest or least contact_id.
* will go to the closest contact_id, nice behavior.
2017-10-31 07:03:00 +00:00
Jonathan Rosenbaum b63df15721 Closes #12 enhancement. 2017-10-31 06:06:22 +00:00
Jonathan Rosenbaum 28ded7650e Adds placeholder ShopId to tabulator header. 2017-10-31 05:23:11 +00:00
Jonathan Rosenbaum f742fc9621 Adds prev next buttons as req in enhancement #12 2017-10-31 05:20:47 +00:00
Jonathan Rosenbaum 3dff971ac9 Adds accurate sorting for time_in, time_out, and total.
* uses moment.js
* changed from formatter to mutator for time_in and time_out.
2017-10-30 03:15:29 +00:00
Jonathan Rosenbaum c622cee563 Minor sytax fix. 2017-10-30 03:06:44 +00:00
Jonathan Rosenbaum c466ae0927 Adds moment to header. 2017-10-30 03:04:39 +00:00
Jonathan Rosenbaum 7b65374c13 Adds moment dot files. 2017-10-30 03:03:26 +00:00
Jonathan Rosenbaum 4bb9b043ad This adds moment to perfect date/time sorting with tabulator! 2017-10-30 03:01:55 +00:00
Jonathan Rosenbaum f15d312e5a Turns off cell editing, add "" for status. 2017-10-30 00:16:48 +00:00
Jonathan Rosenbaum 9cc6cb20be A complete redo with tabulator! 2017-10-29 23:49:12 +00:00
Jonathan Rosenbaum 68431826f3 Adds reports{js,php} for modern reporting with tabulator!
* and integration
2017-10-29 23:46:41 +00:00
Jonathan Rosenbaum 58a3e00f70 Adds tabulator and reports.js to this header. 2017-10-29 23:45:04 +00:00
Jonathan Rosenbaum 5e5899160a This cleans up the html a little for the last fix #10 2017-10-19 08:33:24 +00:00
Jonathan Rosenbaum e08708b66a Show signed-in patrons with distinct color for list_donation_locations_withheade
* closes #10
* combines signed-in with everyone else
* everyone should be put in alphabetical order in the future
2017-10-19 08:08:00 +00:00
Jonathan Rosenbaum 821009e0ad Turns patron name into a link in transaction_log. 2017-10-19 07:27:26 +00:00
Jonathan Rosenbaum 57c7bcd615 This closes #11 by turning shop_id into a link.
* transaction.css was too low a priority so added style in transaction_log.
2017-10-19 05:12:35 +00:00
Jonathan Rosenbaum 3c5eea235a This fixes #9 by allowing two behaviors via REDEEM_ONE_TO_ONE:
* based on the SWEAT_EQUITY_LIMIT with discounts applied,
* based on 1 to 1 (1hr of volunteering === 1hr of free stand time) regardless of the SWEAT_EQUITY_LIMIT
2017-10-19 04:27:44 +00:00
Jonathan Rosenbaum 28ff8f5fd6 Removed a td: Closes #3 2017-10-18 07:10:15 +00:00
Jonathan Rosenbaum 8ded4fa995 Minor change to show closes #8 Matt Marino enhancement request. 2017-10-11 08:19:54 +00:00
Jonathan Rosenbaum b9e17872ac Shows if banned.
* tr becomes red
* title becomes banned
* not all td currently change, however, it is sufficient to get the message across, and let the greeter know there is an issue.
2017-10-11 08:05:43 +00:00
Jonathan Rosenbaum 6eba0250d6 Returns banned list. 2017-10-11 06:18:00 +00:00
Jonathan Rosenbaum 5695fe8b07 This resolves the issue with user defined arrays (local_configurations) not carrying over.
* include works, too, and in this paticular code would not provide a disadvantage
2017-10-11 05:38:57 +00:00
Jonathan Rosenbaum 814a2bc4b6 Some long overdue major changes. 2017-10-10 03:49:05 +00:00
Jonathan Rosenbaum b4f1ca18de Little spelling change. 2017-10-10 03:34:10 +00:00
Jonathan Rosenbaum a3b2188e27 Provides an explanation for all the header include files. 2017-10-10 03:32:52 +00:00
Jonathan Rosenbaum 6a464d29be Adds tabulator capability to reports. 2017-10-10 03:19:10 +00:00
Jonathan Rosenbaum 407893b872 Adds the nice tabulator library! 2017-10-10 03:18:06 +00:00
Jonathan Rosenbaum cc6346a1b7 Simplified include_headers by removing include_header_start_shop.
* No important changes with shop_log.
2017-10-10 03:15:47 +00:00
Jonathan Rosenbaum 6fcf67c0c1 Changed season to shop season as recommended by Jonathan Nellis. 2017-09-20 07:13:53 +00:00
Jonathan Rosenbaum 28e290ba48 More text decoration improvements. 2017-09-19 08:02:00 +00:00
Jonathan Rosenbaum d3ed149289 Improves the update interests css a little bit. 2017-09-19 07:42:50 +00:00
Jonathan Rosenbaum 6846165297 Changes the color coding for volunteers who have redeemed all their hours. 2017-09-19 05:56:02 +00:00
Jonathan Rosenbaum 7b1e3f0545 Makes status font smaller to avoid overruns. 2017-09-19 05:40:03 +00:00
Jonathan Rosenbaum 7696b05dc9 Adds Update Interests to the Volunteer Hours column! 2017-09-19 04:51:49 +00:00
Jonathan Rosenbaum cc44575d2a More awesome improvements. 2017-09-18 04:08:36 +00:00
Jonathan Rosenbaum f5a5deb214 url correction 2017-09-17 20:25:29 +00:00
Jonathan Rosenbaum 5af92d5fe1 More expansion. 2017-09-17 20:22:31 +00:00
Jonathan Rosenbaum 8c33f95022 More improvements. 2017-09-17 20:12:53 +00:00
Jonathan Rosenbaum 1710842deb More policy additions. 2017-09-17 20:07:05 +00:00
Jonathan Rosenbaum 21a8447d54 Added some more important information in the 1st paragraph. 2017-09-17 09:19:05 +00:00
Jonathan Rosenbaum b2b306502b Improving verbiage. 2017-09-17 06:02:45 +00:00
Jonathan Rosenbaum 0e56e1b269 Long overdue update of shop welcome page.
* updates with new policies
* simplifies somewhat
* changes the color
2017-09-17 05:34:31 +00:00
Jonathan Rosenbaum 2ee0d57dc4 Changes from loud red, to cool blue (experiment). 2017-09-17 05:12:57 +00:00
Jonathan Rosenbaum 7c21381fef Adds include_footer so people have links to report bugs, etc. 2017-09-17 05:11:47 +00:00
Jonathan Rosenbaum 800205cbdd Changes margin-left from 170 to 80px to avoid run-overs. 2017-09-17 01:51:17 +00:00
Jonathan Rosenbaum d98c033348 Changes id to class for more than one row with same contact_id. 2017-09-17 01:29:02 +00:00
Jonathan Rosenbaum c356cb9aaf Adds Volunteer Hours and Paid Membership Columns to shop log:
* shows Summary for Volunteer hours
* show whether membership is current or not
* a little css magic in shop.js
2017-09-17 01:20:18 +00:00
Jonathan Rosenbaum 798ae356b6 Fixes Membership discount for non-member (EAB (all hours) and Volunteer) #2 2017-09-03 00:00:54 +00:00
Jonathan Rosenbaum 367f9707d5 Changes Statistics to Reports. Lots of header include files. 2017-08-14 03:53:18 +00:00
Jonathan Rosenbaum f95febd851 Realized that having readonly on membership may prevent a patron from renewing slightly earlier, so reverted.
* Could allow renewal perhaps 2 months before, and turn off readonly, as a feature.
2017-08-11 07:38:39 +00:00
Jonathan Rosenbaum 2b5c07665b Fixes another introduced bug so that readonly is only on for paid members for Memberships transactions. 2017-08-11 06:55:36 +00:00
Jonathan Rosenbaum 7b84256a39 Turns off input for membership transaction if patron is a paid member. 2017-08-11 06:36:17 +00:00
Jonathan Rosenbaum 79e8baf0b7 Fixes a bug where paid member was not showing for someone with a valid membership. 2017-08-11 06:24:31 +00:00
Jonathan Rosenbaum f889eccc71 Turns off quantity (community_bike) for Memberships. 2017-08-11 05:54:33 +00:00
Jonathan Rosenbaum b72ce46423 Introduced a bug with the last commit, fixed! 2017-08-11 05:46:51 +00:00