raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 16 Branches 455 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

25833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
60aec2eff0 Update all locales with the latest Transifex translations v3.8.8 2021-07-29 18:42:50 +01:00
Matt-Yorkley
dd59ae7f69 Merge pull request #7997 from openfoodfoundation/dependabot/bundler/redis-4.4.0 
Bump redis from 4.3.1 to 4.4.0
 2021-07-29 19:34:25 +02:00
Matt-Yorkley
f18d075220 Merge pull request #7994 from jibees/5472-add-OC-coordinator-to-list-of-enterprises-fees 
Add order cycle coordinator to the list of enterprises with fees for order cycle incoming products form
 2021-07-29 19:29:00 +02:00
Matt-Yorkley
b22bcd46ff Merge pull request #7993 from openfoodfoundation/dependabot/bundler/haml-5.2.2 
Bump haml from 5.2.1 to 5.2.2
 2021-07-29 13:28:27 +02:00
dependabot[bot]
948bab47b8 Bump view_component from 2.35.0 to 2.36.0 
Bumps [view_component](https://github.com/github/view_component) from 2.35.0 to 2.36.0.
- [Release notes](https://github.com/github/view_component/releases)
- [Changelog](https://github.com/github/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/github/view_component/compare/v2.35.0...v2.36.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-29 09:03:35 +00:00
dependabot[bot]
9b11671d34 Bump redis from 4.3.1 to 4.4.0 
Bumps [redis](https://github.com/redis/redis-rb) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.3.1...v4.4.0)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-29 09:03:11 +00:00
Jean-Baptiste Bellet
09491cfc6d Only return order with the selected shipping rates is true 
Same concept as

https://github.com/openfoodfoundation/openfoodnetwork/blob/master/app/services/search_orders.rb#L31
 2021-07-28 17:05:50 +02:00
Matt-Yorkley
bd041a2e09 Use puma in the test suite and remove server errors hack 2021-07-28 12:43:05 +01:00
Matt-Yorkley
4fe49fe559 Switch from Unicorn to Puma 2021-07-28 12:37:23 +01:00
Jean-Baptiste Bellet
2116779527 Add order cycle coordinator to the list of enterprises with fees 
- Thus, coordinator can choose to add its own fee for a specific supplier
 2021-07-28 11:40:57 +02:00
dependabot[bot]
5024d3b707 Bump haml from 5.2.1 to 5.2.2 
Bumps [haml](https://github.com/haml/haml) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/5.2.1...v5.2.2)

---
updated-dependencies:
- dependency-name: haml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-28 09:02:50 +00:00
Matt-Yorkley
b113162582 Merge pull request #7984 from openfoodfoundation/dependabot/bundler/bootsnap-1.7.6 
Bump bootsnap from 1.7.5 to 1.7.6
 2021-07-28 10:37:20 +02:00
Matt-Yorkley
edb0960a51 Merge pull request #7950 from openfoodfoundation/dependabot/bundler/activerecord-import-1.2.0 
Bump activerecord-import from 1.1.0 to 1.2.0
 2021-07-28 10:35:08 +02:00
Maikel
5e1f1ca81c Merge pull request #7985 from openfoodfoundation/dependabot/bundler/i18n-js-3.8.4 
Bump i18n-js from 3.8.3 to 3.8.4
 2021-07-28 10:17:31 +10:00
Maikel
eeaac6fdb0 Merge pull request #7991 from openfoodfoundation/transifex 
Transifex
 2021-07-28 10:02:43 +10:00
Transifex-Openfoodnetwork
832f08d13a Updating translations for config/locales/de_DE.yml 2021-07-28 09:12:46 +10:00
Matt-Yorkley
e1393c96ca Correctly void transactions when payments are cancelled due to stock issues 2021-07-27 23:24:00 +01:00
Matt-Yorkley
ec84564f28 Add test coverage for TaxHelper 2021-07-27 22:09:14 +01:00
Matt-Yorkley
83f6132b6a Fix shipping tax display in regular invoice template 2021-07-27 22:01:24 +01:00
Jean-Baptiste Bellet
4acc942100 Add appropriate distributors and suppliers to the packing report 
ie. the ones that are distributing/supplying products the current user is distributing/supplying

 - As the orders_and_fullfillment reports already had the right filled distributors and suppliers, use the same method: add_appropriate_distributors_and_suppliers
 2021-07-27 18:06:30 +02:00
Jean-Baptiste Bellet
434f9600b7 Enterprise fee must be linked with an enterprise 
Add 2 validation / errorproof options:
 - Add rails validation on `enterprise_id`  on enterprise_fee model
 - Do not add a blank option on the select: ie. user can select a blank enterprise in the form

Update tests as well
 2021-07-27 15:39:40 +02:00
Matt-Yorkley
440eb2a996 Merge pull request #7987 from openfoodfoundation/transifex 
Transifex
 2021-07-27 14:53:23 +02:00
Transifex-Openfoodnetwork
db0063314b Updating translations for config/locales/en_FR.yml 2021-07-27 22:33:38 +10:00
Transifex-Openfoodnetwork
4e6bc33b05 Updating translations for config/locales/fr.yml 2021-07-27 22:33:04 +10:00
Matt-Yorkley
28fe72c1ec Merge pull request #7976 from openfoodfoundation/transifex 
Transifex
 2021-07-27 14:26:22 +02:00
Matt-Yorkley
886e03af2f Merge pull request #7805 from Matt-Yorkley/adjustments-admin 
[Adjustments] Admin adjustments
 2021-07-27 12:23:29 +02:00
Matt-Yorkley
9d4b34b35b Merge pull request #7977 from Matt-Yorkley/tidy-up 
Spree tidy-up
 2021-07-27 11:52:22 +02:00
Matt-Yorkley
9311070f26 Merge pull request #7979 from Matt-Yorkley/cuprite-update 
Test suite update
 2021-07-27 11:51:17 +02:00
dependabot[bot]
94e0748234 Bump i18n-js from 3.8.3 to 3.8.4 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.8.3 to 3.8.4.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.8.3...v3.8.4)

---
updated-dependencies:
- dependency-name: i18n-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 09:03:51 +00:00
dependabot[bot]
23e336c7ac Bump bootsnap from 1.7.5 to 1.7.6 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.5...v1.7.6)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 09:03:26 +00:00
Matt-Yorkley
a26a78c9fe Merge pull request #7286 from luisramos0/am 
Replace setup_intents class from active merchant v1.98 with a decorator that will change the current v1.119
 2021-07-26 21:29:01 +02:00
Matt-Yorkley
c00ca35f09 Merge pull request #7972 from jibees/#7928-transform-locale-for-flatpickr 
Flatpickr only use language and not locale
 2021-07-26 18:31:14 +02:00
Jean-Baptiste Bellet
57d7191332 Add new step, second one: payment method 
Add payment method form

- select the right form depending on the path
 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
9b29997498 Add selected class on form tab depending on the current path 2021-07-26 15:47:36 +02:00
Andy Brett
3d77ba49ac pseudocode flow for steps 2021-07-26 15:47:36 +02:00
Andy Brett
939169c504 remove unused advance_to_state param 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
91c4beea0f No need to add flash error for error 
as we render error on each input with error
 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
151a6fd16b Add first stimulus controllers to display elements 
1. Introduce a stimulus toggle_controller

 - controller: { "data-controller": "toggle" }
 - action: { "data-action": "toggle#toggle" }
 - show or not: { "data-toggle-show":  true || false  }
- targets: { "data-toggle-target": "content", style: "display: none" }
Display payment method price

2. States are populated via a new dependant_select_controller by stimulus.
Usage:

 - controller : { "data-controller": "dependant-select", "data-dependant-select-options-value": [ [1: ["option", "for", "1"], [2: ["option", "for", "2"] ] }
 - target (on the populating target):  { "data-dependant-select-target": "select" }
 - source and action (on the input that leads the dependant select): {"data-dependant-select-target": "source", "data-action": "dependant-select#handleSelectChange"}
Some improvements on readability

3. Populate ShippingMethod description thanks to "shippingmethod_controller"


+
 - Add countries and states
 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
200ced62fb Load shipping methods in the Controller 
needed to populate the form
 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
1076ec777c Define a method error_message_on to display error by field 2021-07-26 15:47:36 +02:00
Andy Brett
6866cecdfa start with a straight copy of CheckoutController - WIP! 2021-07-26 15:47:36 +02:00
Andy Brett
0ea968a900 add redirection to correct step 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
87a0a5846d WIP; only advance order to delivery state 
Use the hidden_field_tag rails helper and move it
 2021-07-26 15:47:36 +02:00
Andy Brett
af79969d96 add SplitCheckoutController and conditional route 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
49f026629c Add tabs for the new split checkout + first step: your details 
- Add new split checkout for user with `split_checkout` feature
 - Add the first step: Your details
 - with 3 parts : Your details, Billing address and Delivery address
 2021-07-26 15:47:36 +02:00
Matt-Yorkley
4dccd55490 Merge pull request #7981 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.6 
Bump @storybook/addon-docs from 6.3.5 to 6.3.6
 2021-07-26 14:40:30 +02:00
dependabot[bot]
5c350acb1c Bump @storybook/addon-docs from 6.3.5 to 6.3.6 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.5 to 6.3.6.
- [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.3.6/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>
 2021-07-26 11:57:32 +00:00
Matt-Yorkley
110a5ed398 Merge pull request #7982 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.6 
Bump @storybook/server from 6.3.5 to 6.3.6
 2021-07-26 13:53:24 +02:00
Matt-Yorkley
0d4534eff4 Merge pull request #7980 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.6 
Bump @storybook/addon-controls from 6.3.5 to 6.3.6
 2021-07-26 13:53:10 +02:00
dependabot[bot]
b01888f092 Bump @storybook/server from 6.3.5 to 6.3.6 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.5 to 6.3.6.
- [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.3.6/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>
 2021-07-26 09:11:05 +00:00