raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,627 Commits 19 Branches 453 Tags
7a10edff82ebace36fa18f8830951ff4ccdbb271
Commit Graph

14652 Commits

Author SHA1 Message Date
Konrad
7a10edff82 Merge pull request #10988 from jibees/10980-white-label-trix-bullets-and-numbers-are-displayed-outside-the-text-field 
[White Label] Custom tab content editor: order and unordered list should have a margin-left set
 2023-06-15 16:13:19 +02:00
Maikel
701fef84f3 Merge pull request #10850 from mkllnk/require-belongs-to--part1 
Require belongs_to associations - part 1
 2023-06-15 09:20:42 +10:00
Filipe
e6d42a0c4f Merge pull request #10999 from Matt-Yorkley/bom-issues 
Fix BOM order loading issue
 2023-06-14 19:01:54 +01:00
Maikel Linke
91d0dabc1d Require associations on DistributorShippingMethod 2023-06-14 15:09:12 +10:00
Maikel Linke
bd11475fe1 Require associations on DistributorPaymentMethod 2023-06-14 15:08:22 +10:00
Maikel Linke
ed231ec512 Update belongs_to default in Customer model 2023-06-14 15:08:05 +10:00
Maikel Linke
fc00a48d67 Require associations of CoordinatorFee 2023-06-14 15:08:05 +10:00
Maikel Linke
c02c90317f Require user of column preference record 
It doesn't make sense to have a preference without a user. And it was
already enforced in the database.
 2023-06-14 15:07:43 +10:00
Maikel Linke
2d4cfd7548 Validate and enforce AdjustmentMetadata associations 2023-06-14 15:07:43 +10:00
Maikel Linke
d88781a083 Start to adopt new default to require belongs_to 
Newer version of Rails have this option as default. We can slowly
transition to opt in gradually, model by model. Once all models are
covered, we can change the default and remove the setting from the
models again.

The style violation was added to the todo file because it's temporary.

We have 60 models using `belongs_to`. And changing them all at once
breaks some specs. So let's do it gradually.
 2023-06-14 15:06:59 +10:00
Matt-Yorkley
73b2d37224 Don't try to load orders if the number of line_items with the current filters applied is zero 
This ends up sending a request to the orders endpoint with no filters and no search params, which then tries to load every order in the entire database if the user is superadmin, which blows up.
 2023-06-13 15:47:19 +01:00
Matt-Yorkley
4e7fab6914 Delete dead code Checkout#find_transition 
This method is only called from tests and nowhere else in the codebase. We may as well remove it.
 2023-06-13 14:58:16 +01:00
Matt-Yorkley
5487aa19fc Fix missing checkout_state_path 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
907c65d98c run create_tax_charge! after transition to payment state 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
c2aaf88e98 remove checkout controller 2023-06-13 14:58:16 +01:00
Mohamed ABDELLANI
fc0cca2210 remove legacy checkout view 2023-06-13 14:58:16 +01:00
Matt-Yorkley
abd55b2104 Move order to completed whether it's current state is payment or confirmation 2023-06-13 10:14:09 +01:00
Matt-Yorkley
47df9493ae Fix ProcessPaymentIntent service 2023-06-13 10:14:09 +01:00
David Cook
e4c65ea87d Prettify palette file 2023-06-13 11:46:28 +10:00
David Cook
f007cf3dad Fix up table borders 2023-06-13 11:45:39 +10:00
David Cook
edcdcd3f74 Use header colour for table headers 2023-06-13 11:45:39 +10:00
David Cook
16534319b6 Replace dark blue with "Sherpa blue" 
It looks like it’s used in headers, some buttons and a loading message
 2023-06-13 11:45:39 +10:00
David Cook
d85ea628e2 Change default font colour to near-black 
It looks like this is the main font colour in the new designs.
 2023-06-13 11:45:39 +10:00
David Cook
821446e150 Style pagination links 
And provide a basic hover state for most other buttons.
The pagination button hover and active states will need updating.

The darker background colour sometimes wraps a whole table (eg products table).
 2023-06-13 11:45:39 +10:00
David Cook
744f95809a Remove uppercase styling of form elements 2023-06-13 11:45:39 +10:00
David Cook
fb17a679c0 First pass at new table colours 
There is more to do, for example the dropshadows.

I've continued with the unopinionated colour naming (eg color-7), but would like to consider giving them more meaningfule names..
 2023-06-13 11:45:39 +10:00
David Cook
2ae91bdbe2 Use variable for font size reset 
The current value is 13px already, but I'd like to experiment changing this.

I'm not sure if we even need the reset, but am not delving into that right now.
 2023-06-13 11:44:48 +10:00
David Cook
3967f54533 Use different variables and table styles for admin_v3 2023-06-13 11:44:48 +10:00
Konrad
a207a445b1 Merge pull request #10907 from jibees/3041-missing-translation-in-product-variant-selection-upon-order-creation 
Admin, Create an order, Select a product: translate some messages in the product selection search box
 2023-06-12 17:08:52 +02:00
Jean-Baptiste Bellet
16256ee114 Order and Unordered list should have a margin-left set 
Has been reset to 0 via `typography.scss`
 2023-06-12 16:58:00 +02:00
Konrad
48c107bde1 Merge pull request #10974 from cillian/ignore-whitespace-in-product-import 
Ignore leading and trailing whitespace when importing products via a spreadsheet
 2023-06-12 16:32:15 +02:00
Jean-Baptiste Bellet
149ec5511c Translate select2 messages 2023-06-12 15:11:23 +02:00
Gaetan Craig-Riou
41b3ddae08 Merge pull request #10714 from macanudo527/fix_linelength 
Fix Style/LineLength
 2023-06-12 09:53:23 +10:00
Konrad
fc09f95fa1 Merge pull request #10961 from jibees/10946-white-label-trix-editor-changes-on-the-custom-tab-content-do-not-trigger-the-update-button 
[WhiteLabel] Make update button active when changing custom tab content
 2023-06-09 21:46:02 +02:00
Konrad
13037d2d9d Merge pull request #10949 from jibees/10630-buu-as-an-enterprise-user-i-can-see-the-back-office-with-new-brand-colours 
[`admin_style_v3`] As an enterprise user i can see the back office with new brand colours
 2023-06-09 21:24:01 +02:00
Konrad
9125c730ed Merge pull request #10960 from jibees/customize-trix-editor-to-have-the-right-colors 
[White Label] Customize colors of custom content editor to have beautiful toolbar
 2023-06-09 20:35:36 +02:00
Matt-Yorkley
70170078d1 Merge pull request #10976 from Matt-Yorkley/payment-localized-number 
Require localized_number in Payment class
 2023-06-09 18:45:13 +01:00
Konrad
bd505bbee7 Merge pull request #10959 from jibees/10945-white-label-narrow-screen-width-no-marging-on-custom-tab-content 
[WhiteLabel] Add some margin to custom tab content for a shop
 2023-06-09 19:45:04 +02:00
Matt-Yorkley
24200de8dd Require localized_number in Payment class 
There seems to be some contexts (jobs for subscriptions) where the Payment class loads but LocalizedNumber is an undefined constant. It lives in the /lib directory so it's not auto-loaded.
 2023-06-09 18:16:37 +01:00
Konrad
d0f4c44add Merge pull request #10938 from jibees/10931-white-label-custom-tab-without-a-title-impossible-to-disable-the-custom-tab 
[White Label] Validate the presence of a custom tab title before creating it (+ max 20 characters length)
 2023-06-09 19:01:13 +02:00
Cillian O'Ruanaidh
5cde4de512 Ignore leading and trailing whitespace in spreadsheet when importing products 2023-06-09 16:23:18 +01:00
Konrad
502b5e8664 Merge pull request #10937 from jibees/10900-white-label-remove-ofn-navigation-for-small-width-screens 
[White Label] Remove ofn navigation for small width screens as well when option is activated
 2023-06-09 16:28:22 +02:00
Konrad
35fef9e7ac Merge pull request #10876 from dacook/prettier-css-admin 
Prettier css admin
 2023-06-09 16:02:11 +02:00
Neal Chambers
9a8551e3ea Shorten Where Statement 2023-06-09 16:39:29 +09:00
Neal Chambers
a35a07b441 Rewrite sum to be more Readable 2023-06-09 16:39:29 +09:00
Neal Chambers
449430cabc Indent code to be more Readable 2023-06-09 16:39:29 +09:00
Neal Chambers
252697b782 Rewrite If and Unless Statements to be more Readable 2023-06-09 16:39:26 +09:00
Jean-Baptiste Bellet
74fd1814e4 Create a trixeditor controller and broadcast a change event on form 
Therefore, AngularJS can set form as dirty

+ add associated spec
 2023-06-09 08:03:17 +02:00
Filipe
ca03e1596b Merge pull request #10952 from Matt-Yorkley/full-name 
Improve nil-safety in variant naming methods
 2023-06-08 16:26:28 +01:00
Filipe
c12415a340 Merge pull request #10955 from Matt-Yorkley/bulk-invoice-bug 
Ensure directory exists before saving invoices pdf
 2023-06-08 15:22:27 +01:00