Matt-Yorkley
3bfa903912
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
2020-11-27 14:11:57 +01:00
Andy Brett
85d99f3bf2
Merge branch 'master' into controllers
2020-11-20 08:12:03 -08:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Pau Pérez Fabregat
692adb0113
Merge pull request #6336 from coopdevs/fix-shop-layout
...
Fix .top-bar-section not to wrap the icons-menu
2020-11-11 17:29:53 +01:00
Andy Brett
d5037abbe7
add specs for new/edit product pages
2020-11-10 10:49:14 -08:00
Pau Perez
17abb3e345
Fix feature specs
...
The underlying markup and CSS changed but the tests did not.
2020-11-09 15:43:54 +01:00
Matt-Yorkley
d9e2a80a4f
Improve flaky order cycle spec
...
There are various points in this spec where content is dynamically added to the DOM, but Capybara is jumping ahead to start interacting with it before it as actually finished loading.
2020-11-09 11:26:12 +00:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Luis Ramos
5c4ea1a6be
Fix tax rates spec
2020-11-04 12:15:45 +00:00
Luis Ramos
72c454a211
Fix reference to Spree bug
2020-11-04 12:15:45 +00:00
Luis Ramos
4125fe1690
Fix problem with string matchers
2020-11-04 12:15:45 +00:00
Pau Pérez Fabregat
4911bb6613
Merge pull request #6274 from luisramos0/rubocop
...
Use rubocop auto correct to fix a number of issues
2020-11-02 22:13:36 +01:00
Luis Ramos
c9972189d0
Change usage of Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:56:59 +00:00
Luis Ramos
eea73aa989
Merge pull request #5919 from luisramos0/injector_refactor_for_rails41
...
[Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1
2020-10-31 09:33:27 +00:00
Luis Ramos
eb4e732c1a
Fix rubocop issue Layout/EmptyLines
2020-10-30 16:50:37 +00:00
Luis Ramos
1d1067ebc1
Add coverage to T&Cs file opening on a new tab and also for the upload timestamp now displayed in the page
2020-10-30 15:09:13 +00:00
Luis Ramos
dd31cbe014
Cover case where enterprise uploads new T&Cs file and customer has already accepted before
2020-10-30 15:09:13 +00:00
Luis Ramos
46733d0c0d
Add feature spec to cover T&Cs ticked by default if customer has already accepted them
2020-10-30 15:09:13 +00:00
Luis Ramos
3c9c5862d1
Verify terms and conditions updated_at timestamp is touched every time the file name changes.
...
We will need this to check if user already accepted the terms and
conditions of this enterprise.
2020-10-30 15:08:26 +00:00
Luis Ramos
78a8f53d8d
Change default translations to what's been requested on the issue
2020-10-30 15:08:26 +00:00
Luis Ramos
85096a997f
Add a checkbox to checkout to tick for Terms and Conditions
...
Checkout button should be disabled if checkbox is not ticked
2020-10-30 15:08:26 +00:00
Luis Ramos
9a9b455e66
Fix problem in default_tax related to sum in active record
2020-10-30 10:12:56 +00:00
Luis Ramos
412457bb19
Merge pull request #6122 from luisramos0/customer_total
...
Add Customer balance to customer list
2020-10-29 22:06:05 +00:00
Luis Ramos
0138f04506
Add spec to cover new customer balances on customers list
2020-10-29 13:38:36 +00:00
Jason Hsu
8f95de10bc
Removed variant argument from click_add_bulk_max_to_cart; updated spec/features/consumer/shopping/shopping_spec.rb to reflect this
2020-10-29 00:35:49 -05:00
Matt-Yorkley
ee402db734
Refactor and DRY tag-rule-filling-in to #fill_in_tag method
2020-10-25 09:01:04 +00:00
Matt-Yorkley
f22c7fcdfb
Merge pull request #6151 from luisramos0/stripe_save_cards
...
Stripe Feature Tests: checkout with saved a card
2020-10-24 23:29:29 +02:00
Matt-Yorkley
5edd562691
Merge pull request #6238 from openfoodfoundation/mobile-5-product-listings
...
Merge Product Listings to master
2020-10-22 21:55:42 +02:00
Matt-Yorkley
489529d30e
Merge pull request #5729 from luisramos0/image_settings
...
Remove Image settings page and standardise Paperclip styles
2020-10-22 15:58:14 +02:00
Maikel Linke
81cc951ed4
Name symbols on quantity buttons in specs
2020-10-22 15:46:46 +11:00
Maikel Linke
01c4882759
Replace bulk buy inputs with add-remove-buttons
2020-10-22 15:46:46 +11:00
Maikel Linke
59c13b97ea
Replace quantity input with add-remove buttons
...
The new mobile friendly design contains a nice "Add" button to add
variants to your cart. Once you have the variant in you cart, it's
replaced by plus and minus buttons to adjust the quantity.
Other languages have longer words than "Add" which need to fit on the
button. Since the add button and the +/- buttons should have the same
width, I widened them a little bit so that they fit the longest words
Aggiungi and Добавить.
2020-10-22 15:46:46 +11:00
Maikel Linke
893b6660fc
Change price-breakdown colour to grey
2020-10-22 15:46:44 +11:00
Maikel Linke
3e789fdb84
Show only tabular price breakdown, no graph
2020-10-22 15:46:44 +11:00
Matt-Yorkley
f5ce0d501d
Merge pull request #5870 from luisramos0/prefs
...
[Bye bye Spree] Bring models app_configuration and preference from spree_core
2020-10-20 21:12:54 +02:00
Luis Ramos
b267f542d1
Merge pull request #5980 from luisramos0/spree_clean_up
...
[Bye bye spree] Some clean up fixes to make it all work without spree
2020-10-20 18:52:54 +01:00
Luis Ramos
0f06195baa
Remove Image settings page, these settings will come from ofn-install now
2020-10-20 11:20:37 +01:00
Luis Ramos
2711139420
Re-use existing stripe stub
2020-10-16 12:37:44 +01:00
Luis Ramos
cf319d3f05
Extract customers stripe stub to StripeStubs helper
2020-10-16 12:37:44 +01:00
Luis Ramos
f5f9a733fb
Fix rubocop issue, long module, by extracting StripeStubs to a separate helper module
2020-10-16 12:37:42 +01:00
Luis Ramos
487aaf4862
Extract stub to StripeHelper
2020-10-16 11:12:44 +01:00
Luis Ramos
f13ebf8f21
DRY StripeHelper
2020-10-16 11:09:52 +01:00
Luis Ramos
7e80ddf1e5
Add step to checkout with the previously saved card
2020-10-16 10:24:49 +01:00
Luis Ramos
7efc52075e
First attempt at adding a spec to checkout and save a credit card
2020-10-16 09:26:19 +01:00
Maikel
8c65498661
Merge pull request #5998 from andrewpbrett/shipping-per-pound
...
Per-pound shipping calculator
2020-10-16 15:27:57 +11:00
Matt-Yorkley
7de98e74b8
Use #setup_stripe helper in tests to ensure Stripe keys are present
2020-10-15 17:09:24 +01:00
Luis Ramos
6046b0f6e4
Fix typo
2020-10-15 14:54:42 +01:00
Luis Ramos
62a54e5f17
Add spec to cover stripe SCA refunds in the backoffice
2020-10-15 14:54:42 +01:00
Luis Ramos
bce81d27dd
Move spec to end of file so we can extend this case with refunds and cancelations
2020-10-15 14:54:42 +01:00
Luis Ramos
a6ed003cb9
Extract redirect stub to stripe_helper
2020-10-15 14:54:42 +01:00
