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

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
56f9c24527 Bump bootsnap from 1.7.7 to 1.8.1 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.7 to 1.8.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.7.7...v1.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 09:02:52 +00:00
Andy Brett
e833921d2f Merge pull request #8106 from andrewpbrett/remove-codecov 
Remove codecov
 2021-08-26 10:37:49 -07:00
Andy Brett
2d511c6d18 Merge pull request #8044 from apricot12/Undo_reversing_of_email_copy_paste 
Allow copy paste of email from contact tab and footer without reversing
 2021-08-26 10:02:09 -07:00
Andy Brett
3fcce8574e Merge pull request #8040 from guidoDutra/7627-prevent-removing-last-item-in-order 
Prevent removing last item in order
 2021-08-26 10:01:42 -07:00
dependabot[bot]
dd0a162a47 Bump rubocop from 1.19.1 to 1.20.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.19.1 to 1.20.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.19.1...v1.20.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-26 09:02:03 +00:00
Jean-Baptiste Bellet
748a37f670 Terms and conditions error message 2021-08-26 09:28:31 +02:00
Jean-Baptiste Bellet
44ab87961a i18nize the global error message 2021-08-26 09:28:31 +02:00
Andy Brett
3fad554dbd remove codecov 2021-08-25 17:24:11 -07:00
Andy Brett
bee1b1a097 respect checkbox for ship address same as bill address 2021-08-25 15:22:25 -07:00
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
vishaldeepak
813deb49a4 Add customer information to mail when we notify producers when required 2021-08-25 08:29:54 +05:30
Matt-Yorkley
c0cd68a747 Merge pull request #8084 from openfoodfoundation/dependabot/bundler/pagy-4.11.0 
Bump pagy from 4.10.2 to 4.11.0
 2021-08-24 23:48:13 +02:00
Andy Brett
50395d3142 Merge pull request #8096 from openfoodfoundation/dependabot/bundler/sidekiq-6.2.2 
Bump sidekiq from 6.2.1 to 6.2.2
 2021-08-24 13:25:59 -07: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
dependabot[bot]
43072dcfcd Bump sidekiq from 6.2.1 to 6.2.2 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.1...v6.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-24 09:04:07 +00:00
jibees
13e32149c1 Merge pull request #8093 from openfoodfoundation/dependabot/bundler/webpacker-5.4.2 
Bump webpacker from 5.4.0 to 5.4.2
 2021-08-24 10:33:13 +02:00
jibees
6766801aed Merge pull request #8094 from openfoodfoundation/dependabot/npm_and_yarn/rails/webpacker-5.4.2 
Bump @rails/webpacker from 5.4.0 to 5.4.2
 2021-08-24 10:32:46 +02:00
Andy Brett
1399171cc2 Merge pull request #8085 from openfoodfoundation/dependabot/bundler/webdrivers-4.6.1 
Bump webdrivers from 4.6.0 to 4.6.1
 2021-08-23 13:23:16 -07:00
Andy Brett
185493f846 Merge pull request #8077 from openfoodfoundation/dependabot/bundler/codecov-0.6.0 
Bump codecov from 0.5.2 to 0.6.0
 2021-08-23 13:22:18 -07:00
Andy Brett
4b79ee5f68 Merge pull request #8078 from openfoodfoundation/dependabot/bundler/rubocop-1.19.1 
Bump rubocop from 1.19.0 to 1.19.1
 2021-08-23 13:22:04 -07:00
Andy Brett
e8873ccb4f Merge pull request #8092 from filipefurtad0/improve_oc_spec 
Sets OC-times in relation to the Zone time
 2021-08-23 12:29:53 -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
dependabot[bot]
031b93af5e Bump @rails/webpacker from 5.4.0 to 5.4.2 
Bumps [@rails/webpacker](https://github.com/rails/webpacker) from 5.4.0 to 5.4.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/v5.4.2/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.0...v5.4.2)

---
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-08-23 09:06:00 +00:00
dependabot[bot]
9aa6cf7804 Bump webpacker from 5.4.0 to 5.4.2 
Bumps [webpacker](https://github.com/rails/webpacker) from 5.4.0 to 5.4.2.
- [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.0...v5.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 09:02:13 +00:00
Jean-Baptiste Bellet
fe65359d71 Display no shipping method selected error 2021-08-23 10:16:53 +02:00
jibees
67f04856a8 Merge pull request #8083 from openfoodfoundation/dependabot/bundler/rails-6.1.4.1 
Bump rails from 6.1.4 to 6.1.4.1
 2021-08-23 09:42:15 +02:00
Matt-Yorkley
39372f7bd7 Update cookies policy notes and related spec 
The session cookie is now named `_ofn_session_id` instead of `_session_id`.
 2021-08-22 15:57:43 +01:00
Matt-Yorkley
1d472d0dec Add Rack Middleware for transitioning existing sessions 
This checks if the current request has been submitted using the old session key (_session_id) and transparently migrates the session id to a new session cookie with the new settings and the new key (_ofn_session_id).
 2021-08-22 15:57:43 +01:00
Matt-Yorkley
e6ac57ac3a Migrate session cookies to new setup 
Currently sessions set on (www.openfoodnetwork.xxx) are not usable on the bare domain (openfoonetwork.xxx). When transitioning from one to the other, the user's session is completely lost.

This change means sessions on subdomains (including www) will be transferable.
 2021-08-22 15:53:41 +01:00
filipefurtad0
cd16e8527c Sets OC-times in relation to the Zone time 2021-08-21 19:13:26 +01:00
Matt-Yorkley
697a073330 Merge pull request #8060 from Matt-Yorkley/script-split 
Maps and AMS conditional loading
 2021-08-21 16:35:46 +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
Jean-Baptiste Bellet
8fe0a82b75 Change ng-click to ng-change to capture ng-model updated value 
- Create a feature test for this feature
 2021-08-20 15:18:09 +02:00
Nihal Mohammed
92ecdb4163 Add Angular directive to undo reverse of email 2021-08-20 18:34:42 +05:30
dependabot[bot]
bd190145f6 Bump webdrivers from 4.6.0 to 4.6.1 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.6.0...v4.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-20 09:04:50 +00:00