raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,085 Commits 16 Branches 454 Tags
81890a4e2184a99df74dc4c4674e6827482944ce
Commit Graph

22085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
81890a4e21 Replaces 'background' with 'before' (squashing) 
Replaces 'background' with 'before'

Replaces 'background' with 'before' in other files

Fixes typo on products_spec.rb
 2021-09-28 11:22:35 +01:00
filipefurtad0
6f694e2cab Standardise spec block naming 
The `feature` and `scenario` names are aliases only available in feature
specs and not needed. It's confusing to have different names and we can
easily move feature specs to system specs when using standard names.
 2021-09-28 08:24:05 +10:00
Matt-Yorkley
0f4c8d8ecc Merge pull request #8251 from openfoodfoundation/dependabot/bundler/nokogiri-1.12.5 
Bump nokogiri from 1.12.4 to 1.12.5
 2021-09-27 23:13:06 +02:00
dependabot[bot]
6553136d2d Bump nokogiri from 1.12.4 to 1.12.5 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 20:40:40 +00:00
Matt-Yorkley
9cbdc8293d Merge pull request #8244 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.2 
Bump jest from 27.2.1 to 27.2.2
 2021-09-27 21:36:15 +02:00
Matt-Yorkley
6d1d688b1d Merge pull request #8215 from openfoodfoundation/transifex 
Transifex
 2021-09-27 15:04:24 +02:00
dependabot[bot]
af1e26e9e1 Bump jest from 27.2.1 to 27.2.2 
Bumps [jest](https://github.com/facebook/jest) from 27.2.1 to 27.2.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.1...v27.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 09:07:54 +00:00
Andy Brett
6a50f68b52 Merge pull request #8217 from filipefurtad0/orders_spec_update 
Orders page spec update
 2021-09-24 13:41:06 -07:00
Andy Brett
a137bdd00e Merge pull request #8220 from openfoodfoundation/dependabot/npm_and_yarn/tmpl-1.0.5 
Bump tmpl from 1.0.4 to 1.0.5
 2021-09-24 13:24:31 -07:00
Andy Brett
b593ef78ea Merge pull request #8226 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.0.0-rc.5 
Bump @hotwired/turbo from 7.0.0-rc.4 to 7.0.0-rc.5
 2021-09-24 13:23:00 -07:00
Andy Brett
9e5bc9ba0c Merge pull request #8222 from jibees/8221-show-order-with-line-items-and-finalized-ones 
Show orders with line items + finalized orders
 2021-09-24 13:21:09 -07:00
dependabot[bot]
1953d2164b Bump @hotwired/turbo from 7.0.0-rc.4 to 7.0.0-rc.5 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.0.0-rc.4 to 7.0.0-rc.5.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.0.0-rc.4...v7.0.0-rc.5)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-24 09:09:18 +00:00
Jean-Baptiste Bellet
e82e93e1cc Update test to add more case with finalized order with no line items 
Those empty order but finalized must be returned by the API
 2021-09-23 11:06:58 +02:00
Jean-Baptiste Bellet
78bbee49e9 Search for orders that are finalized 
Thus, we display the orders that contains at least one line item (whatever its state) + the finalized orders

NB // Finalized state : complete canceled resumed awaiting_return returned
 2021-09-23 11:06:15 +02:00
Maikel
5b5693dc26 Merge pull request #8180 from jibees/7504-resolve-rounded-errors 
Avoid rounded with float numbers errors with javascript
 2021-09-23 09:56:03 +10:00
Nihal M. Kelanthodika
f170b4241d Merge pull request #8168 from apricot12/7799-Enterprise-Fee-Report 2021-09-22 20:39:06 +05:30
Maikel
bdc7444422 Merge pull request #8213 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.1 
Bump jest from 27.2.0 to 27.2.1
 2021-09-22 18:13:42 +10:00
Maikel
53ffdaf6de Merge pull request #8212 from openfoodfoundation/dependabot/bundler/bootsnap-1.9.1 
Bump bootsnap from 1.9.0 to 1.9.1
 2021-09-22 18:13:00 +10:00
dependabot[bot]
37c6f11e05 Bump bootsnap from 1.9.0 to 1.9.1 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.9.0 to 1.9.1.
- [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.9.0...v1.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-22 08:10:45 +00:00
Maikel
45fad30f7b Merge pull request #8211 from openfoodfoundation/dependabot/bundler/bugsnag-6.23.0 
Bump bugsnag from 6.22.1 to 6.23.0
 2021-09-22 18:09:24 +10:00
Maikel
3e689b46d0 Merge pull request #8209 from openfoodfoundation/dependabot/bundler/puma-5.5.0 
Bump puma from 5.4.0 to 5.5.0
 2021-09-22 17:10:42 +10:00
Maikel
98db38b0cc Merge pull request #8190 from openfoodfoundation/dependabot/npm_and_yarn/rails/webpacker-5.4.3 
Bump @rails/webpacker from 5.4.2 to 5.4.3
 2021-09-22 17:04:58 +10:00
Maikel
7348ceca64 Merge pull request #8189 from openfoodfoundation/dependabot/bundler/webpacker-5.4.3 
Bump webpacker from 5.4.2 to 5.4.3
 2021-09-22 17:04:02 +10:00
dependabot[bot]
ea21469ff6 Bump tmpl from 1.0.4 to 1.0.5 
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-22 06:34:42 +00:00
filipefurtad0
6000d4c985 Declares variables with let! avoiding repedition (DRY) 2021-09-21 16:33:17 +01:00
filipefurtad0
f2bd45162b Updates base_spec_helper.rb to make system specs work 2021-09-21 16:00:41 +01:00
filipefurtad0
536d4b9894 Updates orders_spec.rb into system spec 2021-09-21 15:58:45 +01:00
Transifex-Openfoodnetwork
17d7270a32 Updating translations for config/locales/nb.yml 2021-09-21 21:31:51 +10:00
dependabot[bot]
a259444129 Bump jest from 27.2.0 to 27.2.1 
Bumps [jest](https://github.com/facebook/jest) from 27.2.0 to 27.2.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.0...v27.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-21 09:06:34 +00:00
dependabot[bot]
5c3e03b86b Bump bugsnag from 6.22.1 to 6.23.0 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.22.1 to 6.23.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.22.1...v6.23.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-21 09:03:35 +00:00
dependabot[bot]
62fd374262 Bump puma from 5.4.0 to 5.5.0 
Bumps [puma](https://github.com/puma/puma) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.4.0...v5.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 09:02:31 +00:00
Maikel
02a10ede15 Merge pull request #7938 from dacook/product-image-import 
Add script to import product images from URL
 2021-09-20 16:57:23 +10:00
Maikel
58c0d30af3 Merge pull request #8207 from openfoodfoundation/revert-8064-Kill_stripe_connect 
Revert "Kill stripe connect"
v4.1.2 		2021-09-20 08:59:16 +10:00
Maikel Linke
4336350140 Updates from Transifex 2021-09-20 08:54:17 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Andy Brett
6ee9daf768 Merge pull request #8198 from openfoodfoundation/dependabot/bundler/bootsnap-1.9.0 
Bump bootsnap from 1.8.1 to 1.9.0
 2021-09-17 08:50:08 -07:00
dependabot[bot]
d086f7694a Bump bootsnap from 1.8.1 to 1.9.0 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.8.1 to 1.9.0.
- [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.8.1...v1.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-17 09:02:52 +00:00
dependabot[bot]
b2fb0366f7 Bump @rails/webpacker from 5.4.2 to 5.4.3 
Bumps [@rails/webpacker](https://github.com/rails/webpacker) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: "@rails/webpacker"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-17 08:53:44 +00:00
Matt-Yorkley
f4c86a1b51 Merge pull request #8061 from Matt-Yorkley/turbo-checkout 
Split Checkout new toys
 2021-09-17 10:48:59 +02:00
Matt-Yorkley
02bcb7bcc7 Merge pull request #8192 from Matt-Yorkley/orders-path-issue 
Fix order_path issue in cart page
 2021-09-16 16:16:36 +02:00
Matt-Yorkley
d55a3f3340 Bump Turbo 2021-09-16 14:12:31 +01:00
Matt-Yorkley
47346e9f2c Uncomment ActionCable in application.rb 
We're not directly utilising it yet, but CableReady expects it to be loaded.
 2021-09-15 18:52:24 +01:00
Andy Brett
f28200164b Merge pull request #8154 from meronokbay/8098-custom-modal-order-deletion 
Replaced the default alert and confirm modals in the order page by custom modals
 2021-09-15 09:22:58 -07:00
Andy Brett
6e674b47ac Merge pull request #8153 from sinansonmez/6140-change-profile-link-based-on-enterprise-profile 
update profile link based on enterprise profile
 2021-09-15 09:22:03 -07:00
Matt-Yorkley
0c879dc4c9 Fix order_path issue in cart page 
The order_path route wasn't being inferred correctly from this Spree controller, causing errors to be thrown in the cart page if the number of editable orders was precisely one:

ActionView::Template::Error: undefined method `order_path'
 2021-09-15 10:54:59 +01:00
dependabot[bot]
a1f7d8753b Bump webpacker from 5.4.2 to 5.4.3 
Bumps [webpacker](https://github.com/rails/webpacker) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.2...v5.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-15 09:03:58 +00:00
Nihal M. Kelanthodika
9d216f0cea Merge pull request #8160 from apricot12/8019-Delivery_report 
Show order total in Delivery/Payment Method reports instead of first …
 2021-09-15 13:11:43 +05:30
Maikel
16aeb16519 Merge pull request #8172 from openfoodfoundation/dependabot/bundler/activemerchant-1.123.0 
Bump activemerchant from 1.121.0 to 1.123.0
 2021-09-15 17:14:29 +10:00
Andy Brett
2f5f2a03dd Merge pull request #8182 from openfoodfoundation/dependabot/bundler/test-unit-3.4.7 
Bump test-unit from 3.4.6 to 3.4.7
 2021-09-14 11:02:48 -07:00
Andy Brett
8c78316718 Merge pull request #8181 from openfoodfoundation/dependabot/bundler/rubocop-1.21.0 
Bump rubocop from 1.20.0 to 1.21.0
 2021-09-14 11:02:19 -07:00