raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 17 Branches 454 Tags
4dde49c881b71304ade2984c7cbcd78baedeaeec
Commit Graph

23943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
4dde49c881 Merge pull request #8991 from jibees/8985-Make-checkbox-for-Send-a-cancellation-email-to-the-customer-checked-by-default 
Admin, editing order, on last item deletion modal: "Send a cancellation email to the customer" checked by default
 2022-04-18 14:04:08 +01:00
Filipe
f831154b6f Merge pull request #8950 from jibees/5903-delete-coordinators_fees-linked-to-cloned-OC 
Delete linked coordinators fees when deleting an order cycle
 2022-04-18 11:55:53 +01:00
Filipe
01e915800e Merge pull request #9037 from jibees/9028-last-item-of-order-cancellation 
BOM: show custom modal on last item deletion of an order
 2022-04-15 18:47:51 +01:00
Filipe
4009f3313f Merge pull request #8814 from Matt-Yorkley/tom-select 
Introduce new select/dropdown library
 2022-04-15 18:08:08 +01:00
Filipe
54d64c1c2c Merge pull request #8841 from apricot12/8790_display_stock_left_shop 
Display remaining stock in shopfront if enabled in shop preferences
 2022-04-15 17:58:40 +01:00
Filipe
db3ca2e66e Merge pull request #9098 from mkllnk/toggle-api 
Feature-toggle API also per API key
 2022-04-15 16:14:48 +01:00
jibees
8825ff2711 Merge pull request #9099 from openfoodfoundation/dependabot/npm_and_yarn/async-2.6.4 
Bump async from 2.6.3 to 2.6.4
 2022-04-15 12:03:43 +02:00
dependabot[bot]
0b56cdabea Bump async from 2.6.3 to 2.6.4 
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-15 08:20:54 +00:00
jibees
1149278a48 Merge pull request #9093 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.22 
Bump @storybook/server from 6.4.21 to 6.4.22
 2022-04-15 10:19:53 +02:00
dependabot[bot]
3a4713b8c9 Bump @storybook/server from 6.4.21 to 6.4.22 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.21 to 6.4.22.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.22/app/server)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-15 07:50:33 +00:00
jibees
5635f5ad46 Merge pull request #9096 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.22 
Bump @storybook/addon-docs from 6.4.21 to 6.4.22
 2022-04-15 09:49:35 +02:00
dependabot[bot]
c4431ccac6 Bump @storybook/addon-docs from 6.4.21 to 6.4.22 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.21 to 6.4.22.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.22/addons/docs)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-15 07:27:47 +00:00
jibees
1e4f096639 Merge pull request #9095 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.22 
Bump @storybook/addon-controls from 6.4.21 to 6.4.22
 2022-04-15 09:26:55 +02:00
jibees
6ba255ce85 Merge pull request #9000 from filipefurtad0/adds_coverage_tags_on_details_step 
Adds basic coverage on tag functionality on payment methods
 2022-04-15 09:22:43 +02:00
Maikel Linke
3e02db7bd9 Update translations 2022-04-15 13:06:31 +10:00
dependabot[bot]
86bd6cb102 Bump @storybook/addon-controls from 6.4.21 to 6.4.22 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.21 to 6.4.22.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.22/addons/controls)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-15 02:57:43 +00:00
Maikel
5eca0a7811 Merge pull request #9090 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.18 
Bump karma from 6.3.17 to 6.3.18
 2022-04-15 12:56:56 +10:00
Maikel Linke
ba1e21ad75 Feature-toggle API also per API key 
We looked only at logged in users (session cookie) before.
 2022-04-15 12:34:57 +10:00
Maikel
28de8bbb8d Merge pull request #9083 from filipefurtad0/updating_properties_specs 
Updating properties specs
 2022-04-15 11:25:32 +10:00
Nihal Mohammed
0327cc0d0b Update i18n to be more informative 2022-04-15 10:59:42 +10:00
Nihal Mohammed
15e7a5a4df Rename product_stock_display to product_low_stock_display 
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
 2022-04-15 10:59:42 +10:00
Nihal Mohammed
66386683b6 Add system spec 
Fix linter errors
 2022-04-15 10:56:26 +10:00
Jean-Baptiste Bellet
1ea2656bfb i18n for shop preferences in admin 2022-04-15 10:53:28 +10:00
Jean-Baptiste Bellet
af69064d3a Add mocked shopfront 2022-04-15 10:53:28 +10:00
Jean-Baptiste Bellet
1c68293cac Display remaining stock for variant in the shopfront 
Display only if all conditions are met:
 - Variant is not a bulk buy
 - Shop preference is true for `preferred_product_stock_display`
 - Only 3 (or less) items are remaining in stock
 - No item for this variant is already to cart
 2022-04-15 10:53:28 +10:00
Jean-Baptiste Bellet
143c977a19 i18n for shop preferences 2022-04-15 10:53:28 +10:00
Nihal M. Kelanthodika
356d759dbe Add Display stock option to enterprises form 2022-04-15 10:53:28 +10:00
Nihal M. Kelanthodika
f7a767988c Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well) 2022-04-15 10:53:28 +10:00
filipefurtad0
029df03ee6 Improves naming and styling 2022-04-14 14:40:59 +01:00
jibees
c001463f8a Merge pull request #9091 from openfoodfoundation/transifex 
Transifex
 2022-04-14 15:27:22 +02:00
jibees
727aa553e7 Merge pull request #9088 from mkllnk/9024-setup-script 
Update setup script for removed callbacks
 2022-04-14 14:48:02 +02:00
filipefurtad0
c8b5ce64a4 Adds coverage for hiding payment methods with tags 2022-04-13 23:44:54 +01:00
filipefurtad0
aed757e349 Adds tests on shopfront ordering preference setting 2022-04-13 23:38:03 +01:00
filipefurtad0
18572cbbfa Adds sorting by product to reproduce #9046; sets assertion as pending 2022-04-13 23:38:03 +01:00
filipefurtad0
f3706bdb00 Adds taxon and property filtering 2022-04-13 21:55:23 +01:00
Filipe
cbb9e01a25 Merge pull request #8884 from Matt-Yorkley/image-format-errors 
Patch keyword arguments syntax in Paperclip error handling
 2022-04-13 19:38:07 +01:00
Filipe
94bba56726 Merge pull request #9063 from georgethoppil/select-all-variants 
Add all variants for only one distributor
 2022-04-13 19:37:31 +01:00
Filipe
0cc056ab7f Merge pull request #9071 from Matt-Yorkley/permissions-query-improvements 
Improve permissions query building
 2022-04-13 19:23:13 +01:00
Transifex-Openfoodnetwork
5444d0d0b9 Updating translations for config/locales/de_DE.yml 2022-04-13 23:16:53 +10:00
Filipe
6b1dd00dec Merge pull request #9011 from cillian/validate-subscription-quantity 
Don't allow subscriptions with no quantity to be saved
 2022-04-13 12:03:34 +01:00
Transifex-Openfoodnetwork
aa75c2defe Updating translations for config/locales/en_FR.yml 2022-04-13 20:24:41 +10:00
Transifex-Openfoodnetwork
dd905e4388 Updating translations for config/locales/fr.yml 2022-04-13 20:24:38 +10:00
Filipe
fbe378d3b9 Merge pull request #9074 from hmurali01/translate-shipping-method 
Fixed missing translation: "Shipping method"
 2022-04-13 11:01:16 +01:00
Transifex-Openfoodnetwork
d5fbb40b93 Updating translations for config/locales/en_FR.yml 2022-04-13 19:45:33 +10:00
Transifex-Openfoodnetwork
1dc57a3518 Updating translations for config/locales/fr.yml 2022-04-13 19:44:14 +10:00
dependabot[bot]
c6e982b0f9 Bump karma from 6.3.17 to 6.3.18 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.17 to 6.3.18.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.17...v6.3.18)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-13 09:04:15 +00:00
jibees
0d29fc78c3 Merge pull request #9089 from mkllnk/cuprite-host 
Include port in URLs generated by system specs
 2022-04-13 09:52:47 +02:00
Maikel Linke
4d8c44d890 Include port in URLs generated by system specs 
This means that we can follow generated links, for example in emails and
reach the test app server.
 2022-04-13 15:03:38 +10:00
Maikel Linke
4eb2b5d483 Reduce method complexity 2022-04-13 14:55:54 +10:00
Maikel Linke
a3a1e27cb1 Update setup script for removed callbacks 
We removed some Spree magic a while back and that broke our sample data
script. This is now corrected.

I also added a spec so that we will notice broken seed data earlier.
 2022-04-13 14:48:30 +10:00