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

4351 Commits

Author SHA1 Message Date
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
Rohan Mitchell
85882a73ff Merge branch 'lin-d-hop-266reportsbranch' 2014-12-19 16:51:38 +11:00
Rohan Mitchell
94684e9963 Show overridden price in shopping cart 2014-12-19 16:51:11 +11:00
Rob Harrington
6f95fa8546 Merge remote-tracking branch 'origin/shopfront-filters' 2014-12-19 15:40:01 +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
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
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
9f086facdb Hiding link to shopfront for non-distributors 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
Rob Harrington
435bc177f8 Hiding side menu elements by filtering rather than by making invisible 2014-12-19 14:04:00 +11:00
Rob Harrington
a489aa7ad9 Fixing enterprise feature spec, adding first shop preference 2014-12-19 14:04:00 +11:00
Rob Harrington
33d4f03a99 Adding shop preferences pane, fiddling with icons 2014-12-19 14:04:00 +11:00
Rob Harrington
612c8a95b2 Adding icons to enterprise edit side menu 2014-12-19 14:04:00 +11:00
Rob Harrington
abdcdea1a2 Adding payment methods partial to new enterprirse edit screen 2014-12-19 14:04:00 +11:00
Rob Harrington
412b431f36 Fixing up tbody positions 2014-12-19 14:03:59 +11:00
Rob Harrington
25e608d9fb Adding shipping methods partial to redone enterprise form 2014-12-19 14:03:59 +11:00
Rob Harrington
0ea1adfdff Adding a partial for enterprise fees to enterprise form 2014-12-19 14:03:59 +11:00
Rob Harrington
76acd706ea Adding ability to show and hide menu items 2014-12-19 14:03:59 +11:00
Rob Harrington
eb2a6f0ef5 Splitting contact and social into two separate partials 2014-12-19 14:03:59 +11:00
Rob Harrington
b10d623f26 Rearrange columns for action buttons on enterprise form 2014-12-19 14:03:58 +11:00
Rob Harrington
f86d4a1996 Pulling headings out of enterprise form partials, displaying each conditionally 2014-12-19 14:03:24 +11:00
Rob Harrington
d8349bc037 menu refers to SideMenu object 2014-12-19 13:52:02 +11:00
Rob Harrington
39ca0ce3dc WIP: Adding a side_menu to the enterprise form 2014-12-19 13:52:01 +11:00
Rob Harrington
b0c86f83ee Splitting enterprise edit page into partials 2014-12-19 13:52:01 +11:00
summerscope
f36c881f52 Add clear filters feature to Producers page 2014-12-19 13:02:07 +11:00
summerscope
e8c5af004f Add another class so we can see which row is clear filters 2014-12-19 13:01:49 +11:00
summerscope
b55bced488 Put show hide animation back in for clear button 2014-12-19 12:53:48 +11:00
summerscope
ebe2d99299 Change markup because the boolean variable now works correctly 2014-12-19 12:53:26 +11:00
summerscope
08d37b955a Refactoring filter feature for shopfront page - show by default, hide on click. WIP. 2014-12-19 12:22:04 +11:00
Rohan Mitchell
e9f04c3c15 Clean up whitespace 2014-12-19 10:01:21 +11:00
Rohan Mitchell
0151ecbb32 Add additional rows to payment method selection 2014-12-19 09:51:32 +11:00
Rohan Mitchell
343af1f1e0 Rename report_shipping_options to report_shipping_method_options for symmetry with report_payment_method_options 2014-12-19 09:51:07 +11:00
Rohan Mitchell
4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	spec/models/spree/order_spec.rb
 2014-12-19 09:38:02 +11:00
Rohan Mitchell
b0f5d0170c Spec that overridden price with fees appears in quick cart 2014-12-18 13:32:28 +11:00
Rohan Mitchell
ead84aa9ff Add ids to product listing products and variants 2014-12-18 11:00:45 +11:00
Rohan Mitchell
6c300431d2 Move Product#variants_for to Variant.for_distribution scope 2014-12-17 13:42:30 +11:00
Lynne Davis
eeae72352b Renamed methods and vars to better fit naming conventions 2014-12-12 10:11:33 +00:00
Rohan Mitchell
99dce6e8d6 Merge branch 'enterprise-form-confirmation' 2014-12-12 15:29:59 +11:00
Rohan Mitchell
27b0052e2b Merge branch 'product-category-required' 2014-12-12 15:29:31 +11:00