raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-15 04:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,138 Commits 16 Branches 457 Tags
34829ea53e82fbb9bd6300a86675831e690de1a3
Commit Graph

2416 Commits

Author SHA1 Message Date
David Cook
0966864589 Merge pull request #11511 from dacook/fix-update-button-11349 
Fix Update button sizing
 2023-09-14 13:37:19 +10:00
David Cook
2e6e083667 [fixup] Fix Update button sizing 
By disabling line wrap we can consistently predict how it will appear. The longest translation we currently have is 14 characters so this should be fine.
 2023-09-14 09:37:10 +10:00
Gaetan Craig-Riou
8face3d182 Merge pull request #11488 from macanudo527/fix_helperinstancevariable_2 
Fix Rails/HelperInstanceVariable 2
 2023-09-08 19:51:39 +10:00
David Cook
99da60921f Fix Update button sizing 
This was broken when upgrading [Foundation](https://github.com/openfoodfoundation/openfoodnetwork/pull/11349). For some reason the button.expand class now sets larger font size and padding, which overrides the button.small class. It's probably a bug but we'll have to work around it.
 2023-09-08 10:20:26 +10:00
Filipe
ccabf5936d Merge pull request #11505 from drummer83/master 
[Super admin] Highlight 'Configuration' tab on 'Terms of Service' page
 2023-09-07 18:00:18 +01:00
drummer83
13d5b954e6 Add 'Terms of Service' to the tabs 2023-09-06 23:18:00 +02:00
Neal Chambers
b1e40ed605 Fix Rails/HelperInstanceVariable 2023-09-06 22:36:46 +09:00
Pedro Carmona
51050036d4 Use instance default locale as the default locale for a new user 2023-09-05 01:00:35 +01:00
Pedro Carmona
c4830e3baa Send localized email when creating users via admin interface 
Based on the current user locale
 2023-09-05 01:00:35 +01:00
Jean-Baptiste Bellet
b6b64e9439 Add trix editor to new product form 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
3225c52898 Actually, this should not be sanitize before going through trix editor 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
e200eccc42 Replace angular editor by trix editor 2023-09-04 15:46:54 +02:00
Neal Chambers
4feb8f922e Fix Rails/HelperInstanceVariable in injection_helper.rb 2023-09-01 11:03:26 +09:00
Maikel Linke
d8da808901 Resolve pending spec, reported issue is fixed 2023-08-25 15:48:31 +10:00
Mohamed ABDELLANI
04312b05c6 add orders without billing address to SearchOrders#fetch_orders' results 2023-08-25 15:48:31 +10:00
Matt-Yorkley
2b9b79c828 Remove product display_as cell 
This was attempting to reference the master variant, which is now gone. Fixes an Angular scope error.
 2023-08-18 17:38:36 +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
Maikel
6377149e18 Merge pull request #11400 from jibees/buu-update/refactor-tests 
🚧 BUU: refactor/improve testing
 2023-08-17 16:32:00 +10: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
Matt-Yorkley
eefc356472 Update shipping_category usage in admin pages 2023-08-14 21:02:47 +01: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
620dd70dd7 rename 'new invoice' button to 'create or update invoice' 2023-08-10 09:35:13 +10:00
Rachel Arnould
4505beff98 Merge pull request #11327 from bouaik/fix-display-invoice-tab-for-completed-resumed-canceled-only 
Fix display invoice tab for completed, resumed and canceled orders only
 2023-08-09 18:37:02 +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
Mohamed ABDELLANI
6c53f3b8b0 move pretty_date helper into invoice presenter 2023-08-03 15:12:02 +01:00
Mohamed ABDELLANI
d044959cec fix date formatting 
implement a new helper `pretty_date`
 2023-08-03 14:55:26 +01:00
Mohamed ABDELLANI
1a8c0f18b7 order invoices by "created_at desc" on the default scope 2023-08-03 14:55:26 +01:00
Mohamed ABDELLANI
8fecc9db4b render date without time on invoices list 
+ sort invoices in the reverse order of the creation time
 2023-08-03 14:55:26 +01:00
bouaik
2c08602664 fix display invoice tab 2023-08-03 11:25:31 +01:00
Filipe
46cb1add63 Merge pull request #11126 from abdellani/show-invoice-number-on-invoices 
Show invoice number on invoices
 2023-08-03 10:48:34 +01:00
Filipe
c0a4bccb3e Merge pull request #11156 from Matt-Yorkley/product-tax-category 
[Product Refactor] Tax category
 2023-08-03 10:29:40 +01:00
Konrad
44d25dbb6a Merge pull request #11299 from cillian/order-name-sorting 
Sort orders by last name, then first name i.e. the same way bulk order management works
 2023-08-02 11:30:25 +02:00
Mohamed ABDELLANI
7d38a7b381 remove order number next to Tax Invoice 2023-07-31 17:01:36 +01:00
Mohamed ABDELLANI
8abb9d2ecf add invoice number to alternative invoices 2023-07-31 16:31:24 +01:00
Mohamed ABDELLANI
e66cd5aaa3 add order number & invoice number to invoices 2023-07-31 16:31:24 +01:00
Matt-Yorkley
5a48721af4 Update serializers, views, and JS for bulk products edit 2023-07-31 09:23:20 +10:00
Matt-Yorkley
a52516bcbf Move tax_category dropdown in edit pages 2023-07-31 09:23:20 +10:00
Cillian O'Ruanaidh
276b94de5b Sort orders by last name, then first name i.e. the same way bulk order management works 2023-07-28 14:20:29 +01:00
Jean-Baptiste Bellet
8b4de3ddc7 Add version into its own .row .columns with centered text 2023-07-27 15:41:54 +02: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
Filipe
0d0beda887 Merge pull request #11084 from abdellani/update_invoice_status_automatically 
set invoice status automatically after creation
 2023-07-21 16:21:05 +01:00
filipefurtad0
4b64b9085c Adds missing keys 2023-07-20 19:18:27 +01:00
Filipe
308ce9263d Merge pull request #11170 from jibees/11160-bulk-actions-function-not-working-on-safari-mac-browser 
Admin, Orders: Make bulk actions dropdown re-enabled for Safari browser
 2023-07-13 17:17:18 +01:00
Filipe
448d5ea017 Merge pull request #11135 from Matt-Yorkley/vouchers 
Vouchers part 2
 2023-07-13 12:50:32 +01:00
Jean-Baptiste Bellet
6143f4ce6f Use dropdown controller to manager actions dropdown in orders page 2023-07-11 10:48:52 +02:00
Mohamed ABDELLANI
4b003aa08b replace status:status with cancelled:boolean on invoice model 2023-07-11 09:15:25 +01:00
Filipe
f0bcb79c09 Merge pull request #11169 from openfoodfoundation/11164-admin-orders-actions-dropdown-is-not-well-placed 
Fix container issues introduced by #11123
 2023-07-07 11:15:14 +01:00