raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
6ff2d4a9d5 Merge pull request #9109 from apricot12/8917-Link-to-enterprise-site 
Adding a link to enterprise's own site from Order confirmation page.
 2022-06-02 17:59:03 +01:00
Filipe
b3d81154e6 Merge pull request #9174 from georgethoppil/nan-items-subscription 
Updating order cycle will ensure any $NaN subscription item prices to be recalculated
 2022-06-02 17:28:54 +01:00
Jean-Baptiste Bellet
68bd1df312 Handle rename with context menu on the first taxon ie. the root one 
Also rename the main input field (sort of title) when updating the root taxon name with contextual menu
 2022-06-02 16:03:16 +02:00
Jean-Baptiste Bellet
4bbbae68c7 Do not send parent_id is it's something else than a number 
When moving element on top, `new_parent.attr("id")` was `taxonomy_tree` which was causing DB error
 2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
817b5f437f Authorize :position params 2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
121c9eed3b Replace Spree.url().clone() by new URL() 2022-06-02 15:41:44 +02:00
Filipe
4a15ed9b39 Merge pull request #9190 from georgethoppil/duplicate-transaction-fees 
Destroy all adjustments on cart empty
 2022-06-02 11:36:27 +01:00
dependabot[bot]
d3a52303a4 Bump eventsource from 1.1.0 to 1.1.1 
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-02 08:43:58 +00:00
jibees
1d8b8c3be8 Merge pull request #9253 from jibees/fix-deployment 
add `@babel/preset` dependency
 2022-06-02 10:42:18 +02:00
Jean-Baptiste Bellet
454a4e3435 add @babel/preset dependency 
Add to dependencies (not dev ones)
 2022-06-02 10:07:43 +02:00
Maikel Linke
076efd653d Correct checksum of big files stored on AWS S3 2022-06-02 12:28:52 +10:00
Arthur
05c8414e0d Merge branch 'openfoodfoundation:master' into remove-closed-associated-adjustments-button 2022-06-01 16:03:43 -03:00
Maikel Linke
4facab0335 Guard against invariable file types 
Australian production had one JPG image which was not recognised as
such. The `content_type` was missing and trying to generate a URL for a
variant raised an error and crashed the page.

Testing for `variable?` includes testing for `attached?` and is more
defensive.
 2022-06-01 17:16:55 +10:00
Maikel Linke
bea080a9b1 Remove Paperclip 
It has been replaced by Active Storage.
 2022-06-01 17:16:55 +10:00
Maikel Linke
86731d7e30 Remove compatibility code for migrating files 
The migration should be complete now.
 2022-06-01 17:16:55 +10:00
Maikel Linke
b7efa1b018 Replace Paperclip on Spree::Image 2022-06-01 17:16:55 +10:00
Maikel Linke
4a0ed99919 Replace Paperclip on Enterprise model 
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.

Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
 2022-06-01 17:16:55 +10:00
Maikel Linke
45995ac984 Replace Paperclip on EnterpriseGroup 2022-06-01 17:16:55 +10:00
Maikel Linke
421ffae78c Replace Paperclip on TermsOfServeFile 2022-06-01 17:16:54 +10:00
Maikel Linke
f29e569f1b Remove Paperclip migration code 2022-06-01 17:16:54 +10:00
Maikel Linke
727eef3c4f Replace Paperclippable ContentConfig 
The old Paperclip configuration was very clever and easy to use but it
was also a complicated implementation building on the complicated Spree
preference system.

I simplified this with Active Storage, storing simple references to blob
ids and default URLs as backup.
 2022-06-01 17:16:54 +10:00
jibees
ddd9ae6ce2 Merge pull request #9208 from openfoodfoundation/transifex 
Transifex
 2022-06-01 08:06:35 +02:00
Transifex-Openfoodnetwork
fd1cd4a28a Updating translations for config/locales/fr_CA.yml 2022-06-01 09:51:26 +10:00
Transifex-Openfoodnetwork
9261d7b8fe Updating translations for config/locales/en_CA.yml 2022-06-01 09:30:59 +10:00
Mikhail Grigoriev
b169f1baf1 Fix shipped email's tracking information font size using p.lead 2022-05-31 14:39:02 -04:00
Maikel Linke
2e05210596 Preview shipping emails with tracking if present 2022-05-31 14:36:28 -04:00
Jean-Baptiste Bellet
78c2f76a3f Introduce FeatureToggle for columns logic 
relative to a46416a98
 2022-05-31 15:57:39 +02:00
Jean-Baptiste Bellet
c102eecb18 Introduce FeatureToggle for columns logic 
This commit is relative to 9094a65ab commit
 2022-05-31 15:57:39 +02:00
Jean-Baptiste Bellet
a6dc19f717 Introduce FeatureToggle for columns logic 
Key is `report_inverse_columns_logic`

This commit is relative to 985893667 commit
 2022-05-31 15:57:38 +02:00
Jean-Baptiste Bellet
8fec5f1464 Use mixins useRenderCustomer 2022-05-31 09:00:24 +02:00
Jean-Baptiste Bellet
39b7f56e6d Use mixins useSearchCustomer 
Prefer composition vs. inheritance
 2022-05-31 08:57:11 +02:00
Maikel
8645277a05 Merge pull request #9204 from AgriculturaFamiliar/8755-fix-search-input 
Select all text upon focus on map search input for Google Maps
 2022-05-31 10:57:02 +10:00
Maikel
f3d9b3d7ed Merge pull request #9157 from jibees/SC-sort-shipping-methods-case-insenstive 
Split Checkout: Sort shipping methods case insensitive
 2022-05-31 10:54:43 +10:00
jibees
c22c1ddf32 Merge pull request #9243 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.5.6 
Bump @storybook/addon-controls from 6.4.22 to 6.5.6
 2022-05-30 17:41:12 +02:00
jibees
97f0d76fcd Merge pull request #9244 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.5.6 
Bump @storybook/server from 6.4.22 to 6.5.6
 2022-05-30 17:41:01 +02:00
dependabot[bot]
d70acb57b6 Bump @storybook/addon-controls from 6.4.22 to 6.5.6 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.22 to 6.5.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-30 15:18:10 +00:00
dependabot[bot]
ab52028d1c Bump @storybook/server from 6.4.22 to 6.5.6 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.22 to 6.5.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-30 15:17:03 +00:00
jibees
0544baa75c Merge pull request #9245 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.5.6 
Bump @storybook/addon-docs from 6.4.22 to 6.5.6
 2022-05-30 17:16:01 +02:00
Jean-Baptiste Bellet
a46416a98e Change UX to transform from fields_to_hide to fields_to_show 
Fill `params[:fields_to_show]` with its default value
 2022-05-30 15:34:08 +02:00
Jean-Baptiste Bellet
9094a65ab6 Remove fields_to_hide as unecessary 2022-05-30 15:34:08 +02:00
Jean-Baptiste Bellet
9858936677 Starts transforming fields_to_hide to fields_to_show 2022-05-30 15:34:08 +02:00
Jean-Baptiste Bellet
454e4a4100 Initialize on_demand checkbox value 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
70baccd76c Create a method to handle redirect after save 
and the get rid of rubocop linter error
 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
72ce2e5598 Initialize display_as 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
df1b126852 Initialize unit_value_with_description 
+ Specify to empty field since its now filled with default value `1.0`
 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
134202bedd Initialize value for variant_unit_with_scale 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
f6981e4320 Initialize value with ng-model: product.description 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
c78e734dee Initialize with submitted value on_hand 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
be0065ad1a Initialize value with @product.price 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
68f8413cda Remplace collection_select by select and fill the selected item 
+ add tom-select controller
 2022-05-30 14:54:47 +02:00