raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 18 Branches 451 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

221 Commits

Author SHA1 Message Date
David Cook
b8f8d6d042 Show/hide columns with CSS selectors instead 
Well, that made the JS way simpler.

Adds a lot of classes though. Maybe we could do it based on column index instead, but this will do for now.
table.hide-col0 { td:nth-child(0) { display: none; } }
 2024-06-18 15:35:53 +10:00
Filipe
b67eba2130 Merge pull request #12454 from arunguleria/12372-Add-MissingTranslations 
12372-[Admin] Missing translations  page titles
 2024-05-15 20:39:22 +01:00
Filipe
59e04cc549 Merge pull request #12376 from cyrillefr/MakeShipOrderButtonWorksOnPageOrderDetails 
Fix Ship Order menu choice not working
 2024-05-15 17:57:25 +01:00
Arun Guleria
c84be2f396 12372-Add missing translation page titles 2024-05-09 15:12:03 +05:30
Ahmed Ejaz
86f88792c2 11058: add sortable products by name 2024-05-08 12:56:41 +05:00
cyrillefr
ba68f4b252 Fix 'Ship Order': requested changes 
- deletes local variables in view
- factor logic in helper
 2024-05-07 19:15:00 +02:00
cyrillefr
901c29c97b Fix Ship Order menu choice not working 
- Front End ShipOrderComponent was missed for the menu to work
 - updated spec to test for a specific case
 2024-05-07 19:15:00 +02:00
Filipe
de9446f5f3 Merge pull request #12167 from mkllnk/haml-up 
Update Haml syntax and gem to version 6
 2024-03-07 15:36:29 +00:00
cyrillefr
428b9b273c Replace old dropdown controller by new one 
- menu items line are unchanged only beggining of file modified
 2024-02-25 16:43:57 +01:00
Maikel Linke
ba51641271 Symbolise hash keys in HAML files 
This was done by the haml-up script.
 2024-02-22 15:01:14 +11:00
Maikel Linke
c097f2b622 Upgrade HAML syntax with script 2024-02-22 15:01:13 +11:00
cyrillefr
b8743d853f Actions dropdown should stay closed after shipping order 
- added hidden css class for it to stay closed.
 2024-01-24 08:35:55 +01:00
binarygit
e865f27158 Provide correct modal-link-target-value and write tests for orders#edit page 2024-01-14 15:33:31 +05:45
binarygit
267e749369 Show same dialog box when shipping order through the actions dropdown 2024-01-14 15:06:02 +05:45
bouaik
fde7c34287 fix highlighting 2023-12-21 21:16:39 +01:00
David Cook
655c16cca0 New bulk products screen shares path with old 
The feature toggle will determine which bulk products screen shows. An additional products_old path is also temporarily added for easy reference.

Later, when the old screen is full removed, we'll probably rename the _v3 classes to tidy up.
 2023-10-13 10:39:45 +11:00
David Cook
99205e435c Show only the new products page in the menu 
When the feature toggle is enabled, we don't want to see the old products page. It's a bit broken and causes confusion. But we still want to be able to access it by the URL for now.
 2023-10-10 22:09:26 +11:00
Mohamed ABDELLANI
dce096a56e check if invoices feature is enabled for the current user before showing invoices tab 2023-10-08 21:47:17 +02:00
drummer83
13d5b954e6 Add 'Terms of Service' to the tabs 2023-09-06 23:18:00 +02:00
Konrad
f3b09508ff Merge pull request #11347 from abdellani/fix-edit-order-button 
fix cancel order button
 2023-08-18 17:07:42 +02:00
David Cook
8949f1dc2e Convert route to resource 
I don't know why the route helper now has "index" in the name.
 2023-08-15 08:36:21 +02:00
Mohamed ABDELLANI
8370d7ce83 Update app/views/spree/admin/shared/_order_links.html.haml 
Co-authored-by: jibees <jb.bellet@gmail.com>
 2023-08-13 13:12:56 +01:00
Jean-Baptiste Bellet
3b68674896 Remove new_products_page and all associated controller/components/ 
new_products_page` is dead, long live `admin_style_v3` !
 2023-08-10 10:02:45 +02:00
Mohamed ABDELLANI
c185a47592 render the confirm model on the same component that includes the action on the order. 2023-08-08 07:32:20 +01:00
bouaik
41d649404f make suggested changes 2023-08-04 00:55:35 +01:00
bouaik
2c08602664 fix display invoice tab 2023-08-03 11:25:31 +01:00
David Cook
8ef73906db Show products_v3 in the submenu 
It's not translated, but that doesn't matter, it's just a shortcut while we're developing it.
 2023-07-25 15:31:57 +02:00
David Cook
439c0a8e18 Remove unnecessary match_path options 
Spree::Tab already knows when to highlight these, based on the controller name. It even handles sub-paths like '/admin/products/garlic/edit'.
 2023-07-25 15:31:57 +02:00
Jean-Baptiste Bellet
ce28c14544 Replace AngularJS directive to a StimulusJS one 
Delete _order_links.html.haml_spec.rb
 2023-06-21 10:29:48 +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
Matt-Yorkley
f4261b85b8 Merge pull request #10940 from Matt-Yorkley/order-tidyup 
Order class tidyup
 2023-06-08 15:06:59 +01:00
David Cook
7d26158e06 Code cleanup 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-08 11:31:37 +10:00
Matt-Yorkley
67c3e09dba Use RESTful routes for orders controller actions 2023-06-07 00:35:47 +01:00
Matt-Yorkley
05a715a43a Remove Order #distribution_set? method 2023-06-05 21:30:46 +01: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
David Cook
31fa9c2c04 Add admin_style_v3 feature toggle 2023-05-26 15:10:27 +10:00
Matt-Yorkley
048df6230b Remove angular from admin orders index page 2023-05-21 00:15:32 +01:00
Matt-Yorkley
f181b35a90 Add minimal admin js setup 2023-05-20 19:47:41 +01: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
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
Jean-Baptiste Bellet
722c660697 Do not show any links to other steps when no distribution set 
distribution means tuple: distributor + order cycle
 2023-04-18 14:36:47 +02:00
Gaetan Craig-Riou
f9f6793d10 Add template and basic controller for backoffice voucher pages 2023-03-28 13:39:29 +11:00
Jean-Baptiste Bellet
ada76a9bf7 Create a palette mixin that override global color variables 
This is widely used elsewhere and especially for all the state colors
 2022-12-16 15:48:26 +01:00
Jean-Baptiste Bellet
1869536529 Install view_component_reflex + cable_ready 
+ Add stimulus reflex in the admin section

 + log stimulusreflex

 + Create channel and connection

 + Some logging options

 + Create application_controller each stimulus reflex controller should inherits from this one
 2022-12-07 15:08:52 +01:00
Jean-Baptiste Bellet
d7d29e3654 Create a new controller for new products page 
Controller is constrained by FeatureToggle

- new_products_page
 - and available on '/new_products'

Add simple view for new products page and a product

Add new products page as a new entry in the menu
 2022-12-07 15:08:52 +01:00
Jean-Baptiste Bellet
85d3f5f9d7 Download OpenSans font also at 700 weight 
needed in the navigation
 2022-11-21 09:48:35 +01:00
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
binarygit
ebe4a3d6ab Add StimulusReflex 2022-09-29 16:03:45 +02:00
Filipe
dd17f98edb Merge pull request #9196 from jibees/8912-change-order-creation-form-steps-order 
Admin, Order creation: Change steps ordering
 2022-08-03 09:09:43 +01:00