bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 16:53:23 -05:00
Code Issues Projects Releases Wiki Activity
230 Commits 8 Branches 8 Tags
Commit Graph

65 Commits

Author SHA1 Message Date
Jason Denney
3d6f698fb9 Only update shop_id in migration 2013-11-02 15:12:55 -04:00
Jason Denney
b27d682517 Bug caused by Bike.wheel_size no longer existing 2013-10-19 16:28:09 -04:00
Jason Denney
4aed82cf80 Make wheel size an combobox option on bikes 2013-10-19 15:37:01 -04:00
Ron Warholic
5e042c2577 Added migration file 2013-10-19 10:03:02 -04:00
Ron Warholic
6cbe0f8b57 Merge branch 'master' of https://github.com/spacemunkay/velocipede 2013-10-18 23:45:51 -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
8d8058dea0 Comment for bike brands sql insert issue 2013-10-18 22:57:10 -04:00
Ron Warholic
93b8e3b055 Fixed the seeder loading the sql incorrectly; now stubs the index out so it generates the sequence number. 2013-10-18 21:24:44 -04: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
cecb3b1a32 Changing bike_status to bike_purporse 2013-09-02 14:02:18 -04:00
Jason Denney
4d7634605c Fixing search form for bikes updated to netzke 8.4 
Updated Netzke 8.4, better search styling, case insensitive search, can search associations
Fixed mistake where bikes.condition_id was a string… durrrrrr needs to be integer
 2013-08-15 22:05:29 -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
bccd5f10d7 Updated seeds.rb for PG 2013-06-29 11:45:19 -04:00
Jason Denney
f0ce8b7171 Switch DB from sqlite to Postgres 
-Postgres for production
-Migrations don't translate well between sqlite and postgres, better to just develop using the same database as production.
-Fixed migrations to work with Postgres
-Updated Readme for PG install instructions
-database config moved to .example
 2013-06-25 23:50:34 -04:00
Jason Denney
238a3af7d5 minor change to check for seeding admin 2013-06-25 22:31:29 -04:00
Jason Denney
b89873d0e5 Updating schema file w/ removed user nick 2013-06-13 21:12:34 -04:00
Jason Denney
d431024f01 Adding bike_admin fixture, fixed seeds.rb 2013-06-13 21:11:54 -04:00
Jason Denney
ff60fdd67f Removing nickname from user 2013-06-13 20:59:01 -04:00
Jason Denney
7c85e2901f Changes needed to run in produciton 2013-06-02 21:50:22 -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
9021294c4b Auth by username instead of email 
Added username to User table/model
 2013-05-25 11:08:58 -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
d7755f00ed Initial stab at check-in feature 2013-05-19 15:43:44 -04:00
darmock
f34def2c09 Store role_id as an integer instead of a string 2013-05-10 03:30:54 -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
941f7a267b Add migration to accompany 55fbd0630527761077a15988b2229a6afac548e4 2013-04-07 16:50: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
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
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
aa3658ec63 fix wrong id in fixtures 2013-01-05 14:31:59 -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
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
db9982dcd2 Added user roles and authentication, sign in/out 2012-12-29 16:22:24 -05:00
Jason Denney
3f850d61f1 Added extra status to bike statuses 2012-12-27 02:15:56 -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
939ea5b9db Refactored log controller, added log editing 
Refactored log controller, added log editing
 2012-12-17 10:19:02 -05:00
Jason Denney
b2eefd8163 actsasloggable transaction actions fixtures, resources, controller, and views 2012-12-09 18:11:18 -05:00
Jason Denney
139f5ccf9b ActsAsLoggable User Actions fixtures, resources, controller, and views 2012-12-09 18:06:04 -05:00
Jason Denney
885caefaf7 Create factory for seeding db with fake bikes, update seeds.rb 2012-12-09 14:26:31 -05:00
Jason Denney
29af72787b Add Bike Style model and defaults 2012-12-08 16:36:29 -05:00
Jason Denney
0d5b93b0b1 fix if in seeds.rb 2012-12-08 16:34:39 -05:00
Jason Denney
3ce2cef2f6 Add extra default condition 2012-12-08 16:27:53 -05:00
Jason Denney
a307d5f6d5 Load bike brands and models into sqlite3, This will work for now 2012-12-08 15:00:24 -05:00