raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-18 00:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,176 Commits 17 Branches 453 Tags
d00e75de70821663fc4e8c8dfafd94f066768c1c
Commit Graph

2250 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
06cbc120f5 Pagination is actually linked to line_items and not orders 
We display line_items as rows in BOM
 2023-02-03 11:37:51 +01:00
Maikel Linke
0fc108a8e6 Remove useless option to allow SSL 
It's an outdated Spree setting. We always enforce SSL in production and
staging while development and test environments are running without SSL.
This setting didn't have any effect.
 2023-01-30 14:19:37 +11:00
Filipe
7b14afbabe Merge pull request #10294 from abdellani/fix_invoice_print_spec 
fix the pending invoice print spec
 2023-01-23 19:06:36 +00:00
Filipe
bc788b6d60 Merge pull request #10243 from jibees/10242-change-how-orders-are-loaded-in-bom-+-filters 
Admin, BOM: add pagination, remove date range filtering on first load
 2023-01-23 17:48:05 +00:00
Mohamed ABDELLANI
9bff2718c7 implement display_line_items_taxes to render included & added tax 2023-01-21 08:16:05 +01:00
Jean-Baptiste Bellet
b559171d0e Put order summary footer into its own file _totals_footer.html.haml 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
3e7e0e4d81 Instead of adding inline style, create a CSS rule 2023-01-20 11:20:35 +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
Jean-Baptiste Bellet
fa8e36fbeb As this is used in a odd/even table, background needs to be transparent 
Otherwise, it's set via `checkout h5`
 2023-01-20 11:20:34 +01:00
Jean-Baptiste Bellet
99fcbad0f0 On split checkout, do not display footer on order summary 
introduced via `display_footer` which is by default `true`
 2023-01-20 11:20:34 +01:00
Jean-Baptiste Bellet
9b4f9314bc Make a proper alignement for filtering options 
I used inline style, because:
 - I didn't find any pre-existing CSS for this page
 - I think that flex is self-explaining and I think adding class (for what?) won't add any value
 2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
455c11c289 Put columns selector component on left, and per_page component on right 2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
35791034cc Remove orders/_per_page_controls and use the shared one 2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
1a874d6fcf Introduce pagination for BOM page 2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
85a748af99 When selecting an OC, do not pre-fill date range with OC date range 
+ update specs as well
 2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
53fa2ef8d5 Change order of the Actions menu: resend, print, cancel 
It's more close to the Actions menu for a specific order (ie. on page `/admin/orders/[ORDER_ID]/edit`)
 2023-01-03 10:32:11 +01:00
Jean-Baptiste Bellet
7e844ee289 Implement resend email confirmation bulk action 
- Create a controller that send a reflex action with the order_ids array
 2023-01-03 10:32:11 +01:00
Jean-Baptiste Bellet
9997fe26fc Small adjustments to make it usable in admin section 2023-01-03 10:32:11 +01:00
Rachel Arnould
6c1c103272 Merge pull request #10080 from jibees/10075-change-edit-order-page-colors 
[WIP 🚧 ] Admin - Order edition, behind feature toggle `admin_style_v2`: adjust colors
 2022-12-30 11:42:23 +01:00
Jean-Baptiste Bellet
74b618230f Put action icons on the same line inside a .flex container 2022-12-30 09:39:01 +01:00
Jean-Baptiste Bellet
7b7718977f Put action icons on the same line with .flex container 
As they are now `display: flex;` (due to alignement of the background, and the icon itself), we are obliged to add this small container
 2022-12-29 14:44:30 +01:00
Filipe
fdc78b717e Merge pull request #10123 from jibees/10017-introduce-a-filter-results-button-on-the-bom-page 
Introduce a filter results button on the BOM page
 2022-12-28 16:55:30 +00:00
ijdershem-jf
ef092dd53a [OFN-9834] Fix red error highlighting on product unit value label 
[OFN-9834] Fix unit value form label association

[OFN-9834] Update tests to reference correct product unit 'Value' field id
 2022-12-24 18:36:41 -07:00
ijdershem-jf
5e0287d93f [9834] Fix red error highlighting on product category select label 2022-12-24 18:13:23 -07:00
ijdershem-jf
58fb2ebe29 [9834] Fix red error highlighting on product unit selection label 2022-12-24 09:44:37 -07:00
Rachel Arnould
7a62a95e0b Merge pull request #10103 from binarygit/stop-horizontal-scroll-of-body-in-order-summary-page 
[Split Checkout] Stop horizontal scroll on body in order summary page
 2022-12-23 10:29:21 +01:00
Filipe
944d552f6b Merge pull request #10156 from ijdershem/idersh/issue-9834-pt3 
[OFN-9834-PT3] Add placeholder for new product supplier field
 2022-12-22 15:42:38 +00:00
Filipe
d61affd82b Merge pull request #10093 from vviekk/viv/noneTranslate 
Translating text 'None' for tax and shipping categories of the product
 2022-12-21 21:45:05 +00:00
binarygit
3b179e75a4 Stop horizontal scroll on body in cart page 2022-12-19 21:30:31 +05:45
Jean-Baptiste Bellet
d8e22a5ee7 Add rounded corner on top of table header 2022-12-16 15:49:38 +01:00
Jean-Baptiste Bellet
819cf5cc49 Add this td even if empty 
easier to design table then
 2022-12-16 15:49:38 +01:00
Jean-Baptiste Bellet
64d467ce39 Specify table#listing_orders and be as generic as possible for table 2022-12-16 15:49:38 +01: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
ijdershem-jf
741dc0e29c [9834-PT3] Add en translation for new product supplier select placeholder 2022-12-14 20:35:19 -07:00
Jean-Baptiste Bellet
87ae8a40d1 Put date filter after the order cycle selector 
it's way easier to understand then that date range could change when selecting order cycle
 2022-12-14 10:13:36 +01:00
Jean-Baptiste Bellet
ac494f97ec When changing order cycle selection, update date range selector value 
Date selector should change when selecting an order cycle in order to reflect the order cycle date range itself
 2022-12-14 10:12:42 +01:00
ijdershem-jf
ea45462e50 [9834-PT3] Add placeholder/default select option for new product supplier field 2022-12-13 18:17:49 -07:00
Jean-Baptiste Bellet
311675f2cf Used an already existing key 
Update bulk_management.html.haml
 2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet
97c3aaebb2 Update the view as well: remove red clear button 
+ remove all `refreshData()` callback on input change
+ align html (add fieldset, legend) to look same as `/admin/orders`
 2022-12-12 16:18:39 +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
vviekk
ccddb7ad65 Transalting text 'None' for tax and shipping categories of the product 2022-12-03 18:36:46 +05:30
Jean-Baptiste Bellet
7556eee5d4 Do not display: flex; a td but its child 
Actually, having `td.actions` with `display: flex;` cancel the `table-cell` height computation and it's then impossible to solve.
The solution here is to have a child (`div.flex`) that is `display: flex` and then the parent `td` can compute its height (as the same than its current row).
 2022-11-28 14:36:51 +01:00
Jean-Baptiste Bellet
7d51bd7b83 Add secondary button 2022-11-25 16:47:48 +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
Jean-Baptiste Bellet
60f0a58508 Add admin-v2 on admin body if admin_style_v2 feature toggled on 2022-11-18 09:46:05 +01:00
Jean-Baptiste Bellet
1a241e4953 Only call confirmRefresh() on time, on date range change 
Previously, when changing the date range, we had several modals that opened.
Now, the `confirmRefresh()` method should be open only one time.

Update specs as well:
 - use the method `accept_confirm`
 - Removing pending and sleep as the spec is now green
 2022-11-03 15:55:48 +01:00
Rachel Arnould
3c9b7a10f4 Merge pull request #9058 from Matt-Yorkley/oidc-redux 
Add OIDC authentication for Les Communs
 2022-10-24 13:18:36 +02:00
jibees
da851079f4 Merge pull request #9776 from abdellani/product-creation-minor-improvements 
Product creation minor improvements
 2022-10-20 17:30:47 +02:00
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00