raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,634 Commits 20 Branches 453 Tags
44b4c29b77a021fd3b2b09b54500c2f2b330c3d5
Commit Graph

3649 Commits

Author SHA1 Message Date
wandji20
44b4c29b77 Remove unused logic for checking unregistered user 2024-10-30 23:05:55 +01:00
wandji20
696c42cba4 Add print and capture permission for orders 2024-10-30 23:05:55 +01:00
wandji20
0b9724fbdb Move invite enterprise user reflex logic to enterprise controler 2024-10-30 23:05:55 +01:00
wandji20
6ee0bc99c1 Move admin remove terms and condition logic to enterprise controller 2024-10-30 23:05:55 +01:00
wandji20
303d993cc4 Move User accept_terms_of_services action to admin user controller 2024-10-30 23:05:55 +01:00
wandji20
a7e5e9bfc9 Fix rubocop errors 2024-10-30 23:05:55 +01:00
wandji20
1f77f190da Move orders reflex logic to admin orders controller 2024-10-30 23:05:55 +01:00
wandji20
908c54f78c Remove white_label reflex and handle remove enterprise logo wth turbo stream 2024-10-30 23:05:55 +01:00
wandji20
039c46cadd remove cable ready from application controller and refactor shared/alert to resend email confirmation with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
c35dae6378 Handle admin search orders with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
766396b979 Handle enterprise edit response with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
636d4b64db Handle order voucher responses with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
7c943dfc79 Handle order checkout responses with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
912c11a3f5 Handle user registration responses with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
1af298555b Handle user password responses with turbo_stream 2024-10-30 23:05:55 +01:00
wandji20
742d0d8fae Handle user confirmation responses with turbo_stream 2024-10-30 23:05:54 +01:00
wandji20
996057b940 Handle user session responses with turbo_stream 2024-10-30 23:05:54 +01:00
Gaetan Craig-Riou
b461d499ad Merge pull request #12914 from mkllnk/remove-stock-location-from-return-authorization 
Remove StockLocation from ReturnAuthorization
 2024-10-16 10:26:09 +11:00
Filipe
97b6289263 Merge pull request #12787 from rioug/move-variant-unit-attributes-to-variant 
[Product Refactor] Move variant unit sizes to variant
 2024-10-15 19:58:45 +01:00
Maikel Linke
a64aea4b9c Remove StockLocation from ReturnAuthorization 
We have only one default location and don't need it associated to
anything.
 2024-10-15 13:36:57 +11:00
Rachel Arnould
f54552f939 Merge pull request #12886 from rioug/12855-VINE-connected-app 
[Citi OFN Voucher] Add VINE connected app
 2024-10-14 15:32:09 +02:00
Gaetan Craig-Riou
3bb2232bc1 Remove non updatable check when updating a product 
After the product redactor it only checked for the "description" on
product, which is actually skipped when doing an update.
 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
9db417319d Improve variant related validation when creating product 
I disabled Metrics/AbcSize for ensure_standard_variant as I don't think
that's hard to understand the code. And utimately it will be removed
once product actually becomes optional.
 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
218d07c90d Fix product import controller 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
4ad6971121 Fix Bulk product edit system spec after rebase 2024-10-14 15:01:18 +11:00
Maikel Linke
95ff0d8d4a Fail gracefully on DFC product import errors 2024-10-11 12:10:23 +11:00
Maikel Linke
260e7ba817 Update products when importing them multiple times 
Instead of creating a new variant every time.
 2024-10-10 16:57:58 +11:00
Maikel Linke
a838ef4a21 DRY DFC product import 2024-10-10 14:04:54 +11:00
Maikel Linke
71ca292c92 Synchronise stock with DFC catalog during checkout 
This will delay the checkout request by a few seconds if there's stock
to sync. But we minimise the chance of missing reduced stock from orders
on another platform.

We still have a gap between the checkout and placing a backorder. In
that time we can't guarantee enough stock. But let's tackle that after
the pilot.
 2024-10-09 14:47:07 +11:00
Maikel Linke
adf0340153 Remove duplicate method 
The method `CheckoutCallbacks#valid_order_line_items?` was a duplicate
of `OrderStockCheck#valid_order_line_items?`.

Apparently, it had been extracted twice:

 * 1d074c2151
 * 06eb98bdf4

But the first commit duplicated the method while the second moved the
original declaration.
 2024-10-08 16:57:36 +11:00
Gaetan Craig-Riou
df67b53971 Re add VINE_API_URL env variable 
And add error handling if the variable is not set
 2024-10-08 13:26:57 +11:00
Gaetan Craig-Riou
b14a1e72f3 Handle api secret 
The VINE Api require a secret and an API key to be used. The secret is
used to sign the request. The secret is linked to the API key so we need
to store it along side the key.
 2024-10-07 15:09:58 +11:00
Maikel Linke
61aa02b3c3 Sync stock with DFC catalog after cart update 2024-10-04 16:25:17 +10:00
Gaetan Craig-Riou
22428fc78d ConnectedApps controller, handle ConnectedApps::Vine 
Add logiv to connect and disconnect VINE API plus spec
 2024-10-02 16:44:27 +10:00
Filipe
da0660c119 Merge pull request #12857 from chahmedejaz/task/12626-add-clone-failure-explaination 
[BUU] Fix No explanation why cloning failed
 2024-09-27 17:58:31 -06:00
Filipe
562a24524b Merge pull request #12848 from rioug/12770-product-preview 
Product preview
 2024-09-19 15:20:18 -06:00
Gaetan Craig-Riou
68fa903d61 Add missing permission check on buu action 
Plus request spec
 2024-09-18 10:24:09 +10:00
Gaetan Craig-Riou
40c4d38e45 Add permission check 2024-09-17 12:01:53 +10:00
Ahmed Ejaz
2a4d275f4b 12626: use rails default error messages 2024-09-14 02:44:43 +05:00
Ahmed Ejaz
c08683412c 12626: add a fallback message 2024-09-13 01:43:37 +05:00
Ahmed Ejaz
4a38d7ef57 12626: add explaination for clone failure 2024-09-12 03:47:53 +05:00
Gaetan Craig-Riou
f24a4edc68 Add product detail to the modal 2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
4756ab47c2 Wire preview link via turbo-stream 2024-09-10 13:29:39 +10:00
Maikel
e9c7e1778c Merge pull request #12782 from mkllnk/reports 
Add fallback report loading in case websockets fail
 2024-08-23 09:23:42 +10:00
wandji20
95135ca526 Move order_cycle datetime verification logic to service files [OFN-12775] 2024-08-22 22:17:12 +01:00
Maikel Linke
23aa762be2 Add fallback report loading in case websockets fail 
This also resolves a race condition scenario. Even if the report gets
rendered via websockets before the controller response is rendered then
the fallback script loads the report again. It's not the most beautiful
but probably okay until we replace websockts altogether.

I'm leaving websockets in at the moment because it can render the report
much quicker than polling can.
 2024-08-16 15:24:34 +10:00
Maikel Linke
d354317c73 Replace cable_ready report loading w/ Turbo stream 
I'm adding TurboPower for the scroll_into_view action. It adds all the
nice CableReady actions to Turbo Streams.

Note that I omitted `block: "start"` because that option is the default
in Javascript. And the generic `action` method doesn't support
parameters like this anyway. I'll work on that in the next commit.

I also re-introduced a race condition by rendering the "loading"
indicator after triggering the report rendering job. I'm planning to
resolve that later.
 2024-08-16 14:37:57 +10:00
Maikel Linke
19ef047193 Create observable reports blob early 
This will allow us to check for completion of the report later in case
websockets fail.
 2024-08-16 14:37:57 +10:00
Maikel Linke
037eb456c0 Remove unused controller ivar 2024-08-16 14:37:57 +10:00
Maikel Linke
aed78f3138 Simplify reports controller code branching 2024-08-16 14:37:57 +10:00