Merge branch 'develop'
Merge branch 'develop'
Adding boolean to sizes, color, styles, brands to denote whether it's retail or not. Only retail options require a sku
Adding boolean to sizes, color, styles, brands to denote whether it's retail or not. Only retail options require a sku
Created imprintable import script to import data from old inventories csvs in admin
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop
Fixed navigation menus in imprintable show not working
trello url: https://trello.com/c/iABbKZCV
Fix bug where the imprintable index view would load hidden modals for every
single imprintable listed
Trello card: 136, url: https://trello.com/c/PdwqWDwr
Fix depreciation message in imprintable spec and
Merge branch 'hotfix-136' into develop

Conflicts:
	spec/features/imprintables_spec.rb
remove payments table from schema
Fix a bug where every imprintable would include duplicate colors (card #137)

Also add a scope to variants to restrict color ids based on size ids
Trello url: https://trello.com/c/89llLwox
Merge branch 'develop', remote-tracking branch 'origin' into hotfix-137
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into payments

Conflicts:
	db/schema.rb
going to apply stash
Payments First Iteration

Add payments table
Lay groundwork for creating payments through order edit view
Add methods to order
Expand Spec
NOTE: refunding payments is broken because of issues with modal,
      the next commit will fix those issues