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
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
filipefurtad0
3160d723b0
checks whether second payment was added correctly to the order
2021-02-11 10:29:56 +01:00
filipefurtad0
467b9e71a2
adds additional test case, in which a negative payment is added to an order
2021-02-11 10:29:56 +01:00
filipefurtad0
c722e1c082
declares variables for orders using let; prepares additional test cases
2021-02-11 10:29:56 +01:00
Pau Pérez Fabregat
8af805d10c
Merge pull request #6840 from coopdevs/temp-skip-flaky-specs
...
Temporarily skip very flaky specs
2021-02-10 18:42:43 +01:00
Pau Pérez Fabregat
b7af92abb2
Merge pull request #6801 from coopdevs/toggle-customer-balance-to-entire-instance
...
Toggle customer balance to entire instance
2021-02-10 17:32:35 +01:00
Matt-Yorkley
ff549fb62e
Also soft-delete tax rates when changing included_in_price
...
We need to do this when the included_in_price boolean changes as well, for the same reasons.
2021-02-09 17:26:16 +00:00
Matt-Yorkley
a811fb3783
Merge pull request #6838 from Matt-Yorkley/minor-rails-5-bits
...
Minor Rails 5 bits -> master
2021-02-09 14:40:13 +01:00
Matt-Yorkley
d6442bb16f
Fix get requests in API controller spec
2021-02-09 11:57:00 +00:00
Matt-Yorkley
78eb5d23f9
Update TaxRatesController spec
...
BigDecimal was throwing an error here (in Rails 5) unless it received a string, but I think this is actually an issue with the way params were being passed in the relevant spec, as opposed to the controller itself.
2021-02-09 11:57:00 +00:00
Matt-Yorkley
1b947d30fa
Pass ids in params that should be ids
2021-02-09 11:57:00 +00:00
