Rohan Mitchell
5cf3579b26
Extract variant overrides to service
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
8baed4429c
Indexer accepts arbitrary key to index by. Fix bug: Return an object instead of an array.
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
42481e9691
Provide hub permissions to specs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
efae9265c1
Inject variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
ff28da345d
Find variant overrides for some hubs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
91b386003a
Add VariantOverrideSerializer
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
500b5ce347
Enterprise managers can access override variants
2014-12-12 13:33:12 +11:00
Rohan Mitchell
b1ba519a73
When finding per hub order cycle enterprises, also return managed producers
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
3a9c4e0826
Adding a price without fees column to the order cycle customer report
2014-12-12 12:00:15 +11:00
Rob Harrington
6a226e4f92
Fixing typos and changing delivery address display in order confirmation email
2014-12-12 12:00:15 +11:00
Rohan Mitchell
086f69ccfb
Default payment method server/test_mode to live
2014-12-12 11:35:18 +11:00
Rohan Mitchell
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Lynne Davis
079781576b
Adding new specs and a couple updates the lib/report
2014-12-11 12:47:56 +00: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
dfb9e5bde5
Order reports now present the price of line items with adjustments included
2014-12-11 15:48:29 +11:00
Rohan Mitchell
eab2e5de2a
Use scope
2014-12-11 15:00:44 +11:00
Rob Harrington
3be437485a
Redirecting any spree checkout_state redirects to our checkout controller
2014-12-11 14:53:11 +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
Maikel Linke
11f1261dd3
Navigation Callbacks for WebKit
2014-12-11 12:07:48 +11:00
Maikel Linke
27896534f0
Navigation Callbacks (confirmation to leave) refs
...
A navigation callback could give only a fixed value at load time. Now it
can act depending on the site's state just before the page is unloaded.
2014-12-11 12:05:59 +11:00
Rob Harrington
2f83d71931
Adding mail/all.css to assets precompile list
2014-12-10 09:56:33 +11:00
Lynne Davis
f878e18037
Update that works better with the specs
2014-12-08 16:25:18 +00:00
Maikel Linke
3cc79d0036
Filter deleted products in products report
...
BugHerd 484: Remove deleted products from Product / Inventory reports
2014-12-05 15:52:10 +11:00
Maikel Linke
7b41d4c5d4
Denoting the product category as required
...
Using common style: span.required *
2014-12-05 14:56:32 +11:00
Rohan Mitchell
ec08ab4cc9
Merge pull request #307 from openfoodfoundation/replace-fixtures
...
Replacing fixtures with minimal seeding
2014-12-04 16:31:30 +11:00
Maikel Linke
5c191bcc7f
Moving test seeding into spec/support/seeds.rb
2014-12-04 15:38:59 +11:00
Rohan Mitchell
19667f31fa
Add missing translation for welcome_to
2014-12-03 15:19:25 +11:00
Rohan Mitchell
95f8334370
Reinstate style
2014-12-03 12:28:22 +11:00
Rohan Mitchell
50e26ed96f
Remove old required partial
2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a
Merge branch 'master' into enterprise-form-required-fields
...
Conflicts:
app/views/admin/enterprises/_form.html.haml
app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
bd7253bdda
Merge branch 'using-simple-order-cycle'
2014-12-03 12:08:25 +11:00
Rohan Mitchell
fbef139fc5
Merge branch 'master' into using-simple-order-cycle
2014-12-03 11:57:59 +11:00
Lynne Davis
633a8a49e2
updating spec based on the wise advice of Rohan
2014-12-03 00:35:53 +00:00
Rohan Mitchell
3358fb3d73
Name based on meaning instead of context
2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8
Localize more strings on home page.
2014-12-03 09:39:36 +11:00
Paul Mackay
73ece4075c
Add rails-i18n gem.
2014-12-03 09:39:35 +11:00
Lynne Davis
a5ae1c490c
Fixing typo in report found through testing
2014-12-02 17:48:04 +00:00
Lynne Davis
c2c51a5531
Fixing typo in feature spec
2014-12-02 12:24:34 +00:00
Maikel Linke
8e280919ac
Using simple_order_cycle in clone spec
...
Creating a coordinator fee and two exchanges in the spec instead of
using a full order_cycle. Timing of this single test:
Before: 15.32 seconds
After: 6.26 seconds
2014-11-28 15:36:34 +11:00
Maikel Linke
e240933b29
Using simple_order_cycle in spec
...
Before: 4 minutes 6.9 seconds
After: 3 minutes 27.4 seconds
2014-11-28 14:45:35 +11:00
Maikel Linke
349b7de11a
Using simple_order_cycle
...
Before: 2 minutes 58.3 seconds
After: 35.04 seconds
2014-11-28 14:02:55 +11:00
Maikel Linke
73b8f37d77
Using simple_order_cycle
...
Before: 2 minutes 8.7 seconds
After: 16.11 seconds
2014-11-28 13:55:06 +11:00