Tree: e6b05b4eab

devel

master

2.0

2.1

2.2

v1.0

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'e6b05b4eab'

${ noResults }

Commit Graph

334 Commits (e6b05b4eabf3d03ba8edd764283549cdf8fa20f9)

 

All Branches   

Search

Author	SHA1	Message	Date
Jonathan Rosenbaum	e6b05b4eab	Callback to query Volunteer benefits history.	7 years ago
Jonathan Rosenbaum	086a87900a	Adds delete_transaction id so that delete can be turned off for completed / saved transactions.	7 years ago
Jonathan Rosenbaum	8ed0677750	Now a previous saved transaction cannot be deleted.	7 years ago
Jonathan Rosenbaum	34e91b07bd	Adds original_price span.	7 years ago
Jonathan Rosenbaum	c1bde007b4	Minor text edit.	7 years ago
Jonathan Rosenbaum	63cecfc678	Fixes a minor bug introduced on first transaction for benefit transactions.	7 years ago
Jonathan Rosenbaum	daf885cc4a	Shows original price and redeemed volunteer hours for saved transaction when edit button is pressed.	7 years ago
Jonathan Rosenbaum	7147ea6213	Adds to new values (original_price and redeemed_hours) to the history for benefit transactions.	7 years ago
Jonathan Rosenbaum	04846ae362	Uses a new type for the volunteer column.	7 years ago
Jonathan Rosenbaum	d0e88bac58	Turns off/on spinner for membership based on choices in functions.	7 years ago
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.	7 years ago
Jonathan Rosenbaum	c214c48a3d	Adds an additional check for Stand Time or nothing else works.	7 years ago
Jonathan Rosenbaum	2508653fef	Shows amount if expired membership & status is stand time.	7 years ago
Jonathan Rosenbaum	23d8bcf60e	Adds the correct conversion for Stand Time transactions, still limited like normal transactions.	7 years ago
Jonathan Rosenbaum	bd00d498f1	Corrects a bug, by returning a deleted value.	7 years ago
Jonathan Rosenbaum	1c6508abd0	This corrects the math for all situations.	7 years ago
Jonathan Rosenbaum	a225aacda4	Adds the discount math. One unimportant bug created which will be fixed.	7 years ago
Jonathan Rosenbaum	76b73352dc	Adds VOLUNTEER_DISCOUNT.	7 years ago
Jonathan Rosenbaum	cf7bcd5103	Function redeemable added to handle duplicate logic for volunteer hours spinner.	7 years ago
Jonathan Rosenbaum	35c3a69f73	This doesn't allow a value > current_year_volunteer_values on input.	7 years ago
Jonathan Rosenbaum	38286d280a	Now uses stand_time_value for "Stand Time" transactions.	7 years ago
Jonathan Rosenbaum	6a89e5d675	Adds a new definition, stand_time_value.	7 years ago
Jonathan Rosenbaum	0ef4138aa4	Changes the logic so that price is read for stand time transactions.	7 years ago
Jonathan Rosenbaum	6b8cdbe0af	Adds logic to keyboard input, and makes incremental true. Nice stuff.	7 years ago
Jonathan Rosenbaum	52ba58d805	Changes the model suggestion for volunteer table.	7 years ago
Jonathan Rosenbaum	157cb8474d	This gets some of the basic logic working for redeeming volunteer hours.	7 years ago
Jonathan Rosenbaum	7fb848f7d4	The corrects a hereunto unknown very minor bug where data is not being check for value in the deposit calculator function.	7 years ago
Jonathan Rosenbaum	a557e2b8f5	This sets up some of the math framework to redeem volunteer hours from amount.	7 years ago
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.	7 years ago
Jonathan Rosenbaum	81e261bc6a	Finally have the values rendering properly.	7 years ago
Jonathan Rosenbaum	793fcb42e1	Adds a better regexp thanks to this: https://stackoverflow.com/questions/12643009/regular-expression-for-floating-point-numbers	7 years ago
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	7 years ago
Jonathan Rosenbaum	1202c4909a	This cleans up things a bit for spinner.	7 years ago
Jonathan Rosenbaum	e663006698	Some experimentation making sure the spinner is working. * Need to improve the css * Need to link everything togther, the fun part!	7 years ago
Jonathan Rosenbaum	960296c856	Adds the spinner libraries to the code, and adds some css values.	7 years ago
Jonathan Rosenbaum	9f263a68d6	Adds the jQuery UI spinner.	7 years ago
Jonathan Rosenbaum	670d27432b	Add MAX_BIKE_EARNED definition.	7 years ago
Jonathan Rosenbaum	c6f68ff19b	Fixes a presentation bug for paid member in Stand Time.	7 years ago
Jonathan Rosenbaum	7a09ccfead	Won't charge stand time if a member. Simplified callback reusing funtion.	7 years ago
Jonathan Rosenbaum	f1daa79213	Fixes a bug, and adds membership_benefits function for easier querying.	7 years ago
Jonathan Rosenbaum	ff0142aa30	Improves logic for multiple logins and real sign out.	7 years ago
Jonathan Rosenbaum	55620576dd	Adds styling for stand time info.	7 years ago
Jonathan Rosenbaum	a05575999c	Improves the presentation.	7 years ago
Jonathan Rosenbaum	eaefff480c	Figures out stand time amount with optional grace period.	7 years ago
Jonathan Rosenbaum	7969da316c	Adds a missing ; in new definition.	7 years ago
Jonathan Rosenbaum	e724e8d9cb	The beginnings of Stand Time logic.	7 years ago
Jonathan Rosenbaum	3087e5d21f	Adds Stand Time transaction type.	7 years ago
Jonathan Rosenbaum	ea3390354c	Adds Stand Time definitions.	7 years ago
Jonathan Rosenbaum	40a2a6abab	Tests if volunteer_hours exists.	7 years ago
Jonathan Rosenbaum	1805449b50	Changes Personal to Stand Time and many other things: * Updates populate * Makes Stand Time a special transaction_type_id * Adds new definitions to database_functions	7 years ago