raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 21 Branches 450 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

201 Commits

Author SHA1 Message Date
Maikel Linke
d916ed2c96 Remove retired hub_address feature 2025-09-10 09:59:47 +10:00
Maikel Linke
667b49b7f1 Show hub address for pickup only when feature enabled 2025-07-24 15:24:32 +10:00
Maikel Linke
fcd6897240 Prepare delivery details partial for conditional display 2025-07-24 13:30:40 +10:00
Maikel Linke
c23c773942 Simplify view code 2025-07-24 13:30:39 +10:00
David Cook
b5065de7d9 Update app/views/checkout/_tabs.html.haml 
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com>
 2025-03-12 10:01:45 +11:00
David Cook
55cbe51592 Prevent Turbo pre-fetch which changes cart state 2025-03-11 16:19:34 +11:00
David Cook
b9aada47e0 Remove superfluous %div from haml ID elements 
Div is the default element in HAML, so we don't need to specify it.
 2025-03-03 14:46:24 +01:00
David Cook
5a1190cdda Remove superfluous %div from haml elements with class 
Div is the default element in HAML, so we don't need to specify it. https://haml.info/docs/yardoc/file.REFERENCE.html#implicit-div-elements
 2025-03-03 14:46:24 +01:00
Gaetan Craig-Riou
db0547543e Use the new OutOfStockModalComponent 
It will now redirect to the shop page if the out of stock check results
in an empty order
 2025-02-18 10:47:10 +11:00
Gaetan Craig-Riou
ce47f9e700 Fix typo in translation code 2025-02-10 14:58:53 +11:00
Gaetan Craig-Riou
8db2445203 Add comment to make sure both out of stock modal get updated. 
There is no easy way to share template between AngularJS and Rails. The
modal in `edit.html.haml` is a copy of app/assets/javascripts/templates/out_of_stock.html.haml,
so we need to update both if either of them is updated.
 2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
69abdca3ef Fix insufficient stock modal styling 2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
e548e74ebe Update out stock modal 
It replicates the modal used by the cart :
app/assets/javascripts/templates/out_of_stock.html.haml
 2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
c73c2dd8a8 Add basic out of stock modal 2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
d4d995851f Display voucher section if connected to VINE 2024-11-28 13:35:01 +01:00
wandji20
84a2e6c24d Add browser unsaved changes modal when navigation form order sumary page [OFN-11600] 2024-09-27 16:52:55 -06:00
Manuel Gonçalves
1c0a6d1229 Reintroduced changes made in commit #12443 2024-05-20 03:55:49 +01:00
Manuel Gonçalves
50115bdef9 Changes to views/checkout/details.html.haml:line 98 and changes to view/checkout/payment.html.haml:line 32 2024-05-14 10:39:30 +01:00
Manuel Gonçalves
89f7c4e351 Intorduced the simple_format method to the payment method description 2024-05-13 10:34:24 +01:00
Manuel Gonçalves
f7561b428e Intorduced the simple_format method to the shipping method description 2024-05-10 15:49:33 +01:00
filipefurtad0
9926b65bd9 Removes unused haml file 2024-04-15 15:05:53 +01:00
cyrillefr
e6c0afa477 Replace toggle_controller with method inside generic ctrller 
- move toggle method from toggle_controller inside toggle_control
    ctrller
  - change corresponding html attributes in view
  - mode corresponding spec in toggle_controller ctrller spec
  - delete now unused toggle controller + spec
 2024-01-25 10:16:02 +01:00
cyrillefr
8eb5ac990e Replace toggle_button_disable ctrller with generic toggle_control ctrller 
- add enableIfPresent method in toggle_control_controller.js to handle enabling on toggle
- add testing in the corresponding spec
- replace in view previous ctrler with intended generic toggle-control
 2024-01-16 20:35:21 +01:00
Maikel Linke
38843c4d4d Remove use of feature vouchers 2024-01-08 15:53:50 +11:00
Arun Guleria
4e408d404b 11599-Change page title on checkout pages 2023-12-08 09:05:00 +05:30
Cillian O'Ruanaidh
b78258c505 Replace references to :split_checkout translation keys with :checkout in views, controllers, etc. 2023-12-01 12:37:13 +00:00
Cillian O'Ruanaidh
def027efb2 Replace references to split_checkout directory in views and specs 2023-12-01 11:32:55 +00:00
Cillian O'Ruanaidh
222c6d8ac5 Rename app/views/split_checkout directory to app/views/checkout 2023-12-01 11:12:00 +00:00
Mohamed ABDELLANI
fc0cca2210 remove legacy checkout view 2023-06-13 14:58:16 +01:00
Jean-Baptiste Bellet
c99ec38c85 By default, we reject all adjustements with amount equal to 0 2023-01-20 11:20:35 +01:00
ijdershem-jf
0f9f4b07a8 [9845] Make checkout terms and conditions label clickable; associate label with input using correct for attribute 2022-10-27 20:30:42 -06:00
Maikel Linke
4a0ed99919 Replace Paperclip on Enterprise model 
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.

Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
 2022-06-01 17:16:55 +10:00
Matt-Yorkley
04da148af0 Decouple login modal opening from Angular 2022-01-29 10:08:51 +00:00
Matt-Yorkley
2595cb85f7 Merge pull request #8001 from Matt-Yorkley/terms-and-conditionals 
Fix platform terms of service checkbox
 2021-08-05 14:17:48 +02:00
Matt-Yorkley
fc8e69b5de Fix platform terms of service checkbox 2021-07-30 16:50:34 +01:00
Jean-Baptiste Bellet
49f026629c Add tabs for the new split checkout + first step: your details 
- Add new split checkout for user with `split_checkout` feature
 - Add the first step: Your details
 - with 3 parts : Your details, Billing address and Delivery address
 2021-07-26 15:47:36 +02:00
Maikel Linke
af314cbbdf Allow fast checkout without re-accepting old terms 
We did that for the shop's terms already and now do it for the platform
terms as well.
 2021-06-09 14:06:54 +10:00
Maikel Linke
23999c96bf Unify all links to platform Terms of service 
DRY code and have more consistency. We always use "Terms of service" now
and not "Terms of Service" or "Terms and conditions". The latter is used
for the shop's terms, not the platform terms.
 2021-06-09 14:06:54 +10:00
Andy Brett
7df2915fbd add DefaultCountry service 2021-05-18 12:44:53 -07:00
Maikel Linke
20f11327b5 Show combined checkbox when all terms required 
The user should need to tick only one box to agree.

We don't remember yet if someone agreed to the platform TOS and
therefore the box is always unticked to start with.

Remembering the agreement is another issue:
https://github.com/openfoodfoundation/openfoodnetwork/issues/6328
 2021-03-10 17:09:26 +11:00
Maikel Linke
f73c32ce4b Move rendering logic of terms to helper 
Preparing for a third option to display.
 2021-03-10 17:09:26 +11:00
Maikel Linke
4af0e61163 Simplify logic for terms and conditions display 
Checking for `false` instead of a falsey value allows us to distinguish
from an unset variable and disable the checkout button only when a
checkbox is present and unticked.
 2021-03-10 17:09:26 +11:00
Maikel Linke
b266c9df34 Enable checkout button only when terms accepted 
This was working with the seller's terms but now it includes the
platform's terms as well.

Pending:

- Simplify Ansible code
- Unify the two terms checkboxes if both required
 2021-03-10 17:09:26 +11:00
Maikel Linke
561da1f834 Show Terms of Service at checkout if required 
The checkout page shows a checkbox to accept the platform's Terms of
Service. Ticking the box doesn't have any effect yet but at least people
are aware and are presented with a link to the terms.
 2021-03-10 17:09:26 +11:00
Maikel Linke
0e8745adc3 Remove passing of unused variable 2021-03-10 17:09:26 +11:00
Luis Ramos
f3da7afd55 Replace spree_order_path with order_path so we can use scope in the routes file 2021-01-25 19:55:42 +00:00
Luis Ramos
60c3557c2d Fix checkout form order path 2021-01-25 19:52:48 +00:00
Luis Ramos
ad592785cf Rename methods to follwo ruby convention and improve readability 2020-10-30 15:09:13 +00:00
Luis Ramos
f3ba0ebdbb Move code to a new helper 2020-10-30 15:09:13 +00:00
Luis Ramos
4d64bf6ece Add column to customers table to register last time enterprise terms and 
conditions were accepted so customer doesnt have to accept terms on all
checkouts but only when the enterprise updates the terms file
 2020-10-30 15:09:13 +00:00