VERY IMPORTANT: this branch creates a new column on merchants (status). After it is merged you MUST run db:{drop,create,migrate} and the csv_load:all commands. (I think the db drop is necessary, but i'm not sure)
Aside from that, this creates two new sections on the admin merchant index page, enabled and disabled merchants, expands the controlleraction for admin update (it could probably be paired down, but I don't see how atm), tweaks the index action, and adds a couple of model methods for merchants.
VERY IMPORTANT: this branch creates a new column on merchants (status). After it is merged you MUST run db:{drop,create,migrate} and the csv_load:all commands. (I think the db drop is necessary, but i'm not sure)
Aside from that, this creates two new sections on the admin merchant index page, enabled and disabled merchants, expands the controlleraction for admin update (it could probably be paired down, but I don't see how atm), tweaks the index action, and adds a couple of model methods for merchants.