Cillian O'Ruanaidh
c8198ff67c
Merge branch 'master' into include-ready-for-in-producer-notification
2021-01-29 11:30:11 +00:00
Pau Pérez Fabregat
818dfc0399
Merge pull request #6751 from jibees/4971-profile-tabs-back-forward-buttons
...
Make user's profile tabs aware of location change event
2021-01-29 10:01:58 +01:00
Pau Pérez Fabregat
6cc19ac6d5
Merge pull request #6726 from filipefurtad0/shipping_methods_spec_pending_fix
...
Fixes a pending test case and improves the spec run time
2021-01-28 16:39:39 +01:00
Pau Pérez Fabregat
2668747237
Merge pull request #6723 from luisramos0/spree_routes_2
...
Move spree orders routes out of the spree engine routes into the main app routes
2021-01-28 16:31:49 +01:00
Matt-Yorkley
57f429db58
Merge pull request #6606 from mkllnk/6081-add-to-cart
...
Add quantity input to shop front
2021-01-28 15:51:08 +01:00
Jean-Baptiste Bellet
553053bad1
use find instead of click_link because <a> element no longer has href attribute
...
- click_link only looks for <a> element with href attribute
- Use a regexp for a case-insensitive search (as CSS use a uppercase transform)
2021-01-28 09:45:24 +01:00
Luis Ramos
7cea4138c2
Fix spec setup
2021-01-27 22:44:52 +00:00
Maikel
8a757812e7
Merge pull request #6735 from coopdevs/enable-mail-delivery-always
...
Enable mail delivery always
2021-01-28 09:31:12 +11:00
Matt-Yorkley
f49355e5d3
Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments
...
Delete dead code Spree::Order#price_adjustments
2021-01-27 23:29:38 +01:00
Luis Ramos
c604f4c0c6
Remove dead endpoint
2021-01-27 22:05:04 +00:00
Pau Pérez Fabregat
c3897dd3df
Merge pull request #6643 from coopdevs/customer-balance-frontoffice
...
Customer balance frontoffice
2021-01-27 19:55:56 +01:00
Luis Ramos
ab135e30c0
Fix order_path in stripe connect spec
2021-01-25 20:25:13 +00:00
Luis Ramos
11fdbe5e9f
Switch spree from namespace to scope in routes so helpers like order_path keep working
2021-01-25 20:01:08 +00:00
Luis Ramos
34ae3ca24d
Replace spree_order_url with order_url so we can use scope in the routes file
2021-01-25 19:56:25 +00:00
Luis Ramos
f3da7afd55
Replace spree_order_path with order_path so we can use scope in the routes file
2021-01-25 19:55:42 +00:00
Luis Ramos
dbef7b60a6
Adapt spec to new orders url
2021-01-25 19:52:48 +00:00
Luis Ramos
21f48b52c8
Fix cancel order route
2021-01-25 19:52:48 +00:00
Luis Ramos
00fcb89af1
Fix order_url routes in a few places
2021-01-25 19:52:48 +00:00
Luis Ramos
6e7ee02191
Change spree.order_path to spree_order_path everywhere
2021-01-25 19:52:48 +00:00
Luis Ramos
e98d97ae0d
Move spree orders routes out of the spree engine routes into the main app routes, still inside the spree namespace
2021-01-25 19:52:48 +00:00
Pau Perez
4a5869b60c
Remove ability to toggle mail delivery
...
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
2021-01-25 13:27:44 +01:00
filipefurtad0
c5c9e803ab
Fixes a pending test case and improves the spec run time
2021-01-24 13:32:04 +00:00
Matt-Yorkley
0247386f82
Delete dead code Spree::Order#price_adjustments
...
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
2021-01-23 00:05:56 +00:00
Luis Ramos
1643636d43
Replace spree_get with simple call to get
2021-01-22 22:32:48 +00:00
Luis Ramos
d6a53cb84f
Replace spree_get with simple call to get
2021-01-22 22:30:11 +00:00
Luis Ramos
94275eedfb
Replace spree_get with simple call to get
2021-01-22 22:28:53 +00:00
Luis Ramos
59e900826e
Replace spree_get with get
...
Spree helper method is not needed
2021-01-22 22:22:50 +00:00
Luis Ramos
be9ee376a3
Use get instead of spree_get
...
spree_get is not needed in these cases
2021-01-22 22:20:52 +00:00
Cillian O'Ruanaidh
9c6e97f90d
Merge branch 'master' into include-ready-for-in-producer-notification
2021-01-22 11:45:01 +00:00
Cillian O'Ruanaidh
70a557cea3
Display the pickup time for each distributor, not the coordinator, in the Notify Producers email
2021-01-22 11:39:46 +00:00
Maikel Linke
bd731267ec
Allow user to get maximum available quantity
...
When the user entered a number beyond the stock level, the browser was
correcting that to the max number which is very helpful. But Angular was
setting the model to undefined which removes the item from the cart.
Deactivating Angular's max behaviour let's us set the value ourselves
which is then used in the cart.
2021-01-22 16:42:21 +11:00
Maikel Linke
35b4e8c4d1
Allow editing of invalid quantities
...
If the user entered an invalid quantity, Angular set the model to
undefined and we removed the input field to show the add button. That
makes it impossible for a user to see what the maximum quantity to enter
would be. For example:
- The variant has a stock level of 5.
- The user enters 7.
- Angular sets it to undefined.
- The input field disappears.
- The user is startled and doesn't know how to proceed.
But now we hide the input only if it's deliberately set to zero.
2021-01-22 16:42:21 +11:00
Maikel Linke
0166400b03
Guard against invalid quantity input
...
The user can now type anything into the quantity field and some of it
may not be valid. These safe guards ensure that the buttons still work
even if the quantity is undefined or out of range.
Angular guards against the value being out of range but that has other
side-effects. We want to be able to de-activate some of Angular's
behaviour.
2021-01-22 16:42:20 +11:00
Maikel Linke
af918e63ee
Change bulk quantities on any quantity change
...
This prepares for changing the quantity with an input field. It also
applies if the quantity is changed after an ajax request.
2021-01-22 16:42:20 +11:00
Andy Brett
84689c43be
Merge pull request #6534 from andrewpbrett/sca-emails
...
Send email when SCA authorization is required for admin payment
2021-01-21 13:53:35 -08:00
Andy Brett
0e7f4b2f14
Merge pull request #6537 from mkllnk/simplify-mail-config
...
Simplify mail config
2021-01-21 10:59:43 -08:00
Andy Brett
3ef4a74b84
Merge pull request #6655 from Matt-Yorkley/summing-amounts
...
Improve performance on summing adjustments and payment
2021-01-21 10:58:10 -08:00
Matt-Yorkley
d8b795ebee
Merge pull request #6679 from Matt-Yorkley/soft-delete-enterprise-fees
...
Soft-delete Enterprise Fees
2021-01-21 19:57:29 +01:00
Andy Brett
70f30f5224
Merge pull request #6658 from andrewpbrett/item-counter-fix
...
Further fix #5989 (Item counter accepts values higher than the available stock)
2021-01-21 10:56:18 -08:00
Andy Brett
903b2e7ff4
whitelist allowed events to be sent to a Payment
2021-01-21 09:18:29 -08:00
Andy Brett
ab5ffead1d
require that the redirect url be to stripe.com and over https
2021-01-21 09:18:29 -08:00
Andy Brett
d76db9ee51
update payment controller spec to move payment to pending
2021-01-21 09:18:29 -08:00
Andy Brett
5f1669280c
update to rspec 3 expect syntax
2021-01-21 09:17:07 -08:00
Andy Brett
5c0408c68c
pass paymentIntent ID to capture
2021-01-21 08:48:38 -08:00
Andy Brett
802e49bed3
add PaymentMailer and send email if payment auth is required
2021-01-21 08:24:01 -08:00
Cillian O'Ruanaidh
40f9b063fe
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-21 08:24:01 -08:00
Andy Brett
77419a1e4b
Merge pull request #6675 from cillian/single-new-product-view
...
Remove ability to create new product from products page, use /admin/products/new instead.
2021-01-20 19:23:33 -08:00
Andy Brett
e31d566f7f
Merge pull request #6283 from luisramos0/sets
...
Move sets out of app/models to app/services/sets
2021-01-20 19:22:15 -08:00
Pau Perez
cc9e3fe69b
Replace double negation with proper list of states
...
We rely now on the exhaustive list of states an order can be in after
checkout. What made this all a bit more messy is that I made up the
"checkout" order state, likely mixing it from the payment model states.
This simplifies things quite a bit and gives meaningful names to things.
2021-01-20 18:34:31 +01:00
Pau Perez
9bb49bb590
Ensure the query the class depends on is called
2021-01-20 18:23:22 +01:00
