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
34,725 Commits 18 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

12632 Commits

Author SHA1 Message Date
Matt-Yorkley
81f5755e3d Add tests for tabs_controller 2022-01-31 16:34:35 +00:00
Filipe
4e4d9bb5a5 Merge pull request #8804 from Matt-Yorkley/split-checkout-fees 
[Split Checkout] Ensure fees are applied during checkout update
 2022-01-31 16:26:22 +00:00
Matt-Yorkley
11ed1574ca Call #check_order_cycle_expiry in PaypalController and StripeController, but avoid it on #authorize action 
The authorize action is used for authorizing off-session payments where the order is *already complete* and the order cycle may have closed (backoffice and subscriptions). They are essentially asynchronous and not coupled to the current open/closed state of the order cycle.
 2022-01-31 15:55:35 +00:00
Matt-Yorkley
5e6dd1e6e1 Move #check_order_cycle_expiry method to OrderStockCheck and don't call it from BaseController :before_action callback 2022-01-31 15:55:35 +00:00
Nihal M. Kelanthodika
ddaac654ef Add specs for conversion of variant weight input into decimal/0.0 2022-01-31 17:43:15 +05:30
Matt-Yorkley
0516ec6f15 Enable test for loading address (now passing) 2022-01-30 11:33:31 +00:00
Matt-Yorkley
7e62bfcdfb Add failing test for loading address with state correctly in split checkout 2022-01-30 11:33:31 +00:00
Matt-Yorkley
f4fdc8740e Disable test that depends on missing Transifex keys 2022-01-29 20:06:46 +00:00
Matt-Yorkley
8b59ef20db Improve controller tests 2022-01-29 14:49:23 +00:00
Matt-Yorkley
13a7fb79cf Move more login handling out of Angular 2022-01-29 14:49:23 +00:00
Matt-Yorkley
6116fd8881 Improve inaccurate specs 2022-01-29 14:49:23 +00:00
Matt-Yorkley
0577b46f3f Create simpler non-Angular login modal 2022-01-29 14:49:23 +00:00
Matt-Yorkley
8a18a4de66 Clear up redirecting logic and path building 2022-01-29 10:08:51 +00:00
Cillian O'Ruanaidh
67ae2e72f3 Replace inline JS for toggling order cycle advanced settings with StimulusJs controller 
Partially addresses #8699.

This adjusts the Stimulus toggle controller so you can toggle content in both directions via a single element. This is in addition to the previous behaviour for toggling via multiple elements like radio buttons when each element always toggles in one direction only.

If a toggle element contains a chevron icon this will automatically toggle the direction of that icon too.

Note, in order to not have to re-implement the animation provided by the slideToggle() function in standard JavaScript, this just switches the style :display between 'none' and 'block' so it is not as smooth. Perhaps it could be made more smooth later with a CSS transition.
 2022-01-28 16:19:36 +00:00
Matt-Yorkley
6c6e5ca316 Ensure fees are applied during checkout 2022-01-28 11:38:23 +00:00
Matt-Yorkley
0bec693655 Merge pull request #8791 from Matt-Yorkley/split-checkout-terms 
[Split Checkout] Update terms of service handling
 2022-01-27 13:07:04 +00:00
Matt-Yorkley
1ee3d0f7a1 Drop embedded shops code 2022-01-26 19:58:39 +00:00
Filipe
75395f6f29 Merge pull request #8648 from Matt-Yorkley/csp 
Configure CSP
 2022-01-26 19:55:11 +00:00
Filipe
374c05116b Merge pull request #8726 from Matt-Yorkley/stringex-machina 
Reduce impact of stringex gem
 2022-01-26 19:02:41 +00:00
Filipe
62457f0c69 Merge pull request #8778 from georgethoppil/master 
Adding deleted_at check on variant_stock move
 2022-01-26 17:33:29 +00:00
Filipe
404fb4cb7f Merge pull request #8771 from tsara27/8458-missing-translation 
Missing translation: table headers in product import validation table #8458
 2022-01-26 17:22:44 +00:00
Filipe
53b96896a9 Merge pull request #8779 from mkllnk/7872-remove-stripe-connect 
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
 2022-01-26 11:57:26 +00:00
Filipe
733d788215 Merge pull request #8758 from Matt-Yorkley/split-checkout-payments 
Split checkout: external payment processing
 2022-01-25 15:55:56 +00:00
Matt-Yorkley
bfe70691c2 Add test coverage for accepting terms of service 2022-01-25 15:19:32 +00:00
Matt-Yorkley
31349ed3ae Remove example system spec 2022-01-25 13:45:15 +00:00
Maikel Linke
828e3ab08d Wait for JS in spec for consistent pass 2022-01-25 14:12:50 +11:00
Matt-Yorkley
b5a1d9ebef Allow using saved cards at checkout 2022-01-24 23:06:43 +00:00
George Thoppil
77e5aab6c8 Merge branch 'openfoodfoundation:master' into master 2022-01-24 16:48:21 -05:00
Matt-Yorkley
8c9ca3b0c3 Extract method and allow Stripe payment completion on orders in confirmation state 2022-01-24 20:49:06 +00:00
Matt-Yorkley
8552da2377 Extract and stub PaymentMethodFetcher 2022-01-24 20:28:59 +00:00
Matt-Yorkley
ebb69d7f93 Add controller test for payment redirect 2022-01-24 20:28:59 +00:00
GeorgeThoppil
b2e9106654 Linting/Trailing whitespace 2022-01-24 09:30:55 -05:00
Matt-Yorkley
48a7cfa09e Fix more deprecated keyword arguments 2022-01-24 14:11:08 +00:00
George Thoppil
745758b7de Update spec/models/spree/order_spec.rb 
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-01-24 09:06:09 -05:00
Filipe
1120e4e460 Merge pull request #8759 from jibees/8547-use-the-last-payment-in-the-Payment-Method-Report 
Use the last payment method instead of the first for the Payment Method Report
 2022-01-24 12:51:08 +00:00
Filipe
f17226ffbe Merge pull request #8438 from cillian/show-out-of-stock-line-items 
If an order has out of stock line items display them and let admins remove them
 2022-01-24 12:18:19 +00:00
Maikel Linke
19909deaf6 Remove obsolete StripeConnect payment gateway 
The newer StripeSCA is a complete replacement.
 2022-01-24 12:35:45 +11:00
Maikel Linke
ee85b9654d Remove references to StripeConnect class 2022-01-24 12:35:45 +11:00
Maikel Linke
f22c2b0e73 Remove option to create StripeConnect methods 2022-01-24 12:35:45 +11:00
Maikel Linke
9abacf9047 Upgrade old StripeConnect payment methods to SCA 
StripeConnect has been replaced by StripeSCA. But we still have some
StripeConnect payment methods in our production databases. We need to
convert them to StripeSCA methods before we can remove the related
code and clean up. Otherwise our code would raise errors when
encountering an old StripeConnect method, not knowing what that is.
 2022-01-24 12:35:45 +11:00
GeorgeThoppil
f1c4f80be4 Adding deleted_at check on variant_stock move 2022-01-23 13:45:54 -05:00
Tsara Sudrajat
56ac2e4e61 Convert product headings to load from translation 2022-01-21 18:30:38 +07:00
Matt-Yorkley
2f7ef33caf Add test for maintaining hub selection after order completion 2022-01-19 22:43:54 +00:00
Matt-Yorkley
fb8f5ee5ce Increase flexibility in test setup 2022-01-19 17:51:03 +00:00
Matt-Yorkley
49623f6b4a Simplify test setup 2022-01-19 17:51:03 +00:00
Matt-Yorkley
d57e64cf7e Add new order factories for checkout steps 2022-01-19 17:49:05 +00:00
Filipe
2e85783465 Merge pull request #8731 from Matt-Yorkley/split-checkout-default-addresses 
Split checkout: default address saving
 2022-01-19 17:43:51 +00:00
Filipe
7444e2d2f3 Merge pull request #8741 from Matt-Yorkley/guest-checkout-login 
Fix split checkout guest user login
 2022-01-19 16:43:24 +00:00
Matt-Yorkley
8f37aa71f2 Save default addresses when requested during checkout 2022-01-19 13:40:33 +00:00
Matt-Yorkley
fb00a51ae8 Merge pull request #8653 from Matt-Yorkley/split-checkout-t-and-c 
Split checkout T&Cs
 2022-01-19 13:39:15 +00:00