raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,320 Commits 19 Branches 453 Tags
4ecbbae55e112f086c4a98313fa85d2d3b2efef7
Commit Graph

5747 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
7dc8c4b891 Hide OFN navigation also on small width screens 2023-06-06 14:55:41 +02:00
Jean-Baptiste Bellet
ac30e8b9da Use the white label link if exists, otherwise, use the main_app.root_path 2023-05-31 10:46:23 +02:00
Jean-Baptiste Bellet
eea1db4c4a Hide OFN logo and use the customized logo if activated 2023-05-25 15:17:04 +02:00
Filipe
8b7ca292af Merge pull request #10884 from openfoodfoundation/10882-cookie-banner-is-displayed-on-every-page-even-after-accepting 
Do not show cookies banner once user accept it
 2023-05-25 10:36:27 +01:00
Filipe
6d032002f1 Merge pull request #10750 from jibees/10560-allow-hide-of-groups-tab-in-shop-navigation 
White Label: allow hide of groups tab in shop navigation
 2023-05-24 21:11:04 +01:00
Jean-Baptiste Bellet
3cd53cbd41 Adds some keys to this cached element, due to cookie banner 
Once the user accept the cookie, we should not show the cookie banner element. This is handled via `app/helpers/footer_links_helper.rb#cookies_policy_link` and boolean:

```
!Web::CookiesConsent.new(cookies, request.host).exists? && Spree::Config.cookies_consent_banner_toggle
```
 2023-05-24 10:45:06 +02:00
Konrad
0854287b92 Merge pull request #10744 from jibees/10556-remove-ofn-header-banner-in-order-confirmation-emails 
White Label: remove OFN banner from order confirmation emails when `hide_ofn_navigation` is activated for the shop
 2023-05-24 01:14:16 +02:00
Jean-Baptiste Bellet
0d98ec8f4c In admin, add form to set hide_groups_tab attribute 
+ add specs
 2023-05-22 10:29:56 +02:00
Konrad
fed7c3da51 Merge pull request #10761 from rioug/vouchers-any-amount 
[Vouchers] Flat rate of any amount
 2023-05-19 17:39:33 +02:00
Filipe
0d23b63bbd Merge pull request #10779 from dacook/10634-remove-admin_style_v2 
10634 Remove admin_style_v2 feature
 2023-05-17 15:37:05 +01:00
Jean-Baptiste Bellet
f7d06fe0e8 Do not display OFN banner on subscription confirmation email if white label 
+ add specs that test for the presence of the footer logo which is in the header (I know it's a bit contradictory)
 2023-05-17 11:34:35 +02:00
Gaetan Craig-Riou
b427e420ce Update admin pages to allow entering an amount 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
15eee8175e Add amount to voucher 
Change value to amount to be more consistent
 2023-05-16 16:19:59 +10:00
Maikel
10c918be75 Merge pull request #10732 from mkllnk/report-email 
[Hidden] Notify about completed report with download link via email
 2023-05-16 10:25:23 +10:00
Maikel Linke
299bc253a4 Expire report download links in a month, not 5mins 2023-05-15 19:41:45 +02:00
Maikel Linke
860fe85af9 Add report download link to email notification 
I added a system spec to verify that the download link can be generated
within the mailer in a background job. ActiveStorage is a bit particular
when it comes to genererating URLs and depending on the situation it may
generate a redirect URL, a proxy URL or link directly to the storage.
But we want a redirect URL here.
 2023-05-15 19:41:45 +02:00
Maikel Linke
1f4af7f990 Send (dummy) email when background report is done 
I'll fill it out in future commits.
 2023-05-15 19:41:45 +02:00
Gaetan Craig-Riou
b80274f49d Per review comment, Use named value on voucher submit button to distinguish between submission types 
The voucher apply button is inside form that has another a submit button,
it leads to a weird situation where either one will submit the whole
payments page form. Adding a named parameter on the voucher apply button
means we can distinguish between the two by checking for the presence
of params[:apply_voucher].
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
92bcd937dc Per review comment, remove form object from the partial 
This partial is rendered inside another <form> element, nested form
don't work.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
0a249d7722 Fix ButtonEnableToggleController to remove hacky button disable 
As per review comment, use data-disable-with="false" do prevent Rails
from automatically enabling the "Apply" button. We can then remove
the timeout hack.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
236f6926d9 Cleaning up left over TODOs 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
aa526a639c Checkout payment page, enable voucher "apply" button when code entered 
The "apply" button is disabled by default. If left enabled, a customer
could try to apply an empty voucher, which results in system trying
to move to the order summary step, an unexpected behaviour!
We only enable the button when something is entered in the input.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
815dcbcefe Fix translations 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
3f37554ff9 Add VoucherAdjustmentsController and specs 
Refactor split checkout to use the new controller. But unfortunately
we can't have nested form, so adding a voucher is still handled by
SplitCheckoutController.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
fe9b94a80e Fix cart disappearing bug after adding a voucher 
The split checkout page uses `mrujs` and `CableCar` to set the form as
a remote one and perform `CableCar` operation if any : https://mrujs.com/how-tos/integrate-cablecar
The previous solution broke the cart handled by angularJS, it looks like
`morpdom` (https://mrujs.com/references/remote-forms-and-links Navigation Adapter section )
was doing something that angularJS didn't like when redirecting to
the current page.
With the power of `CableCar`, we now replace the #voucher-section on the
split checkout page instead of doing a redirect.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
d157d91054 When voucher cover more than order total, use only amount needed 
The checkout payment step will also show a warning.
The amount used is stored in the adjustment created, so we will be able
to track how much has been used down the line.
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
74a8730f04 Highlight voucher on order summary step 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
e487ed0532 Add link to remove voucher when a voucher has been applied 
Improve styling to match the design
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
a9d9b33f7d First take at adding a voucher to an order 
Use voucher.create_adjustment to add an adjustment to the order
Currently doesn't take into account tax part
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
Jean-Baptiste Bellet
60edb4363e Fix bad indentation (and hierarchy) 
`%section` must be siblings each others

introduced by https://github.com/openfoodfoundation/openfoodnetwork/pull/10772
 2023-05-12 09:30:37 +02:00
Konrad
2836751698 Merge pull request #10805 from jibees/10717-bo-orders-changing-customer-does-not-update-customer_id 
Admin, Edit customer details for an order: when changing to another customer, update `customer_id` as well
 2023-05-10 19:08:57 +02:00
Matt-Yorkley
1bd9182cea Update menu cache blocks 2023-05-09 16:46:09 +01:00
David Cook
e29df5ea8f Remove unused secondary class 
This partially reverts 97c3aaebb2 because it referred to the new feature toggle which has been removed.
 2023-05-09 21:26:47 +10:00
David Cook
3ec659d82b Revert pull #10025 
[WIP 🚧 ] Admin, behind feature toggle admin_style_v2: adjust some colors

This reverts commits 60f0a58508ce77666fa96c73d76dc0620f23daaf~1..09bcc772ff089f911a56bb
 2023-05-09 21:26:47 +10:00
David Cook
be70cd7893 Revert pull #10054 
[WIP 🚧 ] Admin/Orders, behind feature toggle admin_style_v2: adjust colors

This reverts commits 5cab0f7f3d495daaeb97fd786208a24355b630fe..4ef5609b0eb08fe7e48803de166ae3e979103c1b
 2023-05-09 21:26:47 +10:00
David Cook
0ff540e1e3 Revert pull #10080 
[WIP 🚧 ] Admin - Order edition, behind feature toggle admin_style_v2: adjust colors

This reverts commits faf106b2824f248812f523c10b688bd9b254dc14..74b618230ff736ac7929246e2c83ed95067a4dd0
 2023-05-09 21:25:29 +10:00
David Cook
c21ff075de Revert pull #10131 
[WIP 🚧 ] /admin/order_cycles behind feature toggle admin_style_v2

This reverts commits ccfc632149f062fca546784c7c2f14708d91a08e~1..e403a2c174def34cfa115eab038c86923482bfbf
 2023-05-09 21:24:25 +10:00
Matt-Yorkley
1c277e5547 Cache some html fragments 2023-05-08 14:07:50 +01:00
Jean-Baptiste Bellet
3a1579104f Submit customer_id as params when updating customer details on order 2023-05-04 16:40:58 +02:00
Konrad
b60a6fbd05 Merge pull request #10329 from thejwuscript/9861-improve-input-validation 
Improve input validation on new and edit Payment Method pages
 2023-05-03 16:11:21 +02:00
Konrad
21a0017352 Merge pull request #10756 from jibees/10743-admin-add-unregistered-users-modal-some-html-is-rendered-as-plain-text-instead-of-being 
Admin, Add unregistered user: Fix a reflex-morph issue that lead to a HTML escaping error
 2023-05-02 19:28:48 +02:00
Konrad
d115c4ce2c Merge pull request #10733 from jibees/9782-shops-list-overlapping-and-overflowing-texts-on-mobile2 
Shops list: fix some overlapping and overflowing texts on mobile
 2023-05-02 12:15:19 +02:00
Gaetan Craig-Riou
d1f7cc1b2a Merge pull request #10764 from Matt-Yorkley/remove-data-hooks 
Remove `data-hook` attributes
 2023-05-02 16:35:46 +10:00
Matt-Yorkley
b9431cd121 Remove data-hook attributes 2023-04-28 13:03:13 +01:00
Gaetan Craig-Riou
152af5e105 Merge pull request #10751 from mkllnk/mail-config 
Remove unused feature to intercept emails
 2023-04-28 16:28:41 +10:00
Jean-Baptiste Bellet
959dcb82e1 Morph the form itself instead of morphing a parent DOM element 
This seems to avoid HTML parsing error
 2023-04-26 17:41:28 +02:00
Jean-Baptiste Bellet
b1de28eeea When there is a white_label_logo_link pref. use it! 
+ update spec as well

 + use an an helper to get the main logo link for a shopfront

Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet
35778ecf1d If enterprise has a white_label_logo attached, then can edit its link 2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet
30ba29382a Avoid name collision by renaming some classes with a prefix flex- 
This classes should only be used with `.flex`
 2023-04-26 09:52:24 +02:00