raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,695 Commits 18 Branches 455 Tags
584a25052fa1ec873d763a5173ecf00a8ffdacf1
Commit Graph

5816 Commits

Author SHA1 Message Date
Maikel
101e72726c Merge pull request #11032 from dacook/show-current-version2 
Show current version2
 2023-06-19 10:07:49 +10:00
Matt-Yorkley
d3a31bd0bd Rename @invoice_presenter instance variable to @order in invoice templates 2023-06-18 21:03:13 +02:00
Matt-Yorkley
352ad20681 Fix display_checkout_taxes_hash in invoice_table4 template 2023-06-18 21:03:13 +02:00
Matt-Yorkley
5bbc63f716 Fix options_text displaying when there is no options_text 2023-06-18 21:03:13 +02:00
Matt-Yorkley
208840b99d Use @invoice_presenter.checkout_adjustments 2023-06-18 21:03:13 +02:00
Matt-Yorkley
a44f24ad43 Remove prefixes from invoice data representation so it conforms to the same interface as order 2023-06-18 21:03:13 +02:00
Matt-Yorkley
8dba1618b1 Don't call information from @order in new invoice templates 
Previously this template was calling various bits of data from the @order object and not the @invoice_presenter object
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d86173c509 add feature toggle 
seperate the invoice templates that rely on presenters from the old ones.
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0fbf88190e Generate invoice model 
There are three main components:
1. The invoice model
2. order serializers: serialize the order for the invoice
3. data presenters: the object that will be use to access the order's serialize data
 2023-06-18 21:03:13 +02:00
David Cook
56e4b3b843 Load git version once at initialisation 
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2023-06-16 09:36:16 +10:00
David Cook
35d9837f24 Show current version at bottom of admin dashboard 
With generic link to the releases page. We could provide a link to latest tag with `git describe --tags --abbrev=0`. But I thought it better to keep things simple.
 2023-06-16 09:11:59 +10:00
Matt-Yorkley
5ad37ce6a5 Return default image url on ActiveStorage errors in image loading 2023-06-14 12:53:20 +01:00
Matt-Yorkley
6f12d012ed Use #url helper 2023-06-14 10:56:10 +01:00
Mohamed ABDELLANI
fc0cca2210 remove legacy checkout view 2023-06-13 14:58:16 +01:00
Konrad
fc09f95fa1 Merge pull request #10961 from jibees/10946-white-label-trix-editor-changes-on-the-custom-tab-content-do-not-trigger-the-update-button 
[WhiteLabel] Make update button active when changing custom tab content
 2023-06-09 21:46:02 +02:00
Konrad
bd505bbee7 Merge pull request #10959 from jibees/10945-white-label-narrow-screen-width-no-marging-on-custom-tab-content 
[WhiteLabel] Add some margin to custom tab content for a shop
 2023-06-09 19:45:04 +02:00
Konrad
502b5e8664 Merge pull request #10937 from jibees/10900-white-label-remove-ofn-navigation-for-small-width-screens 
[White Label] Remove ofn navigation for small width screens as well when option is activated
 2023-06-09 16:28:22 +02:00
Jean-Baptiste Bellet
74fd1814e4 Create a trixeditor controller and broadcast a change event on form 
Therefore, AngularJS can set form as dirty

+ add associated spec
 2023-06-09 08:03:17 +02:00
Matt-Yorkley
f4261b85b8 Merge pull request #10940 from Matt-Yorkley/order-tidyup 
Order class tidyup
 2023-06-08 15:06:59 +01:00
Jean-Baptiste Bellet
05104841cd Add some margin to custom tab content via columns css class 2023-06-08 11:36:06 +02:00
David Cook
7d26158e06 Code cleanup 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-08 11:31:37 +10:00
Matt-Yorkley
e1b37090be Use _path helper instead of _url 2023-06-07 00:58:43 +01:00
Matt-Yorkley
6e8ed1f612 Hide secondary form until the order has line items 2023-06-07 00:58:43 +01:00
Matt-Yorkley
c7bb24e2a0 Remove dead code and clarify update logic 2023-06-07 00:58:43 +01:00
Matt-Yorkley
67c3e09dba Use RESTful routes for orders controller actions 2023-06-07 00:35:47 +01:00
Matt-Yorkley
2bfb57a1a1 Clarify shipments partial inclusion 2023-06-06 14:59:53 +01:00
Matt-Yorkley
8813edaed8 Fix variables in form partial 2023-06-06 14:59:03 +01:00
Jean-Baptiste Bellet
7dc8c4b891 Hide OFN navigation also on small width screens 2023-06-06 14:55:41 +02:00
Matt-Yorkley
05a715a43a Remove Order #distribution_set? method 2023-06-05 21:30:46 +01:00
Jean-Baptiste Bellet
2e0191e603 Improve UX: same as enterprise logo and promo image 2023-06-01 17:16:22 +02:00
Filipe
12159edaca Merge pull request #10833 from Matt-Yorkley/order-angular 
Remove Angular from admin orders index page
 2023-06-01 13:57:39 +01:00
Matt-Yorkley
1128fd9c02 Visual tweak to ship/capture buttons and success feedback 2023-06-01 12:13:12 +01:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00
Matt-Yorkley
3e5ecba738 Remove unhelpful Helper 2023-06-01 10:11:20 +01:00
Filipe
6b98e2b3cb Merge pull request #10911 from jibees/10901-white-label-customized-logo-on-small-screens-doesnt-use-the-customized-url 
[White Label] Small width screens : use the white label link if exists for logo in nav bar
 2023-06-01 08:16:53 +01:00
Filipe
2d4d8e26f5 Merge pull request #10875 from jibees/10561-allow-user-to-create-custom-tab-in-shop-navigation 
[White Label] Allow user to create custom tab in shop navigation
 2023-06-01 07:21:25 +01:00
Filipe
5f429c77f8 Merge pull request #10791 from dacook/10630-new-brand-colours 
[admin_v3] New brand colours in admin interface
 2023-05-31 16:03:18 +01: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
6b29f7e3c5 Sanitize content with a new TrixScrubber 
specifically made for trix editor with its allowed tags
 2023-05-26 15:19:27 +02:00
Jean-Baptiste Bellet
f26ecdf4f9 Don't need to pass the order through the nested view 2023-05-26 15:19:27 +02:00
David Cook
dcf857cafb Move warning colour definition to CSS 
This also changes the orange to red, but that's part of the plan.
 2023-05-26 15:11:23 +10:00
David Cook
31fa9c2c04 Add admin_style_v3 feature toggle 2023-05-26 15:10:27 +10: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
Jean-Baptiste Bellet
e434eb17f0 Use full width since we use a WYSIWYG editor with toolbar 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
bb211bfc84 Allow HTML via trix editor for custom tab content 
+ update spec as well
 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
6e677f15ec Can delete custom tab if uncheck the checkbox 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
f0665b0862 Add custom tab on shop 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
916b2313ab Some links does not include _panel suffix. Add if needed. 
Yep. Sounds like a hack.

+ Use the right URL anchor with `_panel` in href for each tab

+ update specs
 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
fc21fdb485 Customize default tab: could be either shop or home 2023-05-25 09:19:51 +02:00