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

25833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Transifex-Openfoodnetwork
db27639f0b Updating translations for config/locales/en_US.yml 2022-01-12 00:24:30 +11:00
Filipe
4978c95e75 Merge pull request #8467 from SarvarKh/validate-social-links 
Fix the issue with 'at' in enterprise twitter and instagram
 2022-01-11 12:53:11 +00:00
Filipe
f2b14beea9 Merge pull request #8541 from jibees/8506-improve-shiped-email 
Improve shipped email design
 2022-01-11 11:36:32 +00:00
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name 
Enable sorting orders by order full name
 2022-01-11 11:27:36 +00:00
Jean-Baptiste Bellet
6e62985e19 update tests as there are now 2 more mandatory fields 
First name and last name
 2022-01-11 10:30:45 +01:00
Jean-Baptiste Bellet
1a270af82b Test the presence of the firstname and the lastname if company is not present 
Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-01-11 10:30:45 +01:00
Transifex-Openfoodnetwork
f61ad4470d Updating translations for config/locales/en_GB.yml 2022-01-11 20:11:03 +11:00
Maikel
3480c5d931 Merge pull request #8654 from Matt-Yorkley/rails-defaults 
Apply recommended framework defaults
 2022-01-11 16:12:27 +11:00
Transifex-Openfoodnetwork
82ecadc17c Updating translations for config/locales/de_DE.yml 2022-01-11 09:30:24 +11:00
SarvarKhalimov
f09f6208c2 Remove trailing whitespace from user_sessions_controller_spec.rb 2022-01-11 00:01:08 +05:00
SarvarKhalimov
6c559995ab Add test for user log_out user#destroy 2022-01-10 22:50:44 +05:00
SarvarKhalimov
5523b91364 Add translation for already_signed_out key in en.yml file 
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-01-10 22:20:21 +05:00
SarvarKhalimov
b8161fb028 Remove duplicated flash notice from app/controllers/spree/user_sessions_controller.rb 
Remove flash duplicattion in favor of already existing devise default flash notice

Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-01-10 21:59:48 +05:00
Nihal M. Kelanthodika
000c59ffa7 Add translations for all stripe decline codes 2022-01-10 20:47:47 +05:30
jibees
cc1e3912ad Merge pull request #8685 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.10 
Bump karma from 6.3.9 to 6.3.10
 2022-01-10 15:23:29 +01:00
dependabot[bot]
346ec9ef1d Bump karma from 6.3.9 to 6.3.10 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.9 to 6.3.10.
- [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.9...v6.3.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 12:14:59 +00:00
Matt-Yorkley
fd4a18a838 Merge pull request #8680 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.7 
Bump jest from 27.4.6 to 27.4.7
 2022-01-10 12:11:12 +00:00
Jean-Baptiste Bellet
a1b21d7706 Take into account the lb unit name 2022-01-10 11:50:40 +01:00
Jean-Baptiste Bellet
f6e64f3a3c Update the tests as well 2022-01-10 11:27:32 +01:00
Jean-Baptiste Bellet
c5beff249e Should be divided by scale if the smallest unit 2022-01-10 11:27:18 +01:00
Jean-Baptiste Bellet
4c508a5bf9 Group by unit size is specific: it needs to be divided by scale if not the smallest unit 2022-01-10 11:24:22 +01:00
Jean-Baptiste Bellet
da9c0f4b8c Refactor: create two internal methods: getScale and getFormattedValueWithUnitName 
Then, the old formattedValueWithUnitName calls those two private methods
 2022-01-10 11:23:30 +01:00
Jean-Baptiste Bellet
467183af48 Rename getScale to getLineItemScale to be more specific 2022-01-10 11:22:11 +01:00
dependabot[bot]
8d46a185d6 Bump shortcut-buttons-flatpickr from 0.3.1 to 0.4.0 
Bumps [shortcut-buttons-flatpickr](https://github.com/jcsmorais/shortcut-buttons-flatpickr) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/jcsmorais/shortcut-buttons-flatpickr/releases)
- [Commits](https://github.com/jcsmorais/shortcut-buttons-flatpickr/compare/0.3.1...0.4.0)

---
updated-dependencies:
- dependency-name: shortcut-buttons-flatpickr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 09:10:22 +00:00
Jean-Baptiste Bellet
36db396fe5 Do not redirect if user is logged in 2022-01-10 10:02:08 +01:00
Jean-Baptiste Bellet
573798e4a4 Handle visit /checkout/details in both case: authorized or not 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
9a74934f79 Do not redirect to /guest if step is specified 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
b6e8862401 Update test for guest checkout when distributor doesn't allow 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
6be2fbb0b9 Specify allow_guest_orders attribute 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
b1524aa0bd Guard clause: redirect to /guest when POST 
When there is no connected user, and when the distributor doesn't allow guest orders, redirect on POST method
 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
a36d03a7ab Update test as well ; guest checkout when distributor allow 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
2568d775ae Create the guest view and its associated css 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
efda693f8e Do not show tabs if the current step if the /guest step 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
f2c3a380ac Redirect to /guest if distributor doesn't allow guest order 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
2929b6278d Redirect to /guest if no step required and no current connected user 2022-01-10 09:39:45 +01:00
Jean-Baptiste Bellet
3e14501337 Create a new step: the guest view 2022-01-10 09:39:45 +01:00
Transifex-Openfoodnetwork
228f6db139 Updating translations for config/locales/ru.yml 2022-01-10 18:53:37 +11:00
Filipe
54c61f459e Merge pull request #8677 from filipefurtad0/add_specs_split_checkout_1 
Migrates some test scenarios from checkout_spec.rb
 2022-01-09 16:20:41 +00:00
filipefurtad0
0af025d948 Re-writes test structure, descrive vs. context 2022-01-08 17:59:04 +00:00
Matt-Yorkley
99b75c9a6a Adjust usage of remote-method links on credit card deletion 2022-01-08 16:54:23 +00:00
Matt-Yorkley
40ed23688d Remove jquery_ujs 2022-01-08 16:54:23 +00:00
Transifex-Openfoodnetwork
fbeb295019 Updating translations for config/locales/fr_CA.yml 2022-01-08 09:09:50 +11:00
Transifex-Openfoodnetwork
d4d4b70eb2 Updating translations for config/locales/en_CA.yml 2022-01-08 08:50:21 +11:00
Matt-Yorkley
f23a12020c Merge pull request #8675 from Matt-Yorkley/dead-code-spree-js 
Remove unused JS
 2022-01-07 14:29:24 +00:00
Cillian O'Ruanaidh
e2b8108972 If an order has out of stock line items display them and let admins remove them 2022-01-07 13:15:44 +00:00
filipefurtad0
4276be1132 Simplifies/re-writes 'before do' block 2022-01-07 13:11:27 +00:00
filipefurtad0
e2c5c08c1e Updates the spec to reflect the changes in the helper 2022-01-07 13:06:28 +00:00
filipefurtad0
2df841f637 Renames module - removes 'request' naming 2022-01-07 13:03:44 +00:00
filipefurtad0
ebbc028dda Removes split_ prefix from helper 2022-01-07 12:56:15 +00:00
filipefurtad0
9149306fc1 Moves(up)/renames SplitCheckoutHelper 2022-01-07 12:55:09 +00:00