Pau Pérez Fabregat
8d31ba2677
Merge pull request #6966 from Matt-Yorkley/dead-code-totals
...
Dead code of the week
2021-03-01 10:05:31 +01:00
Pau Pérez Fabregat
9389de9aa1
Merge pull request #6970 from andrewpbrett/flaky-spec
...
Remove duplicate specs
2021-03-01 10:03:23 +01:00
Pau Pérez Fabregat
a0aeb1ceb4
Merge pull request #6889 from mkllnk/6102-footer
...
Emphasise ways to get help in user emails
2021-03-01 09:59:18 +01:00
Andy Brett
448c0e0ce3
Remove duplicate specs
...
The second of these is flaky; moreover, the OrdersController doesn't specifically have a method that they're testing. I think the ready_to_capture behaviors is adequately covered by 006236b8dd/spec/serializers/api/admin/order_serializer_spec.rb (L39-L68)
2021-02-27 15:05:11 -08:00
Matt-Yorkley
16eff698df
Remove dead code; Spree::Order #line_item_adjustment_totals and #price_adjustment_totals
2021-02-27 11:56:44 +00:00
Andy Brett
7bbfb6b8db
use rpsec subject in payments spec
2021-02-26 07:44:08 -08:00
Andy Brett
e5eb8f97f9
add basic feature spec for authorisation table
2021-02-26 07:44:08 -08:00
Andy Brett
83bc9d2a12
add unit spec for Payments query
2021-02-26 07:44:08 -08:00
Pau Pérez Fabregat
404ec7bf92
Merge pull request #6950 from andrewpbrett/fix-nil-enterprise-category
...
Fix #6949 : Add default icon value if enterprise.category is nil
2021-02-25 13:20:10 +01:00
Andy Brett
bc7477795c
Merge pull request #6910 from andrewpbrett/remove-order-capture
...
Make orders not capturable if they have a payment pending authorization
2021-02-24 12:20:43 -08:00
Andy Brett
741ed73cf5
add specs for enterprises with nil or unknown category
2021-02-24 11:43:53 -08:00
Pau Perez
20a7f2f24e
Eager load payment and subs. order associations
...
This removes the N+1 queries caused by
`Api::Admin::OrderSerialier#ready_to_capture` when used from
`Api::OrdersController#index`. While it's fine for the single-order
controller actions, it's not for this one that deals with a collection
of orders.
Fortunately, `SearchOrders` is used only in this controller action so we
can put the `includes` calls there, otherwise, we would need to refactor
it a bit to pass in a context-specific AR relation.
2021-02-23 10:26:12 -08:00
Andy Brett
d62a984939
make orders not capturable if they have a payment pending authorization
2021-02-23 10:26:04 -08:00
Matt-Yorkley
9852470ef6
Merge pull request #6913 from Matt-Yorkley/rails-5-backports
...
Rails 5 backports
2021-02-23 11:55:31 +01:00
Maikel Linke
b61ce13a1b
Add missing helper to UserMailer
2021-02-23 11:24:55 +11:00
Maikel Linke
a971b62068
Emphasise ways to get help in user emails
...
We had a very prominent footer showing how to get in contact with the
local instance people but most users need to get in contact with the
enterprise they are buying from. So removing all those details and
replacing them by a simple "powered by" line will hopefully direct
attention to the shop's contact details.
2021-02-23 11:24:55 +11:00
Maikel
3e0547f563
Merge pull request #6926 from andrewpbrett/check-nan
...
Ensure unit_value is a number
2021-02-23 10:40:00 +11:00
Matt-Yorkley
0e3429dc35
Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor
...
Enterprise fees refactor
2021-02-22 17:59:18 +01:00
Andy Brett
dac7176bde
Merge pull request #6922 from jibees/6917-fix-prefilled-date-for-new-date-picker-
...
Separate date format used for server communication from user-readable date
2021-02-22 08:23:51 -08:00
Jean-Baptiste Bellet
9bc5aa69bb
Use the right default date time format
...
- Using the altInput from flatpickr forces us to use this default date format which is `%Y-%m-%d %H:%M`
2021-02-22 13:00:43 +01:00
Jean-Baptiste Bellet
e93474d493
Look for hidden input using the right date time format
...
- This is an option, and by default it has the previous behavior: look only for visible element
- This option allows us to look for non-visible elements
- Using new altInput from flatpickr create a input hidden element. This is why we need to look at this element.
- Using the altInput from flatpickr forces us to use this default date format
- As we now use `altInput` from flatpickr, the value used to communicate between backend and frontend is stored into an input type hidden.
2021-02-22 13:00:04 +01:00
Jean-Baptiste Bellet
fbe53a3a2e
Use UI to fill date into datetimepicker
...
This creates a new method to select date and time from datetimepicker.
Field cannot be filled "manually" (ie. by entering its value)
2021-02-22 12:58:29 +01:00
Andy Brett
dec6d2189f
add unit test for unit_value
2021-02-21 22:26:36 -08:00
Andy Brett
55215bb59a
Merge pull request #6899 from Matt-Yorkley/cost-price-dead-code
...
Remove cost_price and other dead code
2021-02-21 11:10:17 -08:00
Matt-Yorkley
f858fe3c68
Improve coverage in admin_orders_controller_spec
2021-02-19 11:18:00 +00:00
Matt-Yorkley
cc55e9eeda
Improve coverage in orders_controller_spec
2021-02-19 11:17:59 +00:00
Matt-Yorkley
d4750b9f26
Improve clarity of orders controller test
2021-02-19 11:17:59 +00:00
Matt-Yorkley
9303d61db1
Update specs
2021-02-19 11:17:58 +00:00
Maikel Linke
5b94049620
Whitelist params for several settings for Rails 5
...
Rails 5 is a bit stricter and Spree's Config#set method doesn't work
with a Parameters object.
2021-02-19 14:20:15 +11:00
Matt-Yorkley
5d1af5620c
Merge pull request #6674 from cillian/include-ready-for-in-producer-notification
...
Include the 'Ready for' time for the order cycle in the Notify Producers email
2021-02-18 22:01:08 +01:00
Matt-Yorkley
aebd785a54
Fix persistence issue in view test setup
2021-02-18 14:58:25 +00:00
Andy Brett
f463af327c
Merge pull request #6808 from andrewpbrett/authorize-payment-links
...
Allow a customer to perform further action for a Stripe payment if needed (#4181 )
2021-02-17 10:17:51 -08:00
Pau Pérez Fabregat
8068c6015f
Merge pull request #6836 from coopdevs/customer-balance-reports
...
Customer balance reports
2021-02-17 17:34:37 +01:00
Matt-Yorkley
42a5d7cdc7
Delete dead code Variant#set_option_value
2021-02-17 14:27:51 +00:00
Matt-Yorkley
81ac2c5add
Delete code related to :cost_price field
2021-02-17 14:27:51 +00:00
Pau Pérez Fabregat
a88280566c
Merge branch 'master' into increase-precision
2021-02-17 11:36:36 +01:00
Pau Pérez Fabregat
16140b7b0b
Merge pull request #6843 from Matt-Yorkley/tax-rates-double-take
...
Also soft-delete tax rates when changing `included_in_price`
2021-02-17 09:41:07 +01:00
Matt-Yorkley
3da5c0d7fd
Update TaxRate transition spec
...
Setting a tax rate to included fails a validation if a default zone doesn't exist, so that's added. Also improved the tested scenarios and some of the details checked on the updated objects.
2021-02-16 13:21:57 +00:00
Pau Perez
36ce39a217
Sort OC report orders by completed_at
...
This is then consistent with the ordering we use to list orders in
/admin, which is more useful. As a result, the test is also more robust.
2021-02-16 13:25:21 +01:00
Andy Brett
560ad49057
unit tests for ProcessPaymentIntent
2021-02-15 18:09:07 -08:00
Andy Brett
05e762ff21
add controller specs for confirming payment intent
2021-02-15 17:09:38 -08:00
Andy Brett
0a7396eb1c
Merge pull request #6713 from andrewpbrett/sca-subs-emails
...
Send emails when subscription payments require SCA auth
2021-02-12 08:23:32 -08:00
Andy Brett
b5e9c935e9
Merge pull request #6821 from cillian/admin-product-sorting-bug
...
Include sort direction parameter during bulk product update to prevent JS error causing 'Saving' text to hang
2021-02-11 10:54:24 -08:00
Pau Pérez Fabregat
7f882bfe92
Merge pull request #6295 from luisramos0/remove_pin
...
Remove Pin Payments
2021-02-11 18:04:59 +01:00
Pau Pérez Fabregat
99dbd8afa7
Merge pull request #6791 from filipefurtad0/customers_spec
...
enhances customers_spec.rb to check customer balance, after additional payments were added to an order
2021-02-11 11:36:30 +01:00
Pau Pérez Fabregat
7fe79eccea
Merge pull request #6691 from jibees/6664-new-datetimepicker
...
6664 new datetimepicker
2021-02-11 11:21:19 +01:00
Pau Pérez Fabregat
34ce3c0db1
Merge branch 'master' into remove_pin
2021-02-11 11:19:18 +01:00
Pau Perez
e703113c08
Fix typo in test wording
2021-02-11 10:29:56 +01:00
filipefurtad0
33f7335c02
splitted testcases into different context blocks
2021-02-11 10:29:56 +01:00
filipefurtad0
82b93fc757
declared relevant variables with let!
2021-02-11 10:29:56 +01:00
