raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,988 Commits 18 Branches 452 Tags
482d438ec93f91bcc4f6aafa307fdfa2cffeb4d9
Commit Graph

14320 Commits

Author SHA1 Message Date
Konrad
1176ea2a5f Merge pull request #9941 from basilawwad/conditionally-send-cancellation-email 
Conditionally send cancellation email when cancelling order.
 2023-04-28 21:54:42 +02:00
Gaetan Craig-Riou
152af5e105 Merge pull request #10751 from mkllnk/mail-config 
Remove unused feature to intercept emails
 2023-04-28 16:28:41 +10:00
Jean-Baptiste Bellet
b1de28eeea When there is a white_label_logo_link pref. use it! 
+ update spec as well

 + use an an helper to get the main logo link for a shopfront

Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet
679fcc0114 When removing the logo, also delete white_label_logo_link preference 
since it has no sense without the logo
 2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet
35778ecf1d If enterprise has a white_label_logo attached, then can edit its link 2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet
70a6e9f44b Add a white_label_logo_link attribute to enterprise model 2023-04-26 11:04:47 +02:00
Maikel Linke
dae8703b02 Remove unused feature to intercept emails 
This option came from Spree and we never used it. The config input field
is disabled in the admin interface and I checked our managed databases.

I don't think that we will want this feature in the future either.
Staging sends unmodified emails which is more realistic and we haven't
had a use case to intercept those emails. There's still the BCC option
if we need additional access.
 2023-04-26 13:50:31 +10:00
Konrad
00d5bd9165 Merge pull request #10684 from MadisonBowron/master 
Fix admin product variants form to close issues #10579 & Wishlist: 430
 2023-04-24 18:18:01 +02:00
Konrad
75b5d1fd6f Merge pull request #10712 from jibees/6133-backoffice-orders-endless-spinner-and-error-500-after-skipping-oc-selector 
Admin, create new order: distributor and order cycle are now mandatory on step 1 (aka the set_distribution step)
 2023-04-22 16:04:15 +02:00
Konrad
0c1606e50c Merge pull request #10728 from jibees/10718-missing-translation-confirmation-order-state 
Admin, `/orders`: adds translation for order in `confirmation` state
 2023-04-22 11:56:23 +02:00
Gaetan Craig-Riou
3810d79cad Merge pull request #10695 from macanudo527/rename_inversables 
Rename Inversable Method Names
 2023-04-21 11:38:58 +10:00
basilawwad
fa373518fb applied modal function 
Update variant_autocomplete.js.erb

Applied modal function

refactored function

fix indentation and removed old function
 2023-04-20 11:46:02 +02:00
Jean-Baptiste Bellet
76357789a3 Avoid line break between state wording and its little colored circle 2023-04-20 09:09:29 +02:00
Jean-Baptiste Bellet
5dd7246b85 Rename confirm to use confirmation 
`confirmation` is the state used by order model
 2023-04-20 09:07:01 +02:00
Jean-Baptiste Bellet
92e2a83e0e Use Rails7 command for image variant syntax 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
f42f513f8c Display white_label_logo image when hide_ofn_navigation is set to true 
for both desktop and mobile view
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
54342254b6 Do not show white label logo is hide_ofn_navigation is not checked 
They are both strongly linked
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
470761da86 Add a simple CheckboxDisplay controller that show/hide content 
depending on the checkbox state (checked or not)
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
6fdf9fa038 Add/Remove white label logo in enterprise preferences panel 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
bbec01a9cb Create a concern for reflexes that handle Enterprise update 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
e3001cc8c4 Add white_label_logo to enterprise model as attachment 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
ad0d0e393e ConfirmModalComponent is ready to receive data-reflex 
And not only `data-action`
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
2690ff5eb5 Add comment, which links these two files together 2023-04-20 08:45:03 +02:00
Filipe
3e0b358370 Merge pull request #10461 from vviekk/9978 
Updating price, on_hand, on_demand validations for product import
 2023-04-19 16:09:49 +01:00
Filipe
f206b7ed9e Merge pull request #10661 from mkllnk/report-download 
[Hidden] Provide download link for reports generated in the background
 2023-04-19 11:53:14 +01:00
Jean-Baptiste Bellet
0f54d3950d Save can have a context: simplify then 2023-04-19 10:15:35 +02:00
Jean-Baptiste Bellet
7e306693a8 Use Rails standard naming: same name for the route and the method 2023-04-19 10:15:35 +02:00
saunmanoj888
97f51d24b8 Validate image on creating product from products/new 2023-04-19 16:11:46 +10:00
saunmanoj888
c3d274c84f Fix corrupt and invalid image upload issue 2023-04-19 16:11:46 +10:00
Maikel
0b03152f3b Merge pull request #10697 from mkllnk/rubocop-config-update 
Update Rubocop config and replace deprecated TimeWithZone#to_s with argument
 2023-04-19 11:23:34 +10:00
Maikel
6f492d868c Merge pull request #10688 from mkllnk/application-mailer 
Apply Rails standard to base mailer class
 2023-04-19 10:29:16 +10:00
Neal Chambers
4e32bfd70b Rename Inversable Method Names 2023-04-18 22:58:06 +09:00
Konrad
2fa86492d1 Merge pull request #10653 from openfoodfoundation/10645-pagination-in-bom-not-aggregating-results-when-clicking-a-productvariant 
BOM: When selecting a specific variant, trigger a new search that avoid pagination issues
 2023-04-18 14:49:14 +02:00
Jean-Baptiste Bellet
722c660697 Do not show any links to other steps when no distribution set 
distribution means tuple: distributor + order cycle
 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
ac666a6fce Validate presence of distributor and order_cycle in set_distribution step 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
ba1d985932 update the set_distribution form on the same path 
and use the same method `OrdersController#set_distribution`
 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
0f28d318ac Fix rubocop error and prefer using a return clause 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
6172d1f2e5 Extract method on_update that will be used elsewhere 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
05a040b4c3 No need to ensure if the distribution is set on new action 
This will be handled by validation on set_distribution action
 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
73a81310f8 Create a new url /orders/ORDER_ID/distribution 
That handles the step when distributor and order_cycle must be selected
 2023-04-18 14:21:23 +02:00
David Cook
ee37c5d4a3 Merge pull request #10699 from dacook/sass-deprecations 
Sass deprecations
 2023-04-18 11:48:56 +10:00
Jean-Baptiste Bellet
11a7aa9f96 When clicking on "Clear Filters" button, to not reset variant selection 
+ add some specs to cover that particular case
 2023-04-17 11:08:17 +02:00
Konrad
1b536d9265 Merge pull request #10601 from abdellani/fix-v1-customers-endpoint-should-only-return-managed-enterprise-customers 
fix: v1/customers endpoint should load customers of managed enterprises only
 2023-04-16 16:22:02 +02:00
David Cook
29b9777a96 Replace deprecated sass division operator 
https://sass-lang.com/documentation/breaking-changes/slash-div
> Sass currently treats / as a division operation in some contexts and a separator in others. This makes it difficult for Sass users to tell what any given / will mean, and makes it hard to work with new CSS features that use / as a separator.

There's a handy migrator:

    npm install -g sass-migrator
    sass-migrator division **/*.scss

And it cleverly avoids the need for the ugly division method in most cases.
 2023-04-14 17:59:01 +10:00
David Cook
283dd84ad6 Add expected whitespace 
The migrator refused to proceed until I fixed this.
 2023-04-14 17:56:24 +10:00
Maikel Linke
03828c5608 Style Rails/ToSWithArgument 2023-04-14 16:34:51 +10:00
Maikel Linke
dad4061ff9 Style Rails/ToFormattedS 2023-04-14 16:32:39 +10:00
Maikel Linke
407fca17cb Style Rails/IndexWith 2023-04-14 16:19:21 +10:00
Maikel Linke
42585bb074 Remove redundant cop disable directive 2023-04-14 16:04:57 +10:00
MadisonBowron
697f2795d4 Remove arbitrary comments 2023-04-14 01:25:14 -04:00