Matt-Yorkley
4230d46a06
Remove carts older than 6 months
2021-01-27 22:40:23 +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
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
Matt-Yorkley
7525620d6c
Merge pull request #6070 from Matt-Yorkley/responsive-admin
...
Full-width admin layout
2021-01-27 12:45:06 +01:00
Matt-Yorkley
feca9e7838
Improve hubs sidebar in payment methods edit
2021-01-27 11:38:01 +00:00
Matt-Yorkley
398b4a09a1
Improve enterprise fees calculator fields
2021-01-27 11:38:01 +00:00
Matt-Yorkley
366588de95
Improve <legend> element centering
2021-01-27 11:38:01 +00:00
Matt-Yorkley
b5ab6cbf69
Improve button spacing in enterprises submenu
2021-01-27 11:38:01 +00:00
Matt-Yorkley
e762c1d02f
Adjust buttons layout on enterprise shipping and payment methods page
2021-01-27 11:38:01 +00:00
Matt-Yorkley
f72cd6222f
Adjust variant columns in inventory pages
2021-01-27 11:38:01 +00:00
Matt-Yorkley
79316560d6
Remove skeleton.css from /vendor/assets
...
This was recently imported from spree_core
2021-01-27 11:38:01 +00:00
Matt-Yorkley
539ff228e0
Adjust form layout on order cycle edit form (simple view)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
afdb5e8c6f
Add a max-width of 1400px for huge monitors (1600px or more)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d40ec2d63c
Adjust order cycle edit form layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
0d99656b1b
Adjust dashboard layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
52cfa0a103
Remove old Javascript hacks for the main menu and replace with flex-based CSS properties
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d886b1dcea
Tweak some styles and layout classes
2021-01-27 11:38:01 +00:00
Matt-Yorkley
29e74017a6
Replace fixed 960 grid
2021-01-27 11:38:01 +00:00
Pau Pérez Fabregat
9fe2cb1a30
Merge pull request #6681 from luisramos0/css
...
[Rails 5] Make the app work in rails 5
2021-01-27 12:08:27 +01:00
Maikel Linke
0393e902c4
Update translations from Transifex
2021-01-27 08:28:37 +11:00
Pau Pérez Fabregat
10a60b1f72
Merge pull request #6729 from openfoodfoundation/dependabot/bundler/shoulda-matchers-4.5.1
...
Bump shoulda-matchers from 4.5.0 to 4.5.1
2021-01-25 16:34:13 +01:00
Pau Perez
5677c86f9b
Remove enable_mail_delivery preference from DB
...
It's no longer used.
2021-01-25 13:34:13 +01: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
Pau Pérez Fabregat
efd2c81877
Merge pull request #6722 from luisramos0/spree_routes
...
Replace spree_get with simple get
2021-01-25 09:12:51 +01:00
dependabot[bot]
70bd81430d
Bump shoulda-matchers from 4.5.0 to 4.5.1
...
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers ) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases )
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v4.5.0...v4.5.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-01-25 06:13: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
Maikel Linke
7add9247d5
Update translations from Transifex
2021-01-22 11:58:27 +11:00
Maikel
d5376ce29d
Merge pull request #6702 from openfoodfoundation/transifex
...
Transifex
2021-01-22 11:54:57 +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
91d5b55376
Merge pull request #6673 from openfoodfoundation/dependabot/bundler/paypal-sdk-merchant-1.117.2
...
Bump paypal-sdk-merchant from 1.106.1 to 1.117.2
2021-01-21 11:21:27 -08:00
Andy Brett
0f92b3c4de
Merge pull request #6685 from Matt-Yorkley/angular-csrf
...
[Rails 5] Update Angular CSRF handling
2021-01-21 11:01:06 -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
d2b2e46124
Merge pull request #6701 from Matt-Yorkley/admin-order-performance
...
Fix performance issue in loading payment methods
2021-01-21 10:58:35 -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
bba9e55006
don't try to process a payment if it's pending auth
2021-01-21 09:18:29 -08:00
Andy Brett
ce4621858d
base authorization on the payment's order
2021-01-21 09:18:29 -08:00
Andy Brett
8bcaeff6c8
resolve merge conflict; add ssl helper to base controller
2021-01-21 09:18:29 -08:00
Andy Brett
1635b83c15
add missing translation key for payment actions
2021-01-21 09:18:29 -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
affc82b2b5
update payment jobs delivery methods
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
