raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,766 Commits 18 Branches 453 Tags
609db647bb09e9c6bd66a5c577edb8fdf75dfa3b
Commit Graph

18766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erin McLaughlin
609db647bb Adding a tax_rates key to en.yml to match the key used everywhere. 2021-01-23 22:07:07 -05: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
Andy Brett
d9b27bc556 move controller and mailer outside of spree namespace; use haml in template 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
b669ccdc74 refactor admin payments controller 2021-01-21 09:17:07 -08:00
Andy Brett
84b5fcf2ce add resend-authorization-email button to admin screen 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
8507dacc10 pass return_url option to gateway authorize 2021-01-21 08:48:33 -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
Pau Pérez Fabregat
1833ab5ffa Merge pull request #6710 from openfoodfoundation/dependabot/bundler/webdrivers-4.5.0 
Bump webdrivers from 4.4.2 to 4.5.0
 2021-01-21 12:27:02 +01:00
Pau Pérez Fabregat
3370271ad8 Merge pull request #6705 from coopdevs/fix-request-queuing-tracking 
Pass request_queuing setting to Rack middleware
 2021-01-21 12:04:22 +01:00
dependabot[bot]
b6e7307cb9 Bump webdrivers from 4.4.2 to 4.5.0 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.4.2 to 4.5.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.4.2...v4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-21 05:16:36 +00: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
Andy Brett
ca37976661 Merge pull request #6640 from jibees/2772-loading-spinner-reusable-component 
Create a reusable "loading spinner" component
 2021-01-20 19:21:31 -08:00
Andy Brett
1d4fa2983c Merge pull request #6466 from Matt-Yorkley/package-optimisation 
Optimise Shipment#to_package
 2021-01-20 19:20:56 -08:00
Andy Brett
4a19a368dd Merge pull request #6706 from Matt-Yorkley/adjustments-migration 
Fix issue with orphaned adjustments in migration
v3.5.4 		2021-01-20 13:23:36 -08:00
Andy Brett
dd38c8b3e2 add down method for migration 2021-01-20 12:56:03 -08:00
Matt-Yorkley
e1c13bc194 Fix issue with orphaned adjustments in migration 2021-01-20 13:42:14 +00:00
Pau Perez
ba018df9c5 Pass request_queuing setting to Rack middleware 
It turns out that this setting belongs to the Rack middleware Datadog
comes with to track requests (See
e4c430a174/docs/GettingStarted.md (rack)).

The way to pass this option to it is through `configuration[:rack]`
where the `TraceMiddleware` will read it from. See
f57aefe60a/lib/ddtrace/contrib/rack/middlewares.rb (L215-L217)
and
f57aefe60a/lib/ddtrace/contrib/rack/middlewares.rb (L30-L43).
 2021-01-20 10:58:07 +01:00
Andy Brett
a53cc6bc92 Update all locales with the latest Transifex translations v3.5.3 2021-01-19 19:07:37 -08:00
Andy Brett
89ce850da6 Merge pull request #6703 from openfoodfoundation/fix-datadog-init 
Revert "Enable request queuing tracking in Datadog"
 2021-01-19 18:39:21 -08:00
Transifex-Openfoodnetwork
b9cf5b7a9b Updating translations for config/locales/de_DE.yml 2021-01-20 12:46:16 +11:00
Andy Brett
012289e95f Merge pull request #6687 from openfoodfoundation/dependabot/bundler/monetize-1.10.0 
Bump monetize from 1.9.4 to 1.10.0
 2021-01-19 17:23:33 -08:00
Matt-Yorkley
6a9505cf67 Ensure adjustments can access soft-deleted originators 
Note: originator is generally an EnterpriseFee or a TaxRate
 2021-01-19 16:46:14 +00:00
Matt-Yorkley
c4a8a38c8d Soft-delete enterprise fees 
These objects can hold critical information related to adjustments and tax categories. If they are hard-deleted we lose vital data that's needed by associated records.
 2021-01-19 16:46:14 +00:00
Matt-Yorkley
a184075c5c Fix performance issue in loading payment methods 
This was loading and initializing every payment method in the database, and every calculator for each of those payment methods.

🔥
 2021-01-19 15:33:44 +00:00
Pau Pérez Fabregat
b84fb5814e Merge pull request #6696 from Matt-Yorkley/migration-issues 
Update adjustment migration
 2021-01-19 16:02:04 +01:00
Pau Pérez Fabregat
8b01c9c8ba Merge pull request #6279 from luisramos0/base_controller 
Merge Spree::BaseController with ApplicationController and merge StoreController with ::BaseController
 2021-01-19 15:52:47 +01:00
Matt-Yorkley
79b86f535d Move class definitions in adjustment migration 2021-01-19 13:33:37 +00:00
Luis Ramos
fc40775ca8 Make paypal controller inherit from base controller and not from old store controller 2021-01-18 23:33:05 +00:00
Maikel
334e270a11 Merge pull request #6552 from Matt-Yorkley/adjustments-order-association 
[Adjustments] Associate all adjustments with an order
 2021-01-19 08:43:13 +11:00