raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,921 Commits 17 Branches 453 Tags
c224df9b6acfb2e95cb265fac65e72aafcefcdd1
Commit Graph

257 Commits

Author SHA1 Message Date
Maikel
e29a81cacc Merge pull request #5186 from oeoeaio/customer-totals-inventory-sku 
Take sku overrides into account in customer totals report
 2020-04-17 13:27:43 +10:00
Luis Ramos
357a88fa22 Merge pull request #4786 from luisramos0/stripe_sca_extra_subs_fix 
Make StripeSCA (with new authorize/purchase workflow) work with Subscriptions again
 2020-04-13 17:21:53 +01:00
Rob H
f71045b3f2 Improve naming of variables in VariantOverridesIndexed for readability 2020-04-13 22:24:25 +10:00
Rob H
dcdd3f2444 Modify interface of VariantOverridesIndexed#indexed 
Stop using keyword args and accept variant_ids instead of line_items
 2020-04-13 22:11:58 +10:00
Rob H
6820919552 Rename VariantOverrides class to VariantOverridesIndexed 2020-04-13 21:56:37 +10:00
Rob H
4a4173bdc0 Move VariantOverrides class to app/services 2020-04-13 21:54:10 +10:00
Matt-Yorkley
b92e858448 Merge pull request #5197 from Matt-Yorkley/cart-populate-performance 
Cart populate performance
 2020-04-10 11:41:56 +02:00
Matt-Yorkley
57d87a8042 Eager-load variant stock items 
Avoids another N+1
 2020-04-09 19:55:08 +02:00
Matt-Yorkley
0ca87580e8 Load variants in cart in one query 
Avoids an N+1
 2020-04-09 19:55:06 +02:00
Luis Ramos
59e0f3d9f4 Merge pull request #5175 from Matt-Yorkley/memoize-scoper 
Memoize ScopeProductToHub in product list
 2020-04-09 14:45:57 +01:00
Matt-Yorkley
fc5e346a06 Merge pull request #5156 from Matt-Yorkley/closed-shops 
Load closed shops in a separate request on /shops page
 2020-04-08 20:05:26 +02:00
Luis Ramos
d18a06a0f7 Merge pull request #4783 from luisramos0/stripe_sca_extra_subs 
Move all subscriptions services to the OrderManagement engine
 2020-04-06 20:20:02 +01:00
Matt-Yorkley
2cb4c6bec2 Memoize OpenFoodNetwork::ScopeProductToHub 
This means we avoid fetching all of the hub's variants every time we scope a product. Applies to every product loaded when displaying a shops's product list.
 2020-04-06 19:41:05 +02:00
Matt-Yorkley
af48cac140 Load closed shops in a separate request on /shops page 2020-04-04 14:06:10 +02:00
Luis Ramos
409681b7af Merge pull request #5089 from Matt-Yorkley/checkout-scoping 
Cart variant scoping
 2020-04-01 11:49:23 +01:00
Luis Ramos
9317549103 Merge pull request #4813 from luisramos0/oc_selector 
If there's only one OC available to the customer because there are tag rules hidding other OCs, select that OC by default
 2020-04-01 10:44:58 +01:00
Matt-Yorkley
09c8819e5a Remove unnecessary Bugsnag calls 
The Bugsnag notification was just here to see if this was dead code. It's not.
 2020-03-30 20:36:45 +02:00
Matt-Yorkley
f7c047b798 Memoize ScopeVariantToHub to avoid fetching the hub's overrides each time 2020-03-30 20:33:27 +02:00
Matt-Yorkley
71f00f9283 Remove comment warning about this issue 2020-03-27 14:23:48 +01:00
Matt-Yorkley
7d33a237d0 Add scoping to VariantsStockLevels when variant is not in the order 2020-03-27 14:15:15 +01:00
Matt-Yorkley
fbfe663ebc Add variant scoping to VariantStockLevels 2020-03-27 13:38:57 +01:00
Matt-Yorkley
36aa52736a Refactor order filtering logic 2020-03-24 09:36:59 +01:00
Matt-Yorkley
45c204017f Improve reports performance 
Add the scoping from the search filters for reports into the logic of building sets like `editable_line_items` before combining them into the query to reduce the number of `line_item` ids in the IN clause.
 2020-03-21 09:45:33 +01:00
Luis Ramos
0e62dc04bd Improve comments to explain glitch on set_order_cycle and OrderCyclesList 2020-03-20 09:47:59 +00:00
Luis Ramos
e2940eb9ff Add namespace to OrderCyclesList 
Shop will probably be the name of the future engine/domain for the shopfront pages
 2020-03-20 09:47:59 +00:00
Luis Ramos
1c1f066884 Extract Shop::OrderCyclesList from base_controller 2020-03-20 09:47:59 +00:00
Maikel
c4e4beb912 Revert "Inner join visible orders" 2020-03-19 12:01:00 +11:00
Luis Ramos
26769b4150 Add StripeSCA payment authorize and use it both subs_confirm job as well as on teh checkout stripe redirect 2020-03-16 20:04:59 +00:00
Luis Ramos
29377bbff9 Move 5 subscriptions services from app/services to the engines/order_management/app/services 2020-03-16 17:20:01 +00:00
Luis Ramos
ae0ceb61a1 Move ProxyOrderSyncer to OrderManagement engine 2020-03-16 17:20:01 +00:00
Luis Ramos
34fa2d7ad6 Move Subscriptions::PaymentSetup to OrderManagement engine where all subscription code will be at some point in the future 2020-03-16 17:19:04 +00:00
Luis Ramos
25e3f72934 Fix rubocop issues in subs payment_setup 2020-03-16 17:19:04 +00:00
Luis Ramos
523d819575 Move and rename SubscriptionPaymentUpdater to Subscriptios::PaymentSetup to move to services/subscriptions and call it Setup instead to make explicit this is executed before the payment is processed 2020-03-16 17:16:31 +00:00
Luis Ramos
5da47b3f19 Merge pull request #4757 from luisramos0/stripe_sca_extra 
StripeSCA - Handle further SCA auth request when checking out
 2020-03-16 16:45:28 +00:00
Pau Perez
53a63775fe Replace LEFT JOIN with INNER JOIN 
I see no reason why a LEFT might be needed and its the root cause of the
awful performance.
 2020-03-05 17:45:06 +01:00
Maikel
0b18344572 Merge pull request #4790 from mkllnk/4779-payment-method-display 
4779 payment method display
 2020-03-03 10:10:51 +11:00
luisramos0
6877485c90 Extract AuthorizeResponsePatcher from stripeSCA gateway 2020-03-02 17:30:12 +00:00
luisramos0
3fcf286516 Extract PostCheckoutActions from checkout controller 2020-03-02 17:30:12 +00:00
luisramos0
e3ffe8fe6b Add Checkout Stripe redirect logic to get users redirected to stripe authentication pages provided by the stripe API 2020-03-02 17:30:12 +00:00
luisramos0
d91578ab80 Rename checkout payment redirect to checkout paypal redirect 2020-03-02 17:30:12 +00:00
Luis Ramos
dad21a52b2 Merge pull request #4672 from luisramos0/stripe_sca_method 
Add new Stripe payment method compatible with the new Stripe Payment Intents API
 2020-03-02 17:19:05 +00:00
Luis Ramos
a3a61967a8 Merge pull request #4621 from luisramos0/spree_backend_js 
OFN without spree_backend 🎉
 2020-02-22 10:24:50 +00:00
luisramos0
38fd028a9f Fix some rubocop issues from previous commit 2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63 Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions 
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
 2020-02-21 10:52:56 +00:00
Maikel Linke
03fa3e2269 Find last payment deterministically 2020-02-20 15:59:57 +11:00
Maikel Linke
799c1f08de Optimise finding last payment 
Suggested by Rubocop.
 2020-02-20 15:59:56 +11:00
Maikel Linke
6b66458bfd Replace andand with new Ruby syntax 2020-02-20 15:59:56 +11:00
Maikel Linke
3e0a5bac6a Move helper to service for re-use 2020-02-20 15:59:56 +11:00
luisramos0
43280da187 Dup params to avoid nasty effects of a mutated params object in the controller 2020-02-07 10:26:04 +00:00
luisramos0
7eba657b2f Add missing templates from spree_backend 2020-02-05 20:04:15 +00:00