raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-15 04:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 16 Branches 457 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

13873 Commits

Author SHA1 Message Date
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
2408b7f74e Simplify card formatting 2021-12-06 15:20:39 +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
Matt-Yorkley
4cdb892c75 Refactor formatting of credit card brand names and reformat automatically when saving 
This little bit of "translation" between what we might receive as input and what ActiveMerchant requires is important, but currently the responsibility for this job is spread all over the code base. It can now just live in the CreditCard model (in one place) and doesn't need to be duplicated anywhere else (like several different places in frontend Javascript!)
 2021-12-02 16:22:52 +00:00
Sinan Chaush
68908fdff5 Navigation is included only for super admin users 2021-12-02 11:53:46 +01:00
Jean-Baptiste Bellet
57dc10888c Improve shipped email design 
- Use default class for header, content
 - Use monospace font for the list of the items
 - Add line breaks for the list of the items
 2021-11-30 17:02:42 +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
SarvarKhalimov
5d36c66aff Update follow partial to reflect social urls correctly 2021-11-25 01:05:45 +05:00
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
Dmitry Shveikus
9bd604cbe9 Update TAB behaviour for login modal 2021-11-22 23:40:22 +03:00
Jean-Baptiste Bellet
b6afdb13fc Use timeout to put in other callback and then update the StatusMessage 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5575697c9f Add a directive attribute 'selected' that update AdminStripeElements when true 
Filled with `PaymentCtrl.isSelected(payment_method_id)`

Therefore, each time a stripe payment is selected, the one that is actually selected is linked to `AdminStripeElements.card` and `AdminStripeElements.stripe`
 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5348d26054 Add new "error" attribute in the StatusMessage 
It is used by `admin/payments/services/stripe_elements.js.coffee`
 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
36c12a92f2 Display errors on the right specific DOM element 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
fc779e0237 Mount Stripe element to the specific DOM element 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
f7bf6e1083 Include Stripe js only once in the admin section 2021-11-22 21:39:20 +01:00
SarvarKhalimov
c202c52d8b Refactor correct_social_url method in enterprise model and its tests 2021-11-22 23:31:56 +05:00
Nihal M. Kelanthodika
8a42043701 Fixed inconsistency with display of unit name for products sold by item 2021-11-19 13:39:42 +05:30
Matt-Yorkley
bc5c9ff8e2 Merge pull request #8472 from Matt-Yorkley/notify-resumed 
Include items from resumed orders when mailing producers
 2021-11-18 15:20:08 +00:00
Matt-Yorkley
527a53bd0f Merge pull request #8485 from Matt-Yorkley/stripe-addresses 
Checkout address handling
 2021-11-18 15:19:27 +00:00
Konrad
60d1305b0a Add files via upload 2021-11-18 00:28:49 +01:00
Konrad
87b3b6fa36 Add files via upload 2021-11-18 00:23:05 +01:00