Maikel Linke
af314cbbdf
Allow fast checkout without re-accepting old terms
...
We did that for the shop's terms already and now do it for the platform
terms as well.
2021-06-09 14:06:54 +10:00
Maikel Linke
51ad8f8065
Remove old UI to edit Terms of service
...
It's now completely replaced by file uploads on a separate page.
2021-06-09 14:06:54 +10:00
Maikel Linke
960b829ece
Link to last uploaded Terms of service
2021-06-09 14:06:54 +10:00
Maikel Linke
23999c96bf
Unify all links to platform Terms of service
...
DRY code and have more consistency. We always use "Terms of service" now
and not "Terms of Service" or "Terms and conditions". The latter is used
for the shop's terms, not the platform terms.
2021-06-09 14:06:54 +10:00
Maikel Linke
3b3ba70670
Safeguard deletion of ToS with alert
2021-06-09 14:06:54 +10:00
Maikel Linke
690118c2bd
Add delete method to terms of service files
2021-06-09 14:06:54 +10:00
Maikel Linke
3bee9cb951
Add Rails action #new to ToS
2021-06-09 14:06:54 +10:00
Maikel Linke
abe76ccf0f
Add upload of Terms of Service files
...
Admins can upload files and view the most recent (current) one.
2021-06-09 14:06:54 +10:00
Maikel Linke
007b8cd888
Add new admin page for TOS files
...
Just the basic Rails setup without any functionality yet.
2021-06-09 14:06:53 +10:00
Maikel Linke
1f63bb15eb
Remove executable bit from spec
2021-06-09 14:06:53 +10:00
Maikel Linke
9027f8b604
Add attachment to TOS record
2021-06-09 14:06:53 +10:00
Maikel Linke
c4317c5707
Add model TermsOfServiceFile
...
We want to enable instance managers to upload TOS files.
I also added the rails_helper which is a new convention. It can contain
more Rails specific configuration we currently have in the spec_helper.
2021-06-09 14:06:09 +10:00
Andy Brett
b6f6407c31
Merge pull request #7660 from jibees/7499-remove-feature-toggle-for-unit-price
...
Remove feature toggle around unit_price
2021-06-08 10:39:32 -07:00
Andy Brett
fe62a0a2a7
Merge pull request #7697 from jibees/7689-trigger-a-change-when-hour/minute-inputs-are-modified
...
Datetimepicker for order cycles: add keyup event listener on hour/minute inputs
2021-06-08 10:32:07 -07:00
Andy Brett
ba6ebdee15
Merge pull request #7686 from shen-sat/7470-add-delete-action-test-to-shipping-categories-controller-spec
...
[7470] Add delete action test to ShippingCategoriesController spec
2021-06-08 10:31:26 -07:00
Andy Brett
ede966f2d1
Merge pull request #7640 from apricot12/closed_OC_bheaviour
...
Checkout made to redirect to shop front when OC closed
2021-06-08 10:30:13 -07:00
Jean-Baptiste Bellet
e3f56556cf
Remove feature toggle around unit_price and enable it
2021-06-07 20:53:45 +02:00
Matt-Yorkley
8e0a84a502
Merge pull request #7729 from Matt-Yorkley/delayed-cleanup
...
Delayed::Cleanup
2021-06-07 19:11:37 +02:00
Matt-Yorkley
099ef5d358
Add more explicit tests on updating shipping fees in Api::ShipmentsController
2021-06-04 18:19:27 +01:00
Matt-Yorkley
efcf71fd2b
Use OrderContents in cart spec test setups
2021-06-04 17:26:49 +01:00
Matt-Yorkley
acf7c0c4d8
Use :order_with_totals factory in CustomersController spec
2021-06-04 17:10:50 +01:00
Matt-Yorkley
443b180f32
Update order totals in :order_with_totals factory
2021-06-04 17:10:50 +01:00
Matt-Yorkley
2d76c2730a
Update shipment updating
2021-06-04 17:10:50 +01:00
Matt-Yorkley
6b364dc420
Update specs on shipping fee changes and mark as pending
...
The shipping fee and it's tax actually don't get updated correctly here (in master).
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d5b20d5446
Add specs for Order#ensure_updated_shipments
2021-06-04 17:10:50 +01:00
Matt-Yorkley
05c001807e
Add variant override specs for Stock::AvailabilityValidator
2021-06-04 17:10:50 +01:00
Matt-Yorkley
011da05712
Add more test coverage to OrderContents
2021-06-04 17:10:50 +01:00
Matt-Yorkley
dc6be6f06b
Don't resubmit the whole cart contents for no reason.
...
There's a couple of places where this was causing a cart update submission where it wasn't needed, eg the items had not actually changed. The conditional here was designed to stop that from happening, but it was actually passing every time (the conditional logic was not actually catching the case it was supposed to).
This is really expensive!
2021-06-04 17:10:50 +01:00
Matt-Yorkley
47e2976fd1
Update CartService specs
2021-06-04 17:10:50 +01:00
Matt-Yorkley
0cfe7fdc45
Move required logic into OrderContents and improve spec
2021-06-04 17:10:50 +01:00
Matt-Yorkley
42ff2307fa
Update specs that use removed #add_variant and #remove_variant methods in test setup
2021-06-04 17:10:50 +01:00
Matt-Yorkley
b25e7fcb89
Delete tests for removed Order #add_variant and #remove_variant methods
2021-06-04 17:10:50 +01:00
Matt-Yorkley
79aebed40e
Bring OrderContents#update_cart tests from upstream and tidy up
2021-06-04 17:10:50 +01:00
Matt-Yorkley
398d4b2612
Tidy up public interface of CartService
...
We don't need this extra hash to be passed around
2021-06-04 17:10:50 +01:00
Matt-Yorkley
6e8fd3c3f8
Simplify CartService interface
...
There's only one place this method is called, and the "overwrite" argument is always explicitly true. It doesn't need to be there if it's mandatory.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d5edf03042
Update reports_spec test setup
2021-06-04 17:10:50 +01:00
Matt-Yorkley
305ac037fe
Use OrderContents in customers controller spec
2021-06-04 17:10:50 +01:00
Matt-Yorkley
23910dbab4
Use OrderContents in BulkLineItemsController
...
We should move towards *all* operations on an order's line items being done exclusively through this service.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
03fc63ad14
Remove #order_update! from line item after_save callback
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d99e598e7a
Delete dead code in CartController
...
The two conditionals in #populate_variant_attributes here are never actually true, so the subsequent code paths are never reached.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d5d76d9b9a
Move private controller methods to private
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d66b6f7192
Fix InvoicesController spec and change from pending to active
2021-06-03 12:51:15 +01:00
Shen
80ae211b72
Use correct syntax for change matcher in spec/controllers/spree/admin/shipping_categories_controller_spec.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2021-06-02 13:17:49 +01:00
Shen Sat
99a4be134b
Add delete action test to ShippingCategoriesController spec
2021-06-02 13:17:49 +01:00
Andy Brett
77c384633b
specify payment intent ID in stripe stub
2021-06-01 22:34:04 +01:00
Andy Brett
b3e08b47b9
set Stripe api key directly instead of using allow
2021-06-01 22:33:12 +01:00
Luis Ramos
85508f45b4
Replace be_success on test_reponse with status 200
...
In rails 6 response.success? is not supported.
2021-06-01 22:33:12 +01:00
Luis Ramos
f07cc32be0
Remove authorization token from stripe stubs
2021-06-01 22:33:12 +01:00
Matt-Yorkley
30e2be13f0
Update spec/lib/open_food_network/i18n_config_spec.rb
2021-06-01 18:50:04 +01:00
Luis Ramos
dc1cdf4254
Add required DB cleaner setup code
2021-06-01 18:50:04 +01:00