Matt-Yorkley
ec84564f28
Add test coverage for TaxHelper
2021-07-27 22:09:14 +01:00
Andy Brett
7d399b4c6d
Remove duplicative line item for taxes
2021-07-12 09:16:28 -07:00
Andy Brett
e9a00eb0d4
Merge pull request #7310 from cillian/resumed-order-actions-menu
...
Make sure the Resend Confirmation and Send/Print Invoice links display for resumed orders
2021-06-30 10:43:07 -07:00
Luis Ramos
e52937c113
Use rubocop auto correct to add frozen string literal to all files
...
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Andy Brett
b3e08b47b9
set Stripe api key directly instead of using allow
2021-06-01 22:33:12 +01:00
Luis Ramos
b2e97fe1d2
Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
2021-05-19 09:54:22 -07:00
Matt-Yorkley
d29c0cdcb7
Don't show line item adjustments in Admin::OrdersHelper#order_adjustments_for_display
...
Line item adjustments are displayed separately, if we don't filter them here they get displayed twice.
2021-04-15 14:23:37 +01:00
Matt-Yorkley
15edb5b13b
Remove more uses of adjustment source association in tests
2021-04-14 12:01:21 +01:00
Pau Pérez Fabregat
953454e2fb
Merge pull request #7343 from luisramos0/dead_code_2
...
[Rails 5.2] Remove dead code
2021-04-08 09:48:25 +02:00
Luis Ramos
026c0640c4
Remove dead code
2021-04-07 23:31:43 +01:00
Luis Ramos
c33cf67ec7
Fix base helper spec in rails 52
2021-04-07 23:25:14 +01:00
Cillian O'Ruanaidh
7e2d9ff381
The Resend Confirmation and Send/Print Invoice links should display for resumed orders too
...
These are links inside the Actions drop down menu on the edit order view. Before they were missing if an order was in a resumed state.
Fixes #5946
2021-04-02 15:41:59 +01:00
Matt-Yorkley
b6b367c378
Add return adjustments test in checkout helper
2021-03-30 16:41:23 +01:00
Matt-Yorkley
5d1d72b36b
Update Admin::OrdersHelper#order_adjustments_for_display
2021-03-23 18:19:37 +00:00
Matt-Yorkley
525fef14b1
Merge pull request #6974 from Matt-Yorkley/adjustments-line-item-fees
...
[Adjustments] Update line item enteprise fees
2021-03-23 19:06:02 +01:00
Matt-Yorkley
479c1ae6e6
Merge pull request #7062 from mkllnk/6327-terms-of-service
...
Show Terms of Service at checkout if required
2021-03-18 19:16:06 +01:00
Matt-Yorkley
3253ab4616
Fix test setup in CheckoutHelper spec
2021-03-18 13:18:20 +00:00
Matt-Yorkley
ff722e6969
Fix cookie issues in i18n helper spec
2021-03-11 12:06:00 +00:00
Matt-Yorkley
29c5703161
Improve OrdersHelper spec and delete dead code
...
The removed test here was checking for adjustments that have an amount of zero and are eligible. If the amount is zero, it will already be marked as ineligible.
2021-03-11 11:22:35 +00:00
Matt-Yorkley
714e4f7896
Update test setup in checkout helper spec
2021-03-11 11:20:01 +00:00
Matt-Yorkley
791a47d170
Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost
...
[Adjustments] Move shipping adjustment from order to shipment
2021-03-11 12:17:14 +01:00
Maikel Linke
561da1f834
Show Terms of Service at checkout if required
...
The checkout page shows a checkbox to accept the platform's Terms of
Service. Ticking the box doesn't have any effect yet but at least people
are aware and are presented with a link to the terms.
2021-03-10 17:09:26 +11:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +00:00
Matt-Yorkley
02fb2c6a55
Update CheckoutHelper
2021-03-04 14:27:02 +00:00
Matt-Yorkley
c0c7c6ec78
Update checkout helper summing and add test coverage
2021-01-15 17:29:21 +00:00
Luis Ramos
5b00868c6f
Allow mutable strings in some specs
2020-12-03 06:38:24 -08:00
Luis Ramos
2b8f0abe49
Try some mass auto-correct adding frozen-string-literal to all specs
2020-12-03 06:38:24 -08:00
Matt-Yorkley
63fb46f440
Delete some dead code
...
There are some really weird issues in the spec here, and this module is not in use anywhere.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
eb040de422
Fix expectation in base_helper_spec
...
The attribute on this element are now rendered in alphabetical order
2020-11-27 14:00:29 +00:00
Luis Ramos
d15301021a
Rename inject_json_list to inject_json_array
2020-10-30 10:12:56 +00:00
Luis Ramos
08d26102d2
Separate injection methods so that we can have a separate behaviour for lists without having to check their types
...
This change is required for rails 4.1 where the relations api changed
2020-10-30 10:10:54 +00:00
Matt-Yorkley
70bd2161ba
Rename Stripe Connect factory for clarity
2020-09-19 12:55:31 +01:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
865a4b3063
Fix base helper spec
2020-09-01 09:46:41 +01:00
Luis Ramos
2f93a06dd5
Run rubocop -a on files brought from spree_core
2020-09-01 09:46:41 +01:00
Luis Ramos
c151195e3a
Merge decorator with original class and delete dead code
2020-09-01 09:46:41 +01:00
Luis Ramos
7ec00cf40a
Bring base files from spree_core
2020-09-01 09:45:11 +01:00
Luis Ramos
c7a5dd65cf
Ensure all specs that change stripe_connect_enable set the value back to what it was before, which should be the default value false
...
This will speed up specs as it ensures the stripe is always disabled and its JS script is not loaded
2020-08-31 18:38:50 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Pau Pérez Fabregat
257b311e04
Merge pull request #5158 from openfoodfoundation/3-0-stable
...
Merge 3-0-stable to master
2020-06-15 13:35:58 +02:00
Matt-Yorkley
e84e0aebe6
Fix fatal error in reports helper for orders without payments
2020-06-11 11:22:07 +02:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Luis Ramos
0a6bd1424c
Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only
...
Adding both unit and feature tests as this is important enough for that
2020-05-08 12:59:17 +01:00
Luis Ramos
34d8b1957e
Improve variable names
2020-05-08 12:42:32 +01:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
2ff8356c63
Delete dead code from products helper
2020-04-09 16:33:17 +01:00
Matt-Yorkley
0d08ad7d2e
Fix expectation in helper spec
...
The output of this link helper has changed slightly. All the attributes are the same as before, but they seem to be in alphabetical order now.
Fixes:
69) Spree::BaseHelper#link_to_remove_fields returns an `a` tag followed by a hidden `input` tag
Failure/Error: expect(subject).to eq("<a href=\"#\" class=\"remove_fields icon_link with-tip icon-trash\" data-action=\"remove\" title=\"Remove\"><span class='text'>Hola</span></a><input type="hidden" name="_method" value="destroy">")
expected: "<a href=\"#\" class=\"remove_fields icon_link with-tip icon-trash\" data-action=\"remove\" title=\"...</span></a><input type="hidden" name="_method" value="destroy">"
got: "<a class=\"remove_fields icon_link with-tip icon-trash\" data-action=\"remove\" href=\"#\" title=\"...</span></a><input type="hidden" name="_method" value="destroy">"
(compared using ==)
# ./spec/helpers/spree/admin/base_helper_spec.rb:12:in `block (3 levels) in <top (required)>'
2020-03-02 19:41:47 +01:00
Matt-Yorkley
0546acd6f9
Refactor #shop_tabs use and remove #first_visible_tab
2020-01-13 17:05:28 +01:00
Matt-Yorkley
14bcba081d
Adapt shopfront_helper to show/hide panels and display new tabs
2020-01-08 14:50:27 +01:00
