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
21,829 Commits 18 Branches 452 Tags
759c5d6bdd7364cfb61aa0ccbcda3c22b6065617
Commit Graph

21829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Brett
759c5d6bdd don't override existing addresses on order with AddressFinder 2021-08-25 13:11:48 -07:00
Jean-Baptiste Bellet
b5024c5a16 On summary page, display shipping address as well as billing one 2021-08-25 16:31:45 +02:00
Jean-Baptiste Bellet
642e822e0e button is rounded 2021-08-25 15:58:55 +02:00
Jean-Baptiste Bellet
10ddaf4384 Last step (ie. summary) is larger than the two previous step 2021-08-25 15:53:22 +02:00
Jean-Baptiste Bellet
75390d2a48 Specify right i18n key 2021-08-25 15:29:24 +02:00
Jean-Baptiste Bellet
82ea33e9ca Do not display ship address form if not needed 
ie. the shipping method does not require any address
 2021-08-25 11:10:47 +02:00
Andy Brett
d86148420a improve shipping_method_id handling 2021-08-24 12:29:48 -07:00
Andy Brett
7dd2c09641 ensure terms are accepted before order is placed 2021-08-24 12:29:23 -07:00
Andy Brett
3414d9f057 clear errors on ship address as well 2021-08-24 12:15:20 -07:00
Andy Brett
71076d36a1 favor dig to protect against nils 2021-08-24 11:54:02 -07:00
Andy Brett
c02b5ccd85 Fix typo in translation 2021-08-24 11:47:05 -07:00
Andy Brett
ea6739d565 guard against a nil value for @order.user 2021-08-24 11:46:50 -07:00
Andy Brett
874e1d7f02 only advance order to payment if no payment exists 2021-08-24 11:23:08 -07:00
Andy Brett
417770e716 guard against nil when populating ship address 2021-08-24 11:22:20 -07:00
Andy Brett
ea695105b5 populate ship address with bill address if no ship address 2021-08-24 10:57:36 -07:00
Jean-Baptiste Bellet
9fd126ca0f The ship address is filled from bill address for some attributes 
firstname, lastname and phone are the same between those two address. Fill it automatically.
 2021-08-23 15:42:29 +02:00
Jean-Baptiste Bellet
1ecfeca88c Populate view with both shipping_method_id & ship_address_same_as_billing 
... and then handle correctly the display of the form
 2021-08-23 15:23:53 +02:00
Jean-Baptiste Bellet
fe65359d71 Display no shipping method selected error 2021-08-23 10:16:53 +02:00
Andy Brett
3bee30ac60 clear error messages on order and bill address on first load 2021-08-20 09:18:08 -07:00
Jean-Baptiste Bellet
26c5361b0a set shipping method only if param is present 2021-08-20 09:18:08 -07:00
Andy Brett
138b7824ba remove ship address if shipping method does not require it 2021-08-19 10:18:11 -07:00
Andy Brett
dd00c30503 fill ship address with bill address if checkbox is checked 2021-08-19 10:17:51 -07:00
Andy Brett
c07046e2f6 return an error if no shipping method is selected 2021-08-19 10:16:46 -07:00
Jean-Baptiste Bellet
402bfdac30 Show/Hide shipping address form depending on the checkbox/radio state 2021-08-19 10:34:07 +02:00
Jean-Baptiste Bellet
c806b3e889 Be more generic: address is enough 
as it could be billing or shipping address
 2021-08-19 10:33:16 +02:00
Andy Brett
68311f8fa4 Merge pull request #8073 from openfoodfoundation/dependabot/bundler/pagy-4.10.2 
Bump pagy from 4.10.1 to 4.10.2
 2021-08-18 09:47:37 -07:00
dependabot[bot]
828e06b271 Bump pagy from 4.10.1 to 4.10.2 
Bumps [pagy](https://github.com/ddnexus/pagy) from 4.10.1 to 4.10.2.
- [Release notes](https://github.com/ddnexus/pagy/releases)
- [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ddnexus/pagy/compare/4.10.1...4.10.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-18 09:01:48 +00:00
Andy Brett
f783926deb Merge pull request #8063 from openfoodfoundation/dependabot/bundler/bullet-6.1.5 
Bump bullet from 6.1.4 to 6.1.5
 2021-08-17 10:30:00 -07:00
Andy Brett
28c1ba1ad4 Merge pull request #8062 from openfoodfoundation/dependabot/bundler/ffaker-2.19.0 
Bump ffaker from 2.18.0 to 2.19.0
 2021-08-17 10:29:18 -07:00
Andy Brett
dd84e428e3 Merge pull request #8031 from openfoodfoundation/dependabot/bundler/stripe-5.38.0 
Bump stripe from 5.37.0 to 5.38.0
 2021-08-17 08:41:03 -07:00
dependabot[bot]
79d45513a5 Bump bullet from 6.1.4 to 6.1.5 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.4...6.1.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-17 09:03:46 +00:00
dependabot[bot]
099a4e682d Bump ffaker from 2.18.0 to 2.19.0 
Bumps [ffaker](https://github.com/ffaker/ffaker) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/ffaker/ffaker/releases)
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md)
- [Commits](https://github.com/ffaker/ffaker/compare/v2.18.0...v2.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-17 09:02:15 +00:00
jibees
1ab7cb517f Merge pull request #8058 from Matt-Yorkley/n-plus-ones 
Fix some N+1s
 2021-08-17 10:02:20 +02:00
Matt-Yorkley
63dc188d5e Merge pull request #8032 from Matt-Yorkley/order-confirm 
Split checkout backend
 2021-08-16 23:12:06 +02:00
Andy Brett
36cbe7b2ce Merge pull request #8041 from openfoodfoundation/dependabot/npm_and_yarn/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7
 2021-08-16 12:59:43 -07:00
Andy Brett
ea848f51e7 Merge pull request #8043 from openfoodfoundation/dependabot/bundler/rubocop-1.19.0 
Bump rubocop from 1.18.4 to 1.19.0
 2021-08-16 12:58:21 -07:00
Andy Brett
f575cba75c Merge pull request #8042 from openfoodfoundation/dependabot/bundler/view_component-2.38.0 
Bump view_component from 2.37.0 to 2.38.0
 2021-08-16 12:57:57 -07:00
Matt-Yorkley
7f7ba35c01 Merge pull request #8052 from openfoodfoundation/dependabot/bundler/rspec-rails-5.0.2 
Bump rspec-rails from 5.0.1 to 5.0.2
 2021-08-16 18:09:06 +02:00
dependabot[bot]
ec818e3571 Bump rspec-rails from 5.0.1 to 5.0.2 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.1...v5.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-16 14:58:21 +00:00
Matt-Yorkley
08123c7ea9 Merge pull request #8014 from openfoodfoundation/dependabot/bundler/puma-5.4.0 
Bump puma from 5.3.2 to 5.4.0
 2021-08-16 16:57:04 +02:00
Matt-Yorkley
28bf71e77e Fix N+1 in CachedEnterpriseSerializer 2021-08-16 14:58:52 +01:00
Matt-Yorkley
20a3940605 Fix N+1 in #items_bought_by_user 2021-08-16 14:58:52 +01:00
Matt-Yorkley
b94c586bc5 Merge pull request #7992 from jibees/7959-populate-hub-for-packing-report 
Add appropriate distributors and suppliers to the packing report
 2021-08-14 12:38:35 +02:00
dependabot[bot]
a48e6f6c1b Bump stripe from 5.37.0 to 5.38.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.37.0 to 5.38.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.37.0...v5.38.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-14 08:47:42 +00:00
Matt-Yorkley
5c4a225180 Merge pull request #8026 from Matt-Yorkley/angular-update 
Angular version bump
 2021-08-14 10:46:24 +02:00
Andy Brett
b20382ed56 Merge pull request #8022 from openfoodfoundation/dependabot/bundler/ddtrace-0.52.0 
Bump ddtrace from 0.51.1 to 0.52.0
 2021-08-13 14:58:06 -07:00
Matt-Yorkley
2b555691a4 Update all locales with the latest Transifex translations v4.0.1 2021-08-13 20:15:00 +01:00
dependabot[bot]
48750f7cb8 Bump rubocop from 1.18.4 to 1.19.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.4 to 1.19.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.18.4...v1.19.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 09:03:53 +00:00
dependabot[bot]
5f1b5b679d Bump view_component from 2.37.0 to 2.38.0 
Bumps [view_component](https://github.com/github/view_component) from 2.37.0 to 2.38.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.37.0...v2.38.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-08-13 09:02:44 +00:00
dependabot[bot]
8955d1bba0 Bump path-parse from 1.0.6 to 1.0.7 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 01:10:41 +00:00