raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,389 Commits 18 Branches 452 Tags
d00a35e12cbb51201544a042f053e376bb291e39
Commit Graph

1227 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
d7d86729ad Merge pull request #6929 from efgalvao/issue#6892 
Fix the issue #6892
 2021-02-24 20:48:27 +01:00
Matt-Yorkley
9852470ef6 Merge pull request #6913 from Matt-Yorkley/rails-5-backports 
Rails 5 backports
 2021-02-23 11:55:31 +01:00
edmar.galvao@codeminer42.com
cf6fe1a903 Fix the issue #6892 2021-02-21 15:08:50 -03:00
Jean-Baptiste Bellet
424067d2dd Add mandatory class for date input 
- Using flatpickr component, we need to add class to have a beautiful input with white background and pointer hover it.
 2021-02-19 11:22:52 +01:00
Matt-Yorkley
12c9ac7ccd Use params.dig when traversing nested params in views 2021-02-18 13:02:58 +00:00
Pau Pérez Fabregat
a21a8b18b1 Merge pull request #6861 from ccozkan/new-product-form-on_hand-field-improvements 
Remove required field asterisk from on_hand's field on new products form
 2021-02-18 12:39:58 +01:00
Andy Brett
cfd8403125 Merge pull request #6865 from jibees/6833-bom-fix-display-issue-for-product 
Fix some display issues on Bulk Order Management page
 2021-02-16 19:06:42 -08:00
Çağrı Özkan
dee2095a13 Remove required star from on_hand field 2021-02-16 00:23:53 +03:00
Çağrı Özkan
6fad35a975 Checkout upstream's admin/products/new view 2021-02-16 00:22:09 +03:00
Jean-Baptiste Bellet
034153dacf Fix some columns grid system issues 
- Use class directly instead of attribut of element (`.three` instead of `%div{ :class => "three"}` )
 - Correct a lots of bad calculation about columns grid system
 - Use class instead of style if it's possible (`.text-center` instead of `:style => 'text-align: center;'`)
 2021-02-12 10:02:27 +01:00
Andy Brett
7c2febdd78 Merge pull request #6813 from jibees/6795-missing-cases-for-loading-spinner 
Make loading spinner visible
 2021-02-11 10:55:05 -08:00
Andy Brett
5a8a3b8d6b Merge pull request #6822 from arku/chore/cost-price-removal 
Remove cost price field field from product variant form
 2021-02-11 10:48:00 -08:00
Çağrı Özkan
4db41f8a16 Change on_hand's field to number_field and add required attribute 2021-02-10 22:52:31 +03:00
Jean-Baptiste Bellet
6dbaf1f7f3 specify date and datetime format 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
11d62eb331 add translation for "today" and "now" buttons 
and remove useless translations
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
947a9da18b remove useless translations 
as flatpickr is already translated
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
e06ea6ccd3 remove unused options 
as we use flatpickr, we don't need these options
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
4f7f8b559a localize flatpickr date format 
Flatpickr can format date. Use a localized dateFormat.
 2021-02-08 22:09:06 +01:00
Arun Kumar Mohan
beece545de Remove cost price field from product variant form 2021-02-06 18:48:06 -05:00
Pau Pérez Fabregat
35a76a313a Merge pull request #6807 from jibees/6798-new-product-form-fill-all-space 
New Product Form: Fill all space available
 2021-02-04 21:08:56 +01:00
Pau Pérez Fabregat
f6e6b6041c Merge pull request #6734 from coopdevs/disable-ui-mail-settings 
Disable mail methods form so no one can edit
 2021-02-04 17:57:32 +01:00
Jean-Baptiste Bellet
4cb98dd4ac Fill all space available 
These two fields (Display As, and Unit Names) are mutually exclusive: they are never displayed at the same time. Use all the available space.
 2021-02-03 21:44:33 +01:00
Matt-Yorkley
617d914835 Merge pull request #6788 from jibees/6783-align-new-product-form 
Use full width for "new product" form
 2021-02-02 13:11:12 +01:00
Pau Perez
cdcda46bff Re-enable mail_bcc field in mail method settings 
This feels safer because we don't risk messing up with any instance's
operations while still moving us towards removing this page.
 2021-02-02 12:16:55 +01:00
Jean-Baptiste Bellet
a82b24d4c1 specify width and height 
Was too small, almost invisible.
 2021-02-02 11:19:20 +01:00
Pau Perez
063d44fecc Disable mail methods form fields except mails_from 
This moves a step closer to having a simple and straightforward way to
configure the app's mail delivery which doesn't require to be a nuclear
engineer to troubleshoot mail issues.

It happens way too often that servers have mail config broken when
restarted or redeployed and it takes too much brain power to fix it. No
doubt; it's way too complex.

I chose to leave this page's form fields but "Send mails as" as
read-only. This other field is still used by instance manager to
troubleshoot mail issues.
 2021-02-01 18:45:02 +01:00
Jean-Baptiste Bellet
370a108b3d Add stripe account owner selector as a new row 
Otherwise, not displayed.
 2021-02-01 18:00:28 +01:00
Jean-Baptiste Bellet
acbe0faa1e use full width for new product form 
- use the sixteen full width: eight + eight or eight + four + four, ...
 2021-02-01 16:35:55 +01:00
Jean-Baptiste Bellet
adf67475be special aligment for stripe form 2021-02-01 15:39:51 +01:00
Jean-Baptiste Bellet
c44ce85f30 alignment for specific provider settings form in payment method 2021-02-01 15:31:39 +01:00
Jean-Baptiste Bellet
46e6bc6179 align payment method form 
- enlarge the form to be "full size" (four + twelve = 16 columns)
 2021-02-01 15:18:45 +01:00
Jean-Baptiste Bellet
e57acd3163 align shipping method form (editing) 
- use `row` and no more `field` to be consistent
- enlarge the form to be "full size" (four + twelve = 16 columns)
- enlarge "hubs sidebar"
 2021-02-01 15:11:47 +01:00
Pau Pérez Fabregat
45573dc522 Merge pull request #6753 from jibees/6746-epic-fullwdith-admin-layout-quick-wins 
FullWidth admin layout quick wins
 2021-01-28 21:10:06 +01:00
Pau Pérez Fabregat
0a1d4873e3 Merge pull request #6736 from jibees/6707-remove-anchor-jump 
Remove anchor in URL so avoid browser scrolling to the top of the page when editing order
 2021-01-28 21:09:08 +01:00
Pau Pérez Fabregat
2668747237 Merge pull request #6723 from luisramos0/spree_routes_2 
Move spree orders routes out of the spree engine routes into the main app routes
 2021-01-28 16:31:49 +01:00
Maikel
8a757812e7 Merge pull request #6735 from coopdevs/enable-mail-delivery-always 
Enable mail delivery always
 2021-01-28 09:31:12 +11:00
Matt-Yorkley
f49355e5d3 Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments 
Delete dead code Spree::Order#price_adjustments
 2021-01-27 23:29:38 +01:00
Jean-Baptiste Bellet
a6fba8a065 Put content into grid columns system 
Two columns of three + a ten column rather than empty column + content outside column system

correct #6745
 2021-01-27 14:40:50 +01:00
Matt-Yorkley
feca9e7838 Improve hubs sidebar in payment methods edit 2021-01-27 11:38:01 +00:00
Matt-Yorkley
0d99656b1b Adjust dashboard layout 2021-01-27 11:38:01 +00:00
Matt-Yorkley
d886b1dcea Tweak some styles and layout classes 2021-01-27 11:38:01 +00:00
Luis Ramos
d52661fe0a Fix admin order form to use admin orders route 2021-01-25 19:52:48 +00:00
Jean-Baptiste Bellet
686dcaaa1b remove '#' as path for link_to 
Adding '#' to the current url makes most of browser jump to the top of the page. Avoid this by deleting this added # (meaningless) and replacing it by empty string.
 2021-01-25 16:09:12 +01:00
Pau Perez
4a5869b60c Remove ability to toggle mail delivery 
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
 2021-01-25 13:27:44 +01:00
Matt-Yorkley
0247386f82 Delete dead code Spree::Order#price_adjustments 
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
 2021-01-23 00:05:56 +00:00
Andy Brett
0e7f4b2f14 Merge pull request #6537 from mkllnk/simplify-mail-config 
Simplify mail config
 2021-01-21 10:59:43 -08:00
Andy Brett
70f30f5224 Merge pull request #6658 from andrewpbrett/item-counter-fix 
Further fix #5989 (Item counter accepts values higher than the available stock)
 2021-01-21 10:56:18 -08:00
Andy Brett
77419a1e4b Merge pull request #6675 from cillian/single-new-product-view 
Remove ability to create new product from products page, use /admin/products/new instead.
 2021-01-20 19:23:33 -08:00
Andy Brett
ca37976661 Merge pull request #6640 from jibees/2772-loading-spinner-reusable-component 
Create a reusable "loading spinner" component
 2021-01-20 19:21:31 -08:00
Cillian O'Ruanaidh
79668e06a7 Remove ability to create new product from products page, use /admin/products/new instead. 
It's simpler if there is just one place to add a new product. Closes #6650

This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
 2021-01-15 10:24:50 +00:00