summerscope
|
d2d3a577ea
|
Merging master into this branch to make it easy to pull for staging push
|
2015-01-15 17:38:35 +11:00 |
|
Rob Harrington
|
b3e67fa164
|
Take two on disabled logic
|
2015-01-15 17:34:04 +11:00 |
|
Rob Harrington
|
ac34da4f24
|
Altering logic around disabled state for 'Your Shopping Cart' button
|
2015-01-15 17:19:48 +11:00 |
|
summerscope
|
d2277999cc
|
Undo change of logic on disabled state on Shopping cart button
|
2015-01-15 17:13:10 +11:00 |
|
summerscope
|
cdd6c2daf2
|
Styling product summary row to allow for hiding product thumb at a larger break point
|
2015-01-15 16:46:55 +11:00 |
|
summerscope
|
4a881a5aa5
|
Turn off product thumb at a larger break point
|
2015-01-15 16:46:18 +11:00 |
|
summerscope
|
d5d218c450
|
Make taxon flag smaller for smallest device breakpoint
|
2015-01-15 16:45:54 +11:00 |
|
summerscope
|
f8622be21d
|
Adding in new color variable
|
2015-01-15 16:45:29 +11:00 |
|
summerscope
|
676e7cb4d6
|
Make taxon flag 2 cols for small devices
|
2015-01-15 16:45:09 +11:00 |
|
summerscope
|
1dfbc88813
|
Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around
|
2015-01-15 16:16:01 +11:00 |
|
summerscope
|
9db1c4c708
|
Adding in new color variable
|
2015-01-15 16:15:23 +11:00 |
|
summerscope
|
47a8731b8e
|
Styling for price column to distinguish between product added vs null
|
2015-01-15 16:01:49 +11:00 |
|
summerscope
|
932604bd69
|
Add in logic to style price column differently if nul vs has value
|
2015-01-15 16:01:00 +11:00 |
|
summerscope
|
4d7871a0bb
|
New grey color variable
|
2015-01-15 16:00:21 +11:00 |
|
summerscope
|
51c8891fac
|
Add animation to product title hover
|
2015-01-15 15:24:01 +11:00 |
|
summerscope
|
9b258e075b
|
Add styling and animation to img thumbnail
|
2015-01-15 15:23:36 +11:00 |
|
summerscope
|
891a9b06a8
|
Add expand icon on top of image thumbnail
|
2015-01-15 15:23:10 +11:00 |
|
summerscope
|
b5879d51ac
|
Merging master into shopfront-filters branch
|
2015-01-15 14:15:25 +11:00 |
|
Rohan Mitchell
|
dcc04ea538
|
On enterprise edit page, do not show side menu links we don't have permission to
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
83754a01ef
|
Make side menu item visibility declarative
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
2d82f76a43
|
Fix changed var in ability spec
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
d5437e1508
|
edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
f0bd9c1065
|
Fix failing specs due to addition of another enterprise
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
642de2f65f
|
Only show delete enterprise link when user has permission
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
f6e9c9494c
|
Enterprise user can edit profiles it has permission to
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
90ad2e2b7d
|
Allow enterprises with 'edit profile' permission to edit enterprises
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
cfb69ae7d2
|
Add Permissions#editable_enterprises
|
2015-01-15 13:43:38 +11:00 |
|
Rohan Mitchell
|
a93a824b83
|
Admin can grant permission for an enterprise to edit the profile of another
|
2015-01-15 13:43:38 +11:00 |
|
Rohan Mitchell
|
2170c7ede1
|
Fix broken JS spec
|
2015-01-15 13:43:38 +11:00 |
|
Rob Harrington
|
06cf914119
|
Hopefully resolving order populator strangeness related to concurrency by ensuring a fresh list of line items
|
2015-01-15 12:10:05 +11:00 |
|
Rohan Mitchell
|
307cc313df
|
Stub scope_to_hub in spec that wasn't expecting it
|
2015-01-13 11:46:41 +11:00 |
|
Rohan Mitchell
|
0431e0048c
|
Merge branch 'master' into variant-overrides-frontend
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
|
2015-01-12 16:48:51 +11:00 |
|
Rohan Mitchell
|
20bde803c8
|
Display overridden prices when products are in the cart
|
2015-01-12 14:58:35 +11:00 |
|
Rohan Mitchell
|
6b43354386
|
Restructure spec
|
2015-01-12 14:37:43 +11:00 |
|
Rohan Mitchell
|
494bb1f3b4
|
Fix auto-reload nerfing scope_xx_to_hub
|
2015-01-12 14:24:15 +11:00 |
|
Rohan Mitchell
|
d52b6b34e3
|
Spec: do not subtract stock from overrides that do not override count_on_hand
|
2015-01-12 11:33:53 +11:00 |
|
Rohan Mitchell
|
4583e29ae3
|
When order is placed, subtract stock from variant override
|
2015-01-12 11:23:53 +11:00 |
|
Rohan Mitchell
|
a4d4622521
|
Add VariantOverride.decrement_stock
|
2015-01-12 10:39:23 +11:00 |
|
Rohan Mitchell
|
20f650b472
|
Add VariantOverride.stock_overriden?
|
2015-01-12 09:32:02 +11:00 |
|
Rohan Mitchell
|
e013e1fe00
|
Don't show rspec profile by default
|
2015-01-09 15:30:49 +11:00 |
|
Rohan Mitchell
|
d40ffeef52
|
Remove old sidebar
|
2015-01-09 13:10:17 +11:00 |
|
Rohan Mitchell
|
6200390369
|
Merge branch 'lin-d-hop-add_shipping_category'
|
2015-01-09 12:49:09 +11:00 |
|
Rohan Mitchell
|
e9f32f5329
|
Spec that shipping category can be set when creating new products
|
2015-01-09 12:46:36 +11:00 |
|
Rohan Mitchell
|
27bc845b0b
|
Add correct markup for tax category required asterisk
|
2015-01-09 12:45:35 +11:00 |
|
Rohan Mitchell
|
22cb8b7a71
|
Two-space indentation, change 'Shipping categories' to 'Shipping category'
|
2015-01-09 12:33:26 +11:00 |
|
Rohan Mitchell
|
c6db1d440c
|
Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category
Conflicts:
app/overrides/spree/admin/products/new/replace_form.html.haml.deface
app/views/spree/order_mailer/confirm_email.text.haml
|
2015-01-09 12:30:19 +11:00 |
|
Rohan Mitchell
|
bc448e5156
|
Merge branch 'lin-d-hop-report_download_namechange'
|
2015-01-09 11:51:46 +11:00 |
|
Rohan Mitchell
|
6a42f62eb2
|
Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report
|
2015-01-09 11:49:59 +11:00 |
|
Rohan Mitchell
|
8db09d9590
|
Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
|
2015-01-09 11:48:23 +11:00 |
|
Rohan Mitchell
|
7e55262ce9
|
Extract most everything to private methods - neatly groups concerns together
|
2015-01-09 11:28:39 +11:00 |
|