Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
cb0aefd29c
Make display on attribute available for managers to change, not just super admins
2020-05-25 11:21:53 +01:00
Luis Ramos
b1714d73ef
Capitalize 'Method' in the flash message to make specs pass
2020-02-27 18:01:24 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
cyrillefr
e6d9ec7bd7
Small fixes for default single Hub/Shop options issue
...
- removed mode variable
- reverted html template accordingly
- added a more specific helper
- fixed some short variable names
2019-12-19 21:08:34 +01:00
cyrillefr
e59077e63e
Select by default single Hub/Shop option on creation of payment/shipping method
...
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
2019-12-18 10:45:00 +01:00
Dan Ingenthron
560fa6b949
Update shipping category factory with default
2019-10-08 18:37:16 -05:00
Dan Ingenthron
b082d3301b
Add prechecked category to shipping method spec
2019-10-08 18:37:16 -05:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Maikel Linke
ef882b8293
Wait for entered tag before submitting
...
The changed spec was failing from time to time. This change seems to
make it stable. It may be worth moving tag entering into a helper that
verifies that the tag was entered (waits for it).
2019-03-27 10:58:00 +11:00
luisramos0
61f1bf5ec8
Fix shipping_methods edit page missing translation
2019-03-07 17:15:06 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Matt-Yorkley
6e77afbf35
Adjust expectations in flaky spec
2019-02-25 11:08:10 +00:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
Kristina Lim
0032a237a2
Wait for button to disappear before checking flash
2019-02-10 22:08:18 +08:00
Kristina Lim
175264f41f
Use flash matcher in shipping method feature specs
2019-02-10 22:08:18 +08:00
luisramos0
0460e7fc6c
Merge branch 'master' into 2-0-stable-jan-17th
2019-01-17 22:51:25 +00:00
Matt-Yorkley
07dff0af7f
Check tag js has finished executing before submitting form
2019-01-16 17:46:56 +00:00
Luis Ramos
a9b390d0aa
Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs
...
[Spree Upgrade] Fix feature specs for shipping_methods
2018-10-22 23:12:20 +01:00
Hugo Daniel
0dd1b1a976
Fix feature specs for shipping_methods
2018-09-24 12:40:59 +02:00
luisramos0
c66b611b99
Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec
2018-09-17 00:51:01 +01:00
Kristina Lim
0b4fcf8a14
Change enterprise "Manage" button to "Settings"
2018-08-10 12:17:30 +10:00
Maikel Linke
b628ead525
Speed up shipping methods spec
2018-08-07 16:01:38 +10:00
Rob Harrington
d28c0159ab
Use have_selector x, count: y; instead of all(x).count.should == y
2016-06-17 16:44:02 +10:00
Rob Harrington
f9acee2be4
Shipping methods can be tagged
2016-04-01 19:48:25 +11:00
Rob Harrington
eed27ceb31
Shipping Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:50 +08:00
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +10:00
Rob H
0d7c682b85
Remove shipping category from admin edit shipping methods
2014-06-19 18:31:52 +10:00
Rob H
004548a4fe
Rearrange shipping method edit page
2014-06-18 10:21:21 +10:00
Rob H
8412d740ff
Move distributors into sidebar for new & edit shipping methods screen
2014-06-12 16:10:30 +10:00
Will Marshall
66866f09b5
Adding the require ship address flag to admin UI:
2014-03-05 11:12:23 +11:00
Rohan Mitchell
c08c42b087
Fix inconsistent test fails - insignificant ordering
2014-01-08 15:11:46 +11:00
Rohan Mitchell
48f18a93de
Order shipping methods by name, not distributor
2013-11-07 16:25:43 +11:00
Rohan Mitchell
0755b515d1
Only show shipping methods that enterprise user has access to
2013-11-07 16:25:43 +11:00
Rohan Mitchell
91f14dcd4c
Enterprise manager can create/edit enterprise fees
2013-10-18 13:56:22 +11:00
Rohan Mitchell
3b5e6f5742
When viewing shipping methods, only show those for the distributor I select
2013-10-18 10:01:11 +11:00
Rohan Mitchell
c07c52085a
Enterprise user can view and create shipping methods
2013-10-18 09:35:53 +11:00
Rohan Mitchell
358ca25f31
Admin can assign multiple distributors to a shipping method
2013-10-17 11:16:26 +11:00
Rohan Mitchell
911d8b8bbc
Shipping method has a distributor, admin can create and edit
2013-08-30 11:43:45 +10:00
Rohan Mitchell
314e464c3f
Add failing spec for admin creatin a shipping method owned by a distributor
2013-08-27 10:53:59 +10:00
Rohan Mitchell
d7cce918f5
Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees
2013-08-12 14:22:11 +10:00
Rohan Mitchell
ec3e00c128
Refactor LineItem and clients for new fields
2013-08-06 13:47:17 +10:00
Andrew Spinks
8e560a59c9
Fix selection of itemwise shipping method that broke after the spree upgrade.
2013-07-23 15:46:07 +10:00
Rob H
68246e08d2
Fix stack overflow error in admin shipping method test
2013-02-15 10:34:17 +11:00
Rohan Mitchell
488fc2d60e
Upgrade capybara, spec/requests changed to spec/features
2013-01-15 10:10:24 +11:00
