raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-02 02:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,779 Commits 17 Branches 455 Tags
c4f4d67fc099f2ac11fbace7f64e72d66a75c433
Commit Graph

12680 Commits

Author SHA1 Message Date
Filipe
c4f4d67fc0 Merge pull request #8503 from jibees/split-checkout-payment-forms 
Split checkout payment forms
 2021-12-15 12:57:03 +00:00
Matt-Yorkley
3800eb0eef Merge pull request #8610 from Matt-Yorkley/user-class 
Remove Spree.user_class
 2021-12-13 15:52:00 +00:00
Filipe
f7087842b4 Merge pull request #8556 from sinansonmez/8546-include-navigation-only-for-super-admins 
Navigation is included only for super admin users
 2021-12-11 16:34:10 +00:00
Matt-Yorkley
6d2521bf5f Remove Spree.user_class 
This construct was previously used in Spree to switch out the user class with a dummy class during certain tests. We don't use this any more, so it's just mess.

🔥
 2021-12-10 18:18:20 +00:00
Maikel Linke
207cc8908a Remove useless assignments 
Rubocop highlighted this. The todo list actually contains these files
but somehow the cop still runs and reports these as violations.
 2021-12-10 09:26:57 +11:00
Maikel Linke
64d25b2999 Remove dead code highlighted by Rubocop 
The assignments here didn't actually do anything and `number` was
restricted to numbers only already. No whitespace to remove.
 2021-12-10 09:26:57 +11:00
Jean-Baptiste Bellet
a80818d2b6 Fix rubocop warning 
Extra empty line detected at module body end.
 2021-12-09 11:30:57 +01:00
jibees
53e12fb5e5 Get rid of conditional branches with & operator 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-12-09 11:12:23 +01:00
Maikel
65e5291679 Merge pull request #8569 from Matt-Yorkley/dead-code-backordered 
Remove dead code: Order#backordered?
 2021-12-08 18:05:38 +11:00
Matt-Yorkley
83fafe9969 Fix stripe elements styling 
The selectors are different now that we're not using Angular to build the stripe card element.
 2021-12-07 16:46:42 +00:00
Matt-Yorkley
d22cb0e1e1 Add billing address name to card 2021-12-07 16:29:25 +00:00
Matt-Yorkley
6b8c91845e Update strong params 2021-12-07 16:29:25 +00:00
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
290e292dea Revert "Fixed inconsistency with display of unit name for products sold by item" 2021-12-07 13:24:12 +00:00
Matt-Yorkley
87fe341b5b Remove dead code: Order#backordered? 2021-12-05 15:17:27 +00: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
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
Sinan Chaush
68908fdff5 Navigation is included only for super admin users 2021-12-02 11:53:46 +01:00
Jean-Baptiste Bellet
59eb91c7c8 Remove id "card-element" as well 2021-11-29 10:18:06 +01:00
Jean-Baptiste Bellet
57a94d64f2 Revoke adjustment if payment is cancelled 2021-11-26 16:31:25 +01:00
Sebastian Castro
588420ff93 Fixs #8442 display multiple flash messages correctly 2021-11-26 11:38:43 +01:00
jibees
b39d3bb7de Merge pull request #8492 from shveikus/8479-tab-behaviour-for-login-modal 
Update TAB behavior for the login modal
 2021-11-25 13:42:25 +01:00
jibees
76176b2482 Merge pull request #8498 from drummer83/drummer83-country_first 
Switch the order of 'state' and 'country' input fields
 2021-11-25 13:41:46 +01:00
jibees
439f4ad24c Merge pull request #8497 from drummer83/drummer83-localize_button 
Place the localize button above the map/below the address
 2021-11-25 13:41:19 +01:00
Nihal M. Kelanthodika
74b87adee3 Merge pull request #8500 from apricot12/8495-Variant-unit-name-shopfront 2021-11-25 16:06:06 +05:30
Maikel
5f87c30d3e Merge pull request #8465 from jibees/7963-permission-to-delete-relationship-both-ways 
Manager can delete enterprises relationship in both direction
 2021-11-23 09:20:32 +11:00