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
22,707 Commits 18 Branches 452 Tags
2fe96c5f63eb665ca1d261edeab4eac0083115f5
Commit Graph

22707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
2fe96c5f63 Update Stripe controller hidden fields 2021-12-07 16:29:25 +00:00
Matt-Yorkley
9979ecf8b4 Update view to use new Stimulus controller for Stripe card form 2021-12-07 16:29:25 +00:00
Matt-Yorkley
cbd7b37eb3 Change card field name 
The order[card] field is already in use / needed for other data 👍
 2021-12-07 16:29:25 +00:00
Matt-Yorkley
720d147421 Bring in stimulus controller for stripe elements 2021-12-07 16:29:25 +00:00
Matt-Yorkley
7f4b2cc00a Tidy up checks on Enumerable objects 2021-12-07 16:29:25 +00:00
Matt-Yorkley
ce7fb1b4dc Move select-options-formatting logic to helper 2021-12-07 16:29:25 +00:00
Matt-Yorkley
d85597fe4c Rename stripe cards controller 2021-12-07 16:29:25 +00:00
Matt-Yorkley
8105f0ebf3 Simplify partial selecting and rename stripe_sca partial 2021-12-07 16:29:25 +00:00
Jean-Baptiste Bellet
33887e8b6e Remove wrong min attribute on input 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
fd5ad7566a Disabled all form elements that should not be sent to the controller 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
f7662947dc Extract to a method that handle all the form elements 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
fbe69b8027 Manage savedCards or enter new card behavior for stripe payment form 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
7437c6a6d7 Add a stripe controller that show/hide stripe form if saved cards or not 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
34ce08d901 Format card label in card selector 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
68e4d55f80 Avoid ternary operator 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
f9b0798c88 Add stripe_sca, paypal, check payment method 
Stripe_sca use the same template than stripe
 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
e89caf7a0d Add stripe as payment method 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
fc6fba4fe9 Move into specific folder 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
216e06cd6b Update stripe card errors styles 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
792763d275 use specific gateway form template for split checkout 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
2564de4ca4 Display the right container by default regarding the selected_payment_method 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
5f3ea6accb Do not init by hidden all the container 
that allow to init the content without clicking on anything
 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
7159cc3ff1 Handle required attribute on input for PaymentMethod controller 
This is done for one reason : do not submit form with required attribute on input that are actually hidden ; this is not handle correctly by browsers.

This idea here is to add/remove the required attribute on each input if the form is visible or not.
 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
3063b041d1 Change the paymentmethod controller to handle both desc and form 
Add tests as well

Update _payment.html.haml

Update _payment.html.haml
 2021-12-07 16:23:39 +00:00
Matt-Yorkley
53d01b1275 Update all locales with the latest Transifex translations v4.1.10 2021-12-07 13:30:07 +00:00
Matt-Yorkley
775475f88a Merge pull request #8566 from openfoodfoundation/transifex 
Transifex
 2021-12-07 13:26:25 +00:00
Matt-Yorkley
0197831246 Merge pull request #8585 from openfoodfoundation/revert-8500-8495-Variant-unit-name-shopfront 
Revert "Fixed inconsistency with display of unit name for products sold by item"
 2021-12-07 13:24:38 +00:00
Matt-Yorkley
290e292dea Revert "Fixed inconsistency with display of unit name for products sold by item" 2021-12-07 13:24:12 +00:00
Filipe
2233c7ae0f Merge pull request #8571 from mkllnk/fix-flaky-product-import 
Avoid flaky race conditions in product import spec
 2021-12-07 10:32:00 +00:00
Maikel Linke
5793ddfe1b Give product import spec more time 
It seems to be really slow.
 2021-12-07 17:06:45 +11:00
Transifex-Openfoodnetwork
fa2b14e31b Updating translations for config/locales/en_GB.yml 2021-12-06 21:03:46 +11:00
Maikel Linke
d99feeaaa5 Remove unreliable spec expectation 
We were not failing if these percentages were not displayed. But the
spec did fail when the import was finished already and the progress bar
wasn't there any more.

Let's avoid these race conditions and wait for the final completion
page.
 2021-12-06 18:06:16 +11:00
Maikel Linke
dc7dfcacba Wait for product import to finish in spec 
The expectation returned to early.
 2021-12-06 18:01:17 +11:00
Matt-Yorkley
dcad00d047 Merge pull request #8484 from Matt-Yorkley/stripe-session-checks 
Stripe checkout alerting
 2021-12-05 12:04:00 +00:00
Transifex-Openfoodnetwork
59380ef547 Updating translations for config/locales/it.yml 2021-12-04 04:00:36 +11:00
jibees
9590b15f50 Merge pull request #8550 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.3 
Bump jest from 27.3.1 to 27.4.3
 2021-12-03 09:32:13 +01:00
Matt-Yorkley
6e905bd2fc Merge pull request #8561 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.7.2 
Bump mrujs from 0.7.1 to 0.7.2
 2021-12-03 01:11:59 +00:00
Filipe
89864395ca Merge pull request #8520 from seballot/multiple-flash-messages 
Fix rendering problem with multiple flash messages in the admin section
 2021-12-03 01:05:36 +00:00
Filipe
b2e5a89395 Merge pull request #8487 from jibees/7278-multipe-stripe-form-in-admin-section 
Allow mutiple stripe form in the admin section
 2021-12-03 00:21:03 +00:00
dependabot[bot]
6aa0a9864d Bump mrujs from 0.7.1 to 0.7.2 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.7.1 to 0.7.2.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.7.1...v0.7.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 21:22:09 +00:00
Matt-Yorkley
d2f542032e Update all locales with the latest Transifex translations 2021-12-02 21:20:26 +00:00
Matt-Yorkley
639ff6730f Merge pull request #8558 from openfoodfoundation/transifex 
Transifex
 2021-12-02 21:15:16 +00:00
Matt-Yorkley
e533973ecd Merge pull request #8513 from jibees/run-rubocop-with-reviewdog 
Run rubocop with reviewdog
 2021-12-02 21:14:04 +00:00
Matt-Yorkley
5f4c24f44d Merge pull request #8522 from seballot/vscode 
gitignore vscode editor folder
 2021-12-02 21:13:45 +00:00
Matt-Yorkley
684143cd46 Merge pull request #8515 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.1.0 
Bump @hotwired/turbo from 7.0.1 to 7.1.0
 2021-12-02 21:13:31 +00:00
Transifex-Openfoodnetwork
2a9a92dd6c Updating translations for config/locales/en_IE.yml 2021-12-03 04:30:38 +11:00
Filipe
f56dc2e284 Merge pull request #8517 from openfoodfoundation/chore-remove-deprecated-application.yml 
Remove references to deprecated application.yml config file.
 2021-12-02 10:54:08 +00:00
Filipe
ff485314a4 Merge pull request #8526 from jibees/3584-fix-adjustment-on-voiding-payment 
Revoke transaction fee if payment is cancelled
 2021-12-02 10:44:08 +00:00
dependabot[bot]
b28942b2eb Bump jest from 27.3.1 to 27.4.3 
Bumps [jest](https://github.com/facebook/jest) from 27.3.1 to 27.4.3.
- [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.3.1...v27.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 04:52:17 +00:00
Maikel
d0625e99c7 Merge pull request #8545 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.3 
Bump @storybook/addon-docs from 6.4.1 to 6.4.3
 2021-12-02 15:47:40 +11:00