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
Maikel Linke
3e5dfda324
Removing old link to enterprise groups from configuration menu
2015-01-15 10:53:11 +11:00
Maikel Linke
13cbbcef40
Admin Tab Menu: converting .rb to .html.haml.deface
...
Plus a new menu item for enterprise groups.
2015-01-15 10:26:27 +11:00
Maikel Linke
949808e839
Customising AdaptiveMenu for the admin tab panel
...
The AdaptiveMenu was design for a menu filling the screen width. Our
menu is in a skeleton structure. The new file overwrites the spree
version and takes the container width as reference.
2015-01-14 18:03:08 +11:00
Maikel Linke
02a276b9c9
Producer and hub lists with search
...
Fixing map display as well.
2015-01-14 15:18:46 +11:00
Maikel Linke
9f1a773a58
MapController: copy default config instead of referencing
...
Copying makes it possible to have multiple independent maps.
2015-01-14 14:34:31 +11:00
Maikel Linke
0e510998a4
Handling missing options in shipping filter call
2015-01-14 14:33:37 +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
Rohan Mitchell
bbc887a692
Test the exact value, not the truncated value
2015-01-09 11:26:25 +11:00
Rohan Mitchell
6f36c0463c
Separate data preparation from test conditions
2015-01-09 11:26:25 +11:00
Rohan Mitchell
592ac7856a
Variable naming
2015-01-09 11:26:25 +11:00
Rohan Mitchell
261dea37e9
Spec formatting
2015-01-09 11:26:25 +11:00
Rohan Mitchell
80c507cc66
Formatting
2015-01-09 11:26:25 +11:00
Lynne Davis
1ad13f0359
Cleanup of git to remove unnecessary commits from pull request
2015-01-09 11:26:24 +11:00
Rohan Mitchell
532041c07b
Use Fuubar formatter for rspec - displays fails as they happen
2015-01-08 12:12:15 +11:00
Rohan Mitchell
05bd0c4168
Merge branch 'Matt-Yorkley-reports_2'
2015-01-08 10:50:27 +11:00
Rohan Mitchell
51b0d7e0eb
Move private method to helper
2015-01-08 10:48:02 +11:00
Rohan Mitchell
d2e0d4f44a
Fix grammar
2015-01-08 10:39:51 +11:00
Rohan Mitchell
ab26902e4e
Move money decorator to lib dir, as it's a decorator for a lib class, not a model
2015-01-08 10:39:14 +11:00
Rohan Mitchell
6adb4194c2
Extract date range form to partial
2015-01-08 10:31:51 +11:00
Rohan Mitchell
b6f29c778e
Use haml syntax for defining divs
2015-01-08 10:23:37 +11:00
Rohan Mitchell
4839c00d62
Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax
2015-01-08 10:12:32 +11:00
Rohan Mitchell
a438216189
Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-08 10:08:12 +11:00
Rohan Mitchell
29f9b3bbd7
Merge branch 'Matt-Yorkley-tax_cat_dropdown'
2015-01-08 09:51:27 +11:00
Rohan Mitchell
ac59665e3c
Test validations without creating models in database
2015-01-08 09:48:33 +11:00
Rohan Mitchell
e4efda2f96
Move model spec into validations block
2015-01-08 09:37:35 +11:00
Rohan Mitchell
a9b91bc52a
Tighten spec: setting tax category should succeed
2015-01-08 09:35:18 +11:00
Rohan Mitchell
f90ee33c89
Use the tax category factory provided by Spree
2015-01-08 09:27:29 +11:00
Rohan Mitchell
087ccb52f9
Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown
2015-01-08 09:09:20 +11:00
Rohan Mitchell
4bf8716786
Extract complete_checkout to method
2015-01-07 16:29:15 +11:00
Rohan Mitchell
c0030ddb13
use_short_wait can now take a flexible wait time
2015-01-07 16:28:03 +11:00
