Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Maikel Linke
c1647ccd2c
Set public enterprise.email_address at registration
...
Sets the public email address to the given email address as well as the
internal enterprise.email (notification email address).
The field is not mandatory any more since enterprise.email is populated
from the owner's email address if no value was given.
2016-03-04 17:50:04 +11:00
Steve Pettitt
dcb07237d8
Spec worked, links didn't :)
2016-01-31 11:00:07 +00:00
Steve Pettitt
4438cbd5d0
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-30 19:53:53 +00:00
Steve Pettitt
ec6b0f873e
style credit/debit, spec updates
2016-01-30 19:53:37 +00:00
Steve Pettitt
ccd66bba9c
Credit/debit formatting, use filters for money formatting, use full page width for table
2016-01-28 22:42:45 +00:00
Maikel
3dd3cfa7ec
Auto-merged master into uk/account-balances on deployment.
2016-01-25 04:43:25 +11:00
Steve Pettitt
c9a8d7efa5
Message for users with no orders
2016-01-22 19:49:03 +00:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Steve Pettitt
a3f7ff19b0
Add new VO fields to shopping spec
2016-01-15 09:07:50 +11:00
Steve Pettitt
667d1c5428
More reliable spec
2016-01-10 16:16:30 +00:00
Rohan Mitchell
037c524df2
Preserve max quantity when reloading shopfront
2016-01-07 16:35:54 +11:00
stveep
59adf88cad
Feature spec
2015-12-22 22:59:07 +00:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Rohan Mitchell
178e5f59e6
Update cart by applying differences rather than clear-and-readd every time
2015-11-13 14:03:07 +11:00
Maikel Linke
d62775a785
update specs and fix labels yes and no
2015-10-07 18:05:59 +11:00
Maikel Linke
8b40d094ee
new translate filter and updated specs for js translations
2015-10-07 15:47:51 +11:00
Maikel Linke
91fae79be4
Update tests for new label "Login"
2015-10-07 14:06:34 +11:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
d9b1215a01
Update clicking checkout in spec
2015-09-04 10:54:50 +10:00
Maikel Linke
415dac3ae3
Updating spec for new Login label
2015-08-28 21:12:56 +10:00
Rohan Mitchell
3eea002a0c
Put rspec-retry on flaky specs
2015-08-07 11:06:16 +10:00
Rohan Mitchell
faa1d0d1c5
When cart clear is declined, revert order cycle selection change
2015-07-31 16:56:08 +10:00
Rohan Mitchell
09b4b3e659
When order cycle is changed, clear the cart
2015-07-31 16:56:08 +10:00
Rohan Mitchell
7caebb11e2
Clear variants registry before reloading products - fixes fees not updating when changing order cycle
2015-07-31 16:56:08 +10:00
Continuous Integration
858a613ba2
Auto-merge from CI [skip ci]
2015-07-17 11:48:16 +10:00
Rohan Mitchell
2ef0196200
Merge branch 'add-to-cart-robustness' into combined/vo-on-demand-stock-control_add-to-cart-robustness
2015-07-16 10:06:34 +10:00
Rohan Mitchell
f3ae812f2b
Update cart when max_quantity value changes, not just quantity
2015-07-16 10:05:19 +10:00
Rohan Mitchell
de7f3a9e5c
When an on-demand variant has overridden stock levels, make it not on-demand
2015-07-16 10:05:07 +10:00
Rohan Mitchell
e679f1175c
Add shop-for-products-at to map producer modals
2015-07-10 15:51:57 +10:00
Rohan Mitchell
4f2389e257
Remove legacy enterprises views - index, suppliers, distributors, show
2015-07-10 09:42:09 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rob Harrington
d0b7550629
Removing screenshot from spec
2015-06-12 01:49:39 +08:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Maikel Linke
4b6222bbe2
Updating spec using new button label
2015-06-03 12:08:47 +10:00
Rohan Mitchell
6f513fee77
Merge branch 'master' into redesign
2015-05-29 15:20:21 +10:00
Rohan Mitchell
835b56b222
Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb
2015-05-29 09:44:57 +10:00
Rohan Mitchell
5e5628d0c3
Fix shops path for spec
2015-05-13 14:31:40 +10:00
Rohan Mitchell
0ac7dbf23b
Update spec references to removed file logo.jpg
2015-05-13 14:27:43 +10:00
Rohan Mitchell
14fdc7d3ae
Move home spec to shops spec
2015-05-13 14:27:18 +10:00
Rohan Mitchell
1531c476e3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
2015-05-08 13:45:31 +10:00
Rohan Mitchell
9d225142c8
Send password reset instructions asynchronously
2015-04-21 16:10:40 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rohan Mitchell
042e076b58
Fix tax-related spec failures
2015-04-17 14:46:32 +10:00
Rohan Mitchell
0b8a619274
When the order does not have a hub, all tax rates apply
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241
User can set whether an enterprise charges sales tax when registering
2015-04-17 13:41:38 +10:00
