bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2026-09-03 10:21:38 -04:00
Code Issues Projects Releases Wiki Activity
390 Commits 2 Branches 4 Tags
800205cbdd3c7f88e2b71ff280211e618b0998e6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jonathan Rosenbaum 9ef3efe15c Improves documentation for local_configurations.php. 2017-08-10 23:53:33 +00:00
Jonathan Rosenbaum 1eb5982595 Cleans up the code a little bit. 2017-08-09 07:48:26 +00:00
Jonathan Rosenbaum a2ae9907e4 Fixes a bug with then newest introduced volunteer benefits math. 2017-08-09 05:48:56 +00:00
Jonathan Rosenbaum 3f195f358b Comments out console.log. 2017-08-09 05:30:27 +00:00
Jonathan Rosenbaum e37a0ec2f7 Redeemable now properly adds discount when there has been previous transactions . 
* some fun math!
 2017-08-09 05:25:23 +00:00
Jonathan Rosenbaum 8f45c94cd8 Turns off all console.log. 2017-08-08 05:42:31 +00:00
Jonathan Rosenbaum d450864bdf Displays original price for membership discount transaction. 2017-08-08 05:29:47 +00:00
Jonathan Rosenbaum 2c05f7e768 Properly reflects membership discount in amount on save. 2017-08-08 04:50:43 +00:00
Jonathan Rosenbaum 1b56a37859 Adds membership_discount_price span that will not be displayed. 2017-08-08 03:39:50 +00:00
Jonathan Rosenbaum 8da2bb24eb Switches to membership discount when there are no remaining volunteer hours to redeem for volunteers who are also paid members. 2017-08-08 03:32:04 +00:00
Jonathan Rosenbaum 6bd1742c54 Improves the code be expanding the scope of the volunteer benefits object, and providing correct calculations in Stand Time so that the stand time transaction is properly rendered on select change. 2017-08-07 22:42:55 +00:00
Jonathan Rosenbaum 609078a60d Removes an uncessary function call and callback return that was used to Stand Time which was replaced by accurate code in transactions.js. 2017-08-07 22:41:48 +00:00
Jonathan Rosenbaum c814e49031 Adds Stand Time to membership benefits definition. 2017-08-07 22:40:44 +00:00
Jonathan Rosenbaum 945428b0c9 amount.one didn't hack it, back to amount.on. 2017-08-07 20:17:43 +00:00
Jonathan Rosenbaum 6f3fc83a0b Adds a few additional transactions to the membership benefits definition. 2017-08-07 20:08:36 +00:00
Jonathan Rosenbaum de853b5da0 Adds membership discount span. 2017-08-07 20:08:02 +00:00
Jonathan Rosenbaum dd6a77f1d8 Adds membership discount to volunteer benefits css. 2017-08-07 20:07:17 +00:00
Jonathan Rosenbaum eaa1d18788 Assigns a value if transaction tests true for membership discount. 2017-08-07 20:06:08 +00:00
Jonathan Rosenbaum f040988854 This changes on to one which is a better strategy when it is only necessary for the handler to fire once and empty the results for the membership discount. 2017-08-07 18:00:34 +00:00
Jonathan Rosenbaum 137cc27ca1 Properly displays discounted price in #membership_discount. 2017-08-07 17:33:47 +00:00
Jonathan Rosenbaum a0f3e74165 This improves the math for membership discount and shows it in the original price element. 2017-08-07 03:40:15 +00:00
Jonathan Rosenbaum 20741bd9d6 Provides membership discount value on callback. 2017-08-07 01:29:53 +00:00
Jonathan Rosenbaum f69c4d49c9 Defines Membership discount. 2017-08-07 01:22:06 +00:00
Jonathan Rosenbaum 1f73ed2a2e Changed to allow unlimited hour-to-hour Stand Time. 2017-08-06 19:03:39 +00:00
Jonathan Rosenbaum 2d264773ed This properly records orginal price when redeeming volunteer hours for Stand Time when input is already pre-filled. 2017-08-06 08:22:55 +00:00
Jonathan Rosenbaum 09cc2893a4 Improves the output feedback. 2017-08-06 07:16:55 +00:00
Jonathan Rosenbaum a084161d03 Free stand time for bike purchases is now working. 2017-08-06 07:00:52 +00:00
Jonathan Rosenbaum ff0bb290e2 Tests the free stand time callback. 2017-08-06 05:18:53 +00:00
Jonathan Rosenbaum fc694c4a87 Adds new stand time definition for free stand time period. 2017-08-06 05:17:58 +00:00
Jonathan Rosenbaum aab521eb6b Improves the max bike earned logic. 2017-08-05 22:01:02 +00:00
Jonathan Rosenbaum e852af5e5f Max Bike Earned logic now working. 2017-08-05 21:15:20 +00:00
Jonathan Rosenbaum fb0e9cfbfb Corrects some human introduced bugs by returned code to earlier state. 2017-08-05 19:22:02 +00:00
Jonathan Rosenbaum 3e18f89e65 Discount works properly when redeemable value is not greater than sweat equity limit. 
* Also, improved tabbing to take into account the spinner.
 2017-08-05 19:05:16 +00:00
Jonathan Rosenbaum 27ff8f87d2 Corrects an introduced bug where max is assigned a value, but obj.volunteer does not have a value assigned, yet. 2017-08-05 18:28:16 +00:00
Jonathan Rosenbaum 165b81adc5 Gives a 0 value when there is no vhr & vhr 2017-08-05 18:13:57 +00:00
Jonathan Rosenbaum 2f33f8eef8 If volunteer hours remaining is 0, spinner is disabled on spin or zeroed on input. 2017-08-05 06:44:59 +00:00
Jonathan Rosenbaum 17573c20e4 Adds new value to redeemable function, and comments unneccesary code in function. 2017-08-05 06:13:59 +00:00
Jonathan Rosenbaum 5e80aedca7 Fills in the blanks for volunteer hours remaining and redeemed in mouseover. 2017-08-05 05:49:25 +00:00
Jonathan Rosenbaum bc747c90a2 Creates new object when year changes. 2017-08-05 04:41:55 +00:00
Jonathan Rosenbaum 9e8ea84a0e Assigns 0.00 if redeemable_hours are NaN, and runs a test so info isn't shown esessentially for a non-volunteer. 2017-08-05 03:42:21 +00:00
Jonathan Rosenbaum 5047f59996 This uses tradition declaration notation rather than emacscript 6 notation, just for compatibility with older browsers. 2017-08-05 03:08:18 +00:00
Jonathan Rosenbaum b7f128feca Creates the object, and adds redeemed hours together. 2017-08-04 06:25:27 +00:00
Jonathan Rosenbaum aeb6b23889 Adds volunteer history update. 2017-08-04 06:24:54 +00:00
Jonathan Rosenbaum a48fb518f7 Saves redeemed hour value properly if previous edited transaction is saved again. 2017-08-03 21:39:08 +00:00
Jonathan Rosenbaum f95f2d2b2c This gets volunteer history select working correctly. 2017-08-03 21:23:13 +00:00
Jonathan Rosenbaum e6b05b4eab Callback to query Volunteer benefits history. 2017-08-03 21:10:25 +00:00
Jonathan Rosenbaum 086a87900a Adds delete_transaction id so that delete can be turned off for completed / saved transactions. 2017-08-03 21:09:33 +00:00
Jonathan Rosenbaum 8ed0677750 Now a previous saved transaction cannot be deleted. 2017-08-03 21:08:28 +00:00
Jonathan Rosenbaum 34e91b07bd Adds original_price span. 2017-08-03 20:28:34 +00:00
Jonathan Rosenbaum c1bde007b4 Minor text edit. 2017-08-03 20:27:53 +00:00
Jonathan Rosenbaum 63cecfc678 Fixes a minor bug introduced on first transaction for benefit transactions. 2017-08-03 20:26:47 +00:00
Jonathan Rosenbaum daf885cc4a Shows original price and redeemed volunteer hours for saved transaction when edit button is pressed. 2017-08-03 20:03:27 +00:00
Jonathan Rosenbaum 7147ea6213 Adds to new values (original_price and redeemed_hours) to the history for benefit transactions. 2017-08-03 19:44:38 +00:00
Jonathan Rosenbaum 04846ae362 Uses a new type for the volunteer column. 2017-08-03 03:29:35 +00:00
Jonathan Rosenbaum d0e88bac58 Turns off/on spinner for membership based on choices in functions. 2017-08-03 00:15:38 +00:00
Jonathan Rosenbaum d4cb86b3c0 Adds transactions_with_volunteer_benefits and transactions_with_membership_benefits. 
* Allows transactions to provide volunter and/or membership benefits
* Volunteer benefits take precedent for patrons with both types of benefits if a tranaction offers both.
 2017-08-02 22:27:39 +00:00
Jonathan Rosenbaum c214c48a3d Adds an additional check for Stand Time or nothing else works. 2017-08-02 22:07:03 +00:00
Jonathan Rosenbaum 2508653fef Shows amount if expired membership & status is stand time. 2017-08-02 21:27:34 +00:00
Jonathan Rosenbaum 23d8bcf60e Adds the correct conversion for Stand Time transactions, still limited like normal transactions. 2017-08-02 21:15:11 +00:00
Jonathan Rosenbaum bd00d498f1 Corrects a bug, by returning a deleted value. 2017-08-02 20:27:13 +00:00
Jonathan Rosenbaum 1c6508abd0 This corrects the math for all situations. 2017-08-02 20:16:17 +00:00
Jonathan Rosenbaum a225aacda4 Adds the discount math. One unimportant bug created which will be fixed. 2017-08-02 09:15:11 +00:00
Jonathan Rosenbaum 76b73352dc Adds VOLUNTEER_DISCOUNT. 2017-08-02 06:18:46 +00:00
Jonathan Rosenbaum cf7bcd5103 Function redeemable added to handle duplicate logic for volunteer hours spinner. 2017-08-02 05:13:43 +00:00
Jonathan Rosenbaum 35c3a69f73 This doesn't allow a value > current_year_volunteer_values on input. 2017-08-01 05:57:34 +00:00
Jonathan Rosenbaum 38286d280a Now uses stand_time_value for "Stand Time" transactions. 2017-08-01 05:34:49 +00:00
Jonathan Rosenbaum 6a89e5d675 Adds a new definition, stand_time_value. 2017-08-01 05:15:20 +00:00
Jonathan Rosenbaum 0ef4138aa4 Changes the logic so that price is read for stand time transactions. 2017-07-31 21:58:58 +00:00
Jonathan Rosenbaum 6b8cdbe0af Adds logic to keyboard input, and makes incremental true. Nice stuff. 2017-07-31 21:27:12 +00:00
Jonathan Rosenbaum 52ba58d805 Changes the model suggestion for volunteer table. 2017-07-31 21:07:51 +00:00
Jonathan Rosenbaum 157cb8474d This gets some of the basic logic working for redeeming volunteer hours. 2017-07-31 21:06:40 +00:00
Jonathan Rosenbaum 7fb848f7d4 The corrects a hereunto unknown very minor bug where data is not being check for value in the deposit calculator function. 2017-07-30 20:02:25 +00:00
Jonathan Rosenbaum a557e2b8f5 This sets up some of the math framework to redeem volunteer hours from amount. 2017-07-29 20:56:45 +00:00
Jonathan Rosenbaum 4feb5022eb Puts all volunteer data into one column called "volunteer". 
* Reflects the changes in json, and adds more definition to the json callback.
 2017-07-29 20:29:18 +00:00
Jonathan Rosenbaum 81e261bc6a Finally have the values rendering properly. 2017-07-28 01:26:54 +00:00
Jonathan Rosenbaum 793fcb42e1 Adds a better regexp thanks to this: 
https://stackoverflow.com/questions/12643009/regular-expression-for-floating-point-numbers
 2017-07-27 19:27:19 +00:00
Jonathan Rosenbaum 21125249ea Makes it even nicer thanks to this good read: 
https://stackoverflow.com/questions/16791940/jquery-ui-spinner-able-to-exceed-max-by-keyboard
 2017-07-27 19:12:19 +00:00
Jonathan Rosenbaum 1202c4909a This cleans up things a bit for spinner. 2017-07-27 18:47:16 +00:00
Jonathan Rosenbaum e663006698 Some experimentation making sure the spinner is working. 
* Need to improve the css
* Need to link everything togther, the fun part!
 2017-07-27 18:01:53 +00:00
Jonathan Rosenbaum 960296c856 Adds the spinner libraries to the code, and adds some css values. 2017-07-27 17:58:53 +00:00
Jonathan Rosenbaum 9f263a68d6 Adds the jQuery UI spinner. 2017-07-27 17:44:35 +00:00
Jonathan Rosenbaum 670d27432b Add MAX_BIKE_EARNED definition. 2017-07-26 19:19:28 +00:00
Jonathan Rosenbaum c6f68ff19b Fixes a presentation bug for paid member in Stand Time. 2017-07-24 05:30:36 +00:00
Jonathan Rosenbaum 7a09ccfead Won't charge stand time if a member. Simplified callback reusing funtion. 2017-07-24 05:02:21 +00:00
Jonathan Rosenbaum f1daa79213 Fixes a bug, and adds membership_benefits function for easier querying. 2017-07-24 04:45:51 +00:00
Jonathan Rosenbaum ff0142aa30 Improves logic for multiple logins and real sign out. 2017-07-24 01:26:50 +00:00
Jonathan Rosenbaum 55620576dd Adds styling for stand time info. 2017-07-24 01:25:57 +00:00
Jonathan Rosenbaum a05575999c Improves the presentation. 2017-07-23 19:57:43 +00:00
Jonathan Rosenbaum eaefff480c Figures out stand time amount with optional grace period. 2017-07-23 19:06:52 +00:00