raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,679 Commits 18 Branches 454 Tags
c7c19e47de2a53c2cae6befb56f7980cc78bb80c
Commit Graph

1548 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
f9f6793d10 Add template and basic controller for backoffice voucher pages 2023-03-28 13:39:29 +11:00
Konrad
c887efee54 Merge pull request #10519 from vviekk/viv/10515 
Removing 'none' from shipping categories from product edit page
 2023-03-27 14:01:11 +02:00
vviekk
9a10c8c25a Removing none from shipping categories from product edit page 2023-03-27 11:56:10 +05:30
Konrad
4c61666fc7 Merge pull request #10547 from vviekk/10419 
Enable invoices config only controls Print bulk action
 2023-03-26 13:53:20 +02:00
Konrad
0c6a12a6f0 Merge pull request #10241 from binarygit/provide-err-msg-when-using-text-in-var-field 
Admin, edit variant: only allow numerical values for weight, height, width and depth fields
 2023-03-26 13:03:20 +02:00
Filipe
8bef0f9a43 Merge pull request #10337 from jibees/9419-send-invoices-per-email-in-bulk-from-the-admin-orders-page 
Admin, orders list page: send invoices per email in bulk
 2023-03-17 10:58:26 +00:00
Filipe
e8430eae6d Merge pull request #10460 from jibees/10400-pagination-in-bom-not-aggregating-results-from-quick-search-field 
BOM: Add a search input that search for items with pagination
 2023-03-15 16:31:32 +00:00
vviekk
c1c0eca7c4 Enable invoices config only controls Print bulk action 2023-03-13 11:39:21 +05:30
binarygit
fd81429f39 Specify weight, height, width and depth as numeric field 2023-03-01 16:32:18 +01:00
Jean-Baptiste Bellet
ebd5d706c2 Add search input 
Actually this only search for `order_email` or `order_number` or `product_name` or `supplier_name`

+ Improve display by reduce each columns width
 2023-03-01 14:40:12 +01:00
Maikel
bccee0698f Merge pull request #10332 from jibees/8901-allow-product-description-to-show-images-in-the-shopfront 
Shopfront: Allow product description with formatting and `<img />`
 2023-03-01 09:56:41 +11:00
Jean-Baptiste Bellet
8658b1a743 Remove quick filter that search only on displayed line items 
+ remove specs as well
 2023-02-28 15:39:31 +01:00
Jean-Baptiste Bellet
5e61aa8a77 Create the bulk send invoice action in order list 
using the same pattern than SendConfirmationEmail action

Co-Authored-By: David Cook <david@redcliffs.net>
 2023-02-27 14:30:59 +01:00
Konrad
8b89c8d7e0 Merge pull request #10451 from cyrillefr/Sort-properly-date-chronologically-and-not-lexicographically 
Sort correctly in Bulk Order Managment
 2023-02-22 14:39:03 +01:00
cyrillefr
c015b2066f Sort correctly in Bulk Order Managment 
Converting date to utc + iso8601 format is
    sufficient to ensure proper sorting.
 2023-02-20 21:41:58 +01:00
Konrad
f7f49377b4 Merge pull request #10297 from cyrillefr/convert-admin-order-cancellation-workflow-to-stimulus-reflex 
Convert admin order cancellation workflow to stimulus reflex
 2023-02-20 21:38:33 +01:00
Ana Nunes da Silva
8dc50caaa8 Remove print ticket action 2023-02-14 08:08:20 +00:00
Jean-Baptiste Bellet
80ba228910 Partial is used in two different contexts: orders and line_items 
Distinguish them by adding a local variable model that could either be `orders` or `line_items`
 2023-02-07 18:10:29 +01:00
cyrillefr
597e9eae2b Modify view to call Stimulus controller 
- Also add call to a new Modal confirm component for
   handling of bulk orders cancellings
 2023-02-06 19:47:36 +01:00
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
Jean-Baptiste Bellet
6d68460950 Factorize sanitizer options between edition and displaying 
by using the same `app/services/content_scrubber.rb`
 2023-01-26 18:21:27 +01:00
Jean-Baptiste Bellet
970b7b6738 Allow attributes src (and alt) to display image for product description 
on admin ie. `/admin/products/bread/edit`
 2023-01-26 17:42:09 +01: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
c99ec38c85 By default, we reject all adjustements with amount equal to 0 2023-01-20 11:20:35 +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
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
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
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