raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 453 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rohan Mitchell
370133b875 Fix minor spec issues 2015-01-07 16:06:23 +11:00
Maikel Linke
3b9657eb17 show map of a group's enterprises 2015-01-07 12:00:55 +11:00
Maikel Linke
9956b967f0 Fixing link to group's page 2015-01-07 10:27:08 +11:00
Maikel Linke
9310bc902a first draft of group page, a lot of TODOs 2015-01-06 22:39:15 +11:00
Maikel Linke
9798b05a24 TabsCtrl can show tabs that don't toggle 
toggle: tabs show on first click and hide on second click
select: tabs show on every click, one tab is always active
 2015-01-06 22:39:15 +11:00
Maikel Linke
586753015b Reducing the groups page to a oneline list of groups 2015-01-06 22:39:15 +11:00
Paul Mackay
67b17de695 #275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback. 2014-12-30 11:33:13 +00:00
summerscope
6863dd75ef Restyling button for price breakdown to make it more clear that users press again to close the pop over 2014-12-19 17:05:13 +11:00
summerscope
fafdb29fcb Regenerated icon font, smaller file size and updated graph icon 2014-12-19 17:04:26 +11:00
Rohan Mitchell
85882a73ff Merge branch 'lin-d-hop-266reportsbranch' 2014-12-19 16:51:38 +11:00
Rohan Mitchell
2bad590ef4 Order confirmation and order objects use overridden prices 2014-12-19 16:51:11 +11:00
Rohan Mitchell
c3995ee4d5 Checkout shows overridden prices 2014-12-19 16:51:11 +11:00
Rohan Mitchell
94684e9963 Show overridden price in shopping cart 2014-12-19 16:51:11 +11:00
Rohan Mitchell
1e1a070b2b Scope Variant#price_in 2014-12-19 16:51:10 +11:00
Rob Harrington
6f95fa8546 Merge remote-tracking branch 'origin/shopfront-filters' 0.7.2 2014-12-19 15:40:01 +11:00
Rob Harrington
170b14d0f5 Tightening up expectations in shop controller spec 2014-12-19 15:39:13 +11:00
summerscope
d50f8dcd01 Tweak styling shopfront page to allow for new icons and hover state 2014-12-19 14:53:46 +11:00
summerscope
813ef463a2 Tweak markup shopfront page to add icon 2014-12-19 14:53:25 +11:00
Rob Harrington
a810fc88ac Dedicated new enterprise form 2014-12-19 14:05:24 +11:00
Rob Harrington
24cf3dee74 Hiding Shop Preferences in enterprise form 2014-12-19 14:05:24 +11:00
Rob Harrington
21e4f40616 Implementing primary taxon ordering on the shopfront 2014-12-19 14:05:23 +11:00
Rob Harrington
0fa289a443 Changing shopfront message into an alert box 2014-12-19 14:04:02 +11:00
Rob Harrington
fcb14f32d2 Validating user input for shopfront taxon order 2014-12-19 14:04:02 +11:00
Rob Harrington
f145a7ed65 Moving taxons into its own module, adding preferred shopfront taxon order to enterprise 2014-12-19 14:04:02 +11:00
Rob Harrington
a38e27e504 Adapting taxon autocompleter to allow multiple selection of taxons 2014-12-19 14:04:02 +11:00
Rob Harrington
4b353fa27b Ammending comments to make slightly more clear 2014-12-19 14:04:01 +11:00
Rob Harrington
9f086facdb Hiding link to shopfront for non-distributors 2014-12-19 14:04:01 +11:00
Rob Harrington
2efd905227 Fixing specs to work with text-angular 2014-12-19 14:04:01 +11:00
Rob Harrington
c5bf228cb9 Removing hashes from side menu links 2014-12-19 14:04:01 +11:00
Rob Harrington
b18163bfaf Remove separate long description injection, use full enterprise serializer instead 2014-12-19 14:04:01 +11:00
Rob Harrington
3fa1832e7b Adding shop closed message preference 2014-12-19 14:04:01 +11:00
Rob Harrington
d5df73c6a2 Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular 2014-12-19 14:04:01 +11:00
Rob Harrington
5a24f2c0e2 WIP: adding shopfront message to shop 2014-12-19 14:04:00 +11:00