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
Rohan Mitchell
d177f3ff73
Variant overrides table styling
2014-12-12 13:33:14 +11:00
Rohan Mitchell
531b35bbc6
WIP: Extract variant overrides to own controller - route, controller, views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
9ee44e9aef
WIP: Extract variant overrides to own controller - move views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
a6f116aa09
WIP: Rename override_variants to variant_overrides - JS
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d02511bf1d
WIP: Rename override_variants to variant_overrides - file and dir name changes
2014-12-12 13:33:13 +11:00
Rohan Mitchell
51d2805de9
WIP: Rename override_variants to variant_overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0a984b9041
Remove duplicate status message on BPE
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1fc4dec43
Updating variant overrides stores dirty values
2014-12-12 13:33:13 +11:00
Rohan Mitchell
7255520471
Display success message on save variant overrides (stub)
2014-12-12 13:33:13 +11:00
Rohan Mitchell
9d4b8ae949
Rename div update-status-message to status-message
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0938debafc
Extract status message markup into partial
2014-12-12 13:33:13 +11:00
Rohan Mitchell
bcc3815f6b
Extract status message to a service
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d3e639aa03
Index variant overrides by hub_id x variant_id
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5df4f1b7fe
Convert text to form fields
2014-12-12 13:33:12 +11:00
Rohan Mitchell
3aedbb6c48
Display variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
47b479c6c9
Show variants in override variants interface, not just products
2014-12-12 13:33:12 +11:00
Rohan Mitchell
efae9265c1
Inject variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
a3a3832c8d
Only show products that the chosen hub can add to an order cycle
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7
Inject hub permissions - which producers each hub can add to order cycle
2014-12-12 13:33:12 +11:00
Rob Harrington
6a226e4f92
Fixing typos and changing delivery address display in order confirmation email
2014-12-12 12:00:15 +11:00
Rob Harrington
b9011d9abe
Remove obsolete spree checkout views
2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346
Revert "Removing obsolete checkout views"
...
This reverts commit d0e013c1a5
2014-12-11 16:09:17 +11:00
Rob Harrington
d0e013c1a5
Removing obsolete checkout views
2014-12-11 14:50:29 +11:00
Maikel Linke
440044372b
Leave-page-warning only after changing inputs
...
The enterprise form is now set 'dirty' whenever an input changes. The
navigation callback confirms to leave the page only if the form is
dirty.
2014-12-11 14:27:08 +11:00
Maikel Linke
76739a4746
Unify nav-check and nav-callback attributes in nav-check-callback
...
The value of nav-check was not used and nav-callback was only important
if nav-check was given. So we need only one attribute, now named
nav-check-callback.
2014-12-11 12:14:51 +11:00
