Commit Graph

15608 Commits

Author SHA1 Message Date
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
88d49148d4 Adding border to text-angular form element 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
bc32a053f7 Adding global styling class for aligning text to the right 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
468e83cef7 Adding global centering css class 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
b944030994 Add some logic for small screen layout 2014-12-19 13:11:35 +11:00
summerscope
e9cb7f9565 Styling for clear filters row 2014-12-19 13:02:17 +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
515348a8fb Change the filtersActive variable for this page only 2014-12-19 12:52:57 +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
72118f4e2e Fix syntax error, spec for removed column 2014-12-19 10:01:46 +11:00
Rohan Mitchell
e9f04c3c15 Clean up whitespace 2014-12-19 10:01:21 +11:00
Rohan Mitchell
6e0576235d Use create\! instead of build - more concise, raises exception on error 2014-12-19 09:51:32 +11:00
Rohan Mitchell
27d646c0e8 Tweak indentation, remove some blank lines 2014-12-19 09:51:32 +11:00
Rohan Mitchell
0151ecbb32 Add additional rows to payment method selection 2014-12-19 09:51:32 +11:00
Rohan Mitchell
d548515684 Remove unused header column 2014-12-19 09:51:13 +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
3b58d99abc Fix spec failure 2014-12-19 09:51:02 +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
c4b45bdbbf Fix line items returning prices with fractional cents 2014-12-18 16:24:59 +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
5fcb2982fa Fees are calculated correctly for items with variant overrides 2014-12-18 11:53:17 +11:00
Rohan Mitchell
ead84aa9ff Add ids to product listing products and variants 2014-12-18 11:00:45 +11:00
Rohan Mitchell
1d3800696e Variant overrides can override stock levels 2014-12-18 10:46:47 +11:00
Rohan Mitchell
f5ee9ba2f3 VariantOverride looks up count_on_hand 2014-12-18 10:21:07 +11:00
Rohan Mitchell
e6eecd3ae2 Replace proxies with modules 2014-12-18 10:20:31 +11:00
Rohan Mitchell
0832a8f63d Viewing products shows overridden prices 2014-12-17 16:00:25 +11:00
Rohan Mitchell
23c7715929 Cosmetic change 2014-12-17 14:03:54 +11:00
Rohan Mitchell
2ea7bdbec6 Move controller spec to serializer spec 2014-12-17 14:01:59 +11:00
Rohan Mitchell
6c300431d2 Move Product#variants_for to Variant.for_distribution scope 2014-12-17 13:42:30 +11:00
Rohan Mitchell
91c500417b Swap param order 2014-12-17 08:55:27 +11:00
Lynne Davis
7e49bd634e Updated the specs with Rohans suggestions 2014-12-12 18:23:43 +00:00
Lynne Davis
eeae72352b Renamed methods and vars to better fit naming conventions 2014-12-12 10:11:33 +00:00
Rob Harrington
66669e66ab Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts 2014-12-12 15:43:05 +11:00