Jason Denney
852a00881e
Velocipede changed their wording to CLASS
...
Can't find purpose by name, will have to rely on default ID in case wording is changed.
2013-11-21 19:37:30 -05:00
Jason Denney
ea79c167eb
Don't attempt to show a wheel size if it's blank
2013-11-04 09:38:53 -05:00
Jason Denney
1f9bd4f3a0
Don't validate top tube on bike model
2013-11-03 10:07:53 -05:00
Jason Denney
4aed82cf80
Make wheel size an combobox option on bikes
2013-10-19 15:37:01 -04:00
Ron Warholic
86ada003d6
Fixed default sort and added migration for shop_id => Integer
2013-10-18 23:44:12 -04:00
Jason Denney
ec5db646a0
Use models to sort data when possible
2013-09-02 18:24:34 -04:00
Jason Denney
8c6513099d
Merge pull request #61 from spacemunkay/denney-move-model-to-bike
...
Moving bike model to the bikes table
2013-09-02 14:28:06 -07:00
Jason Denney
47f616b7b0
Moving bike model to the bikes table
...
Leaving the bike_models table and bikes.bike_model_id column as a backup.
2013-09-02 17:26:07 -04:00
Jason Denney
087325c444
Whoops, only create once… not for every update...
2013-09-02 16:23:58 -04:00
Jason Denney
cecb3b1a32
Changing bike_status to bike_purporse
2013-09-02 14:02:18 -04:00
Jason Denney
a9fb3487a1
Remove unique constraint on bike_serial
...
bike serial index was already removed.
2013-08-18 00:51:45 -04:00
Jason Denney
7736ac5c34
Added credit tracking and stats
...
Added credit_conversions table so conversions can change over time
Added default credit conversion fixture
Added User#transaction_logs
Added User#total_credits (earned minus spent)
Added User#total_credits_spent (through transaction_logs)
Added User#total_earned_credits (complicated query which finds the conversion rate for a log depending on its created_at date)
2013-06-29 15:19:38 -04:00
Jason Denney
ff60fdd67f
Removing nickname from user
2013-06-13 20:59:01 -04:00
Jason Denney
cd41735cee
Bug in User#completed_build_bikes query. inner
2013-06-11 00:35:15 -04:00
Jason Denney
2c548ff63c
User#completed_build_bikes method, and stats page list
2013-06-01 17:11:57 -04:00
Jason Denney
b450baa3dc
merging master
2013-05-30 22:17:18 -04:00
John N. Milner
c5b16139f5
Merge branch 'master' into denney-new-user-form
...
Conflicts:
db/schema.rb
2013-05-30 22:03:53 -04:00
Jason Denney
f6f932f63a
Fixing some cancan permission issues… i think
2013-05-30 21:35:39 -04:00
Jason Denney
db1732f7bf
Bug in user_stats queries
2013-05-28 01:34:55 -04:00
Jason Denney
2e08f655ea
Registration form now remembers field values for nested form errors
2013-05-25 09:00:12 -04:00
jnm
3c90c13c3b
Merge pull request #15 from spacemunkay/denney-add-users-roles
...
Changing UserRole to UserRoleJoin
2013-05-23 18:03:59 -07:00
Jason Denney
145a731ed2
Remove puts
2013-05-19 16:44:28 -04:00
Jason Denney
d7755f00ed
Initial stab at check-in feature
2013-05-19 15:43:44 -04:00
John N. Milner
8f988b2cf1
Use self.table_name = instead of set_table_name to avoid deprecation warning
2013-05-10 03:21:13 -04:00
Jason Denney
a614b28558
Make it possible to limit roles by date
2013-04-25 21:38:55 -04:00
Jason Denney
6f6902dd82
Update Ability to get user roles, not role
2013-04-25 21:25:49 -04:00
Jason Denney
a083ed715b
Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table
2013-04-24 07:56:02 -04:00
Jason Denney
91bb2ea43e
Changing UserRole to UserRoleJoin
...
Beware, this breaks the view for some reason
2013-04-23 23:21:17 -04:00
John N. Milner
a3fcdec10c
WIP adding user roles view; adding end datetime to user roles
2013-04-18 22:16:13 -04:00
John N. Milner
59e45fa4d3
Initial work on permissions with cancan
2013-04-11 21:14:27 -04:00
John N. Milner
6a29eda8d9
WIP: cancan permissions; it breaks stuff!
2013-04-07 20:44:53 -04:00
John N. Milner
55fbd06305
Closes #1
2013-04-04 22:27:54 -04:00
Jason Denney
ad26dab160
Finished adding default Bike task list
2013-02-09 22:34:56 -05:00
Jason Denney
545c33b953
Added TaskList and Task migrations and models
2013-02-08 22:10:52 -05:00
Jason Denney
873bccb030
Completed adding transactions
2013-02-02 14:08:42 -05:00
Jason Denney
55d0b8f2f7
Some Transactions view adjustments
...
-moved js to customers and users components, in order to use accordion.
-Made the transaction form a little prettier
2013-01-23 00:09:39 -05:00
Jason Denney
2d51bd1d9a
Creating Transactions works
...
-Need to scope transactions for users
-Only Admins should be able to create transactions
2013-01-20 16:14:53 -05:00
Jason Denney
1b7daa45ca
Nested isn't working, another approach, add trans validations
...
User a transactions border, select the customer from a view of users and customers
2013-01-20 14:57:43 -05:00
Jason Denney
31935f6f7e
Nested attributes on Transactions isn't working so well
2013-01-20 13:52:47 -05:00
Jason Denney
d95f51eeca
Created customers
2013-01-20 13:52:19 -05:00
Jason Denney
11e738b428
Adding transactions
...
-Need to create a customers table to store contact information of customers who are not a user.
-Need to scope "User Transactions" for users, staff, and admin. Need to have a "All Shop Transactions" tab.
-Need to add conditional UX to form.
2013-01-19 15:59:47 -05:00
Jason Denney
6918520b01
Make create user let users enter address info, only require phone num
2013-01-06 22:43:40 -05:00
Jason Denney
c00c8fa3df
Fixed user profiles and added NOTE action to bike_logs
2013-01-05 14:01:26 -05:00
Jason Denney
3ac630f9f3
Round hours on stats page
2013-01-01 20:49:30 -05:00
Jason Denney
189137ba9d
Almost usable, still a lot of work left
...
-Moved bikes to User model instead of profile
-User can copy user log to a bike log with new actsasloggable
-Added user stats
-some css was messing up checkboxes, need to figure out which stylesheet was doing that
2012-12-31 15:38:34 -05:00
Jason Denney
922af526c1
Order bike brands and models alphabetically
2012-12-29 16:22:46 -05:00
Jason Denney
db9982dcd2
Added user roles and authentication, sign in/out
2012-12-29 16:22:24 -05:00
Jason Denney
4ebcbca081
Still a work in progress
2012-12-26 21:21:58 -05:00
Jason Denney
d7f5eb26bf
Experimenting with Netzke/ ExtJS
2012-12-23 09:02:07 -05:00
Jason Denney
d5b312fa54
Add users resources and paginate users index
2012-12-17 22:24:31 -05:00
Jason Denney
Jason Denney
Ron Warholic
John N. Milner
jnm