Maikel Linke
359fd1ac98
Improve readability of report spec
2020-05-19 10:38:28 +10:00
Steve Roberts
049b1b4638
Split up the specs again.
...
This now shows that there is one consistent spec erroring, spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb:
Capybara::ElementNotFound:
Unable to find visible checkbox "order_cycle_incoming_exchange_0_select_all_variants" that is not disabled
2020-05-19 10:14:26 +10:00
Eduardo
6d54e6d4a0
change SearchOrders service to search with shipping_method
2020-05-18 20:44:55 -03:00
Eduardo
473b4c63c4
add Shipping Method filter to admin/orders page
2020-05-18 18:46:43 -03:00
Matt-Yorkley
e3c337ef7e
Fix mixed error display issue
2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc
Use fresh scope for each quantity field
2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082
Move reused available stock logic to service
2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799
Update invalid input feedback
2020-05-18 16:14:14 +02:00
Luis Ramos
d1eebe1cfb
Merge pull request #5426 from luisramos0/3-0-stable-may13
...
[Spree 2.1] Merge master into 3-0-stable
2020-05-18 15:05:11 +01:00
Matt-Yorkley
f7b4717f29
Improve validation code
2020-05-18 14:51:11 +02:00
Matt-Yorkley
fe27c8466e
Add feature specs for full cart page stock correction process
2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4
Update cart page links to be disabled when changes are required and form is unsaved
...
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432
Fix tab-buttons element overlapping order cycle selector
2020-05-18 14:27:05 +02:00
Matt-Yorkley
3a46f32aa3
Merge pull request #5435 from openfoodfoundation/transifex
...
Transifex
2020-05-18 13:44:32 +02:00
Luis Ramos
ea8157a5c6
Merge pull request #5304 from dacook/5299-orders-filter-several-tags
...
5299 Impossible to filter orders with several tags
2020-05-18 11:25:54 +01:00
Luis Ramos
37350fcbb0
Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query
2020-05-18 10:55:03 +01:00
Luis Ramos
05136b51d1
Merge pull request #5356 from rmklaus12/4534-mobile-searchkey
...
Changed search input to inputmode to enable 'go' button on dynamic mo…
2020-05-18 10:30:56 +01:00
Robin Klaus
311bbd2aa2
Changed report_header fields for amount and quantity to reflect correct translation to French
2020-05-18 18:41:04 +10:00
Robin Klaus
a0334953db
Added 14 translation keys for PayPalExpress payment method
2020-05-18 17:06:07 +10:00
Transifex-Openfoodnetwork
d2b8b5e888
Updating translations for config/locales/pt_BR.yml
2020-05-18 05:14:19 +10:00
Luis Ramos
6c81c19f00
Remove dead code
2020-05-16 14:19:25 +01:00
Robin Klaus
438c0ecde9
delete extra lines
2020-05-16 20:12:54 +10:00
Robin Klaus
ba8ecf19ac
Added input code to two additional pages to cover shop tab search boxes
2020-05-16 12:56:06 +10:00
dependabot-preview[bot]
f4afc8ffcd
Bump mini_racer from 0.2.11 to 0.2.14
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.11 to 0.2.14.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.11...v0.2.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-15 19:20:08 +00:00
Luis Ramos
ace73be4e2
Add unit tests to order_cart_reset
2020-05-15 20:05:45 +01:00
Luis Ramos
1c749a8029
Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles
2020-05-15 19:36:59 +01:00
Luis Ramos
f22eae752d
Adapt spec to validate issue #5340
2020-05-15 19:30:01 +01:00
Luis Ramos
a438317d69
Extract order_cart_reset service from enterprises_controller
2020-05-15 19:30:00 +01:00
Luis Ramos
35824c7aa1
Rename restartCheckout to order_checkout_restart to make it follow service naming convention
2020-05-15 19:29:37 +01:00
Luis Ramos
ba585064e1
Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders
2020-05-15 19:29:37 +01:00
Luis Ramos
21d1a7bc04
Remove dead code
2020-05-15 19:29:37 +01:00
Luis Ramos
6827ce5c7f
Refactor order.set_order_cycle, return early and remove indentation
2020-05-15 19:29:37 +01:00
Luis Ramos
493adc8b1f
Fix problem in spec where wrong enterprise was being used
2020-05-15 19:29:37 +01:00
Luis Ramos
94bb95861b
If selected OC is not in the available OCs, empty the order
2020-05-15 19:29:35 +01:00
Lucas Hiago
98cbe5762a
Remove unused css property from image in cancel email
2020-05-15 10:59:56 -03:00
Lucas Hiago
0caa91d057
Remove second table of cancel email instructions style
2020-05-15 10:59:56 -03:00
Lucas Hiago
5d286cb349
Add i18n of new symbols for order cancel mail
2020-05-15 10:59:56 -03:00
Lucas Hiago
f72da4abe4
Add refund message in order cancel mail
2020-05-15 10:59:56 -03:00
Lucas Hiago
42012d6482
Add new order sumary in order cancel mail
2020-05-15 10:59:55 -03:00
Lucas Hiago
1c1200125e
Add new greeting table in order cancel mail
2020-05-15 10:59:55 -03:00
Lucas Hiago
0b8771ccf0
Add connect with us footer to order cancelation email
2020-05-15 10:59:55 -03:00
Luis Ramos
52e7ca2417
Select first default OC only if no OC is already selected
2020-05-15 14:26:56 +01:00
Luis Ramos
c3f0c0ed7f
Extract method to prepare work ahead
2020-05-15 14:25:20 +01:00
Transifex-Openfoodnetwork
4f14d7910a
Updating translations for config/locales/en_IE.yml
2020-05-15 23:04:12 +10:00
Pau Pérez Fabregat
5c7541e63d
Merge pull request #5415 from openfoodfoundation/dependabot/bundler/bugsnag-6.13.1
...
Bump bugsnag from 6.13.0 to 6.13.1
2020-05-15 13:47:46 +02:00
Matt-Yorkley
c2efa901c2
Don't highlight update button when form is invalid
2020-05-15 13:38:17 +02:00
Luis Ramos
4292636e70
Remove close button in product modal
2020-05-15 12:16:19 +01:00
Luis Ramos
d95b2a97b0
Add missing padding above close button (both for the case with image or just with text) and also below product image
2020-05-15 12:12:07 +01:00
Luis Ramos
edaf419857
Use rem instead of px or em
2020-05-15 12:12:07 +01:00
Luis Ramos
38bc076c77
Fix some rubocop issues
2020-05-15 12:12:07 +01:00
