diff --git a/addons/payment/__manifest__.py b/addons/payment/__manifest__.py
index 0bc26ebfc9f..85a0a57fe61 100644
--- a/addons/payment/__manifest__.py
+++ b/addons/payment/__manifest__.py
@@ -9,6 +9,7 @@
     'depends': ['account'],
     'data': [
         'data/account_data.xml',
+        'data/payment_option_data.xml',
         'data/payment_acquirer_data.xml',
         'views/payment_views.xml',
         'views/account_payment_views.xml',
diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml
index 5908c6e5366..420afecbb35 100644
--- a/addons/payment/data/payment_acquirer_data.xml
+++ b/addons/payment/data/payment_acquirer_data.xml
@@ -32,6 +32,12 @@
                 <li><i class="fa fa-check"/>Payment Status Tracking</li>
             </ul>
         </field>
+        <!-- https://www.buckaroo-payments.com/products/payment-methods/ -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_bancontact"),
+                                                        ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_visa"),
+                                                        ref("payment.payment_option_cc_american_express")])]'/>
     </record>
 
     <record id="payment_acquirer_ogone" model="payment.acquirer">
@@ -51,6 +57,11 @@
                 <li><i class="fa fa-check"/>Save Cards</li>
             </ul>
         </field>
+        <!-- https://payment-services.ingenico.com/~/media/files/130806_product_sheet_ingenico_collect_en.ashx?la=en -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_bancontact"),
+                                                        ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_visa")])]'/>
     </record>
 
     <record id="payment_acquirer_adyen" model="payment.acquirer">
@@ -67,6 +78,15 @@
                 <li><i class="fa fa-check"/>Payment Status Tracking</li>
             </ul>
         </field>
+        <!-- https://www.adyen.com/payment-methods -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_bancontact"),
+                                                        ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_visa"),
+                                                        ref("payment.payment_option_cc_discover"),
+                                                        ref("payment.payment_option_cc_diners_club_intl"),
+                                                        ref("payment.payment_option_cc_jcb"),
+                                                        ref("payment.payment_option_cc_unionpay")])]'/>
     </record>
 
     <record id="payment_acquirer_authorize" model="payment.acquirer">
@@ -87,6 +107,13 @@
                 <li><i class="fa fa-check"/>Manual Capture</li>
             </ul>
         </field>
+        <!-- https://www.authorize.net/solutions/merchantsolutions/onlinemerchantaccount/ -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_discover"),
+                                                        ref("payment.payment_option_cc_diners_club_intl"),
+                                                        ref("payment.payment_option_cc_jcb"),
+                                                        ref("payment.payment_option_cc_visa")])]'/>
     </record>
 
     <record id="payment_acquirer_transfer" model="payment.acquirer">
@@ -117,6 +144,16 @@
                 <li><i class="fa fa-check"/>Payment Status Tracking</li>
             </ul>
         </field>
+        <!-- http://sips.worldline.com/en-us/home/features/payment-types-and-acquirers.html -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_discover"),
+                                                        ref("payment.payment_option_cc_diners_club_intl"),
+                                                        ref("payment.payment_option_cc_jcb"),
+                                                        ref("payment.payment_option_cc_american_express"),
+                                                        ref("payment.payment_option_cc_bancontact"),
+                                                        ref("payment.payment_option_cc_unionpay"),
+                                                        ref("payment.payment_option_cc_visa")])]'/>
     </record>
 
     <record id="payment_acquirer_paypal" model="payment.acquirer">
@@ -134,6 +171,15 @@
                 <li><i class="fa fa-check"/>Payment Status Tracking</li>
             </ul>
         </field>
+        <!-- https://www.paypal.com/us/selfhelp/article/Which-credit-cards-can-I-accept-with-PayPal-Merchant-Services-FAQ1525#business -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_discover"),
+                                                        ref("payment.payment_option_cc_diners_club_intl"),
+                                                        ref("payment.payment_option_cc_jcb"),
+                                                        ref("payment.payment_option_cc_american_express"),
+                                                        ref("payment.payment_option_cc_unionpay"),
+                                                        ref("payment.payment_option_cc_visa")])]'/>
     </record>
 
     <record id="payment_acquirer_stripe" model="payment.acquirer">
@@ -150,7 +196,17 @@
                 <li><i class="fa fa-check"/>Payment Status Tracking</li>
             </ul>
         </field>
-
+        <!--
+            https://stripe.com/payments/payment-methods-guide
+            https://support.goteamup.com/hc/en-us/articles/115002089349-Which-cards-and-payment-types-can-I-accept-with-Stripe-
+        -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_discover"),
+                                                        ref("payment.payment_option_cc_diners_club_intl"),
+                                                        ref("payment.payment_option_cc_jcb"),
+                                                        ref("payment.payment_option_cc_american_express"),
+                                                        ref("payment.payment_option_cc_visa")])]'/>
     </record>
 
     <record id="payment_acquirer_custom" model="payment.acquirer">
@@ -182,6 +238,13 @@
                 <li><i class="fa fa-check"/>Payment Status Tracking</li>
             </ul>
         </field>
+        <!-- https://www.payumoney.com/selfcare.html?userType=seller
+            > Banks & Cards > What options do you have in the Credit Card payment?
+         -->
+        <field name="payment_option_ids" eval='[(6, 0, [ref("payment.payment_option_cc_maestro"),
+                                                        ref("payment.payment_option_cc_mastercard"),
+                                                        ref("payment.payment_option_cc_american_express"),
+                                                        ref("payment.payment_option_cc_visa")])]'/>
     </record>
 
 </odoo>
diff --git a/addons/payment/data/payment_option_data.xml b/addons/payment/data/payment_option_data.xml
new file mode 100644
index 00000000000..49d351ddc83
--- /dev/null
+++ b/addons/payment/data/payment_option_data.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="payment_option_cc_visa" model="payment.option">
+        <field name="name">VISA</field>
+        <field name="image" type="base64" file="payment/static/img/visa.png"/>
+    </record>
+
+    <record id="payment_option_cc_american_express" model="payment.option">
+        <field name="name">American Express</field>
+        <field name="image" type="base64" file="payment/static/img/american_express.png"/>
+    </record>
+
+    <record id="payment_option_cc_cirrus" model="payment.option">
+        <field name="name">Cirrus</field>
+        <field name="image" type="base64" file="payment/static/img/cirrus.png"/>
+    </record>
+
+    <record id="payment_option_cc_diners_club_intl" model="payment.option">
+        <field name="name">Diners Club International</field>
+        <field name="image" type="base64" file="payment/static/img/diners_club_intl.png"/>
+    </record>
+
+    <record id="payment_option_cc_diners_club_intl" model="payment.option">
+        <field name="name">Diners Club International</field>
+        <field name="image" type="base64" file="payment/static/img/diners_club_intl.png"/>
+    </record>
+
+    <record id="payment_option_cc_discover" model="payment.option">
+        <field name="name">Discover</field>
+        <field name="image" type="base64" file="payment/static/img/discover.png"/>
+    </record>
+
+    <record id="payment_option_cc_jcb" model="payment.option">
+        <field name="name">JCB</field>
+        <field name="image" type="base64" file="payment/static/img/jcb.png"/>
+    </record>
+
+    <record id="payment_option_cc_maestro" model="payment.option">
+        <field name="name">Maestro</field>
+        <field name="image" type="base64" file="payment/static/img/maestro.png"/>
+    </record>
+
+    <record id="payment_option_cc_mastercard" model="payment.option">
+        <field name="name">MasterCard</field>
+        <field name="image" type="base64" file="payment/static/img/mastercard.png"/>
+    </record>
+
+    <record id="payment_option_cc_unionpay" model="payment.option">
+        <field name="name">UnionPay</field>
+        <field name="image" type="base64" file="payment/static/img/unionpay.png"/>
+    </record>
+
+    <record id="payment_option_cc_bancontact" model="payment.option">
+        <field name="name">Bancontact</field>
+        <field name="image" type="base64" file="payment/static/img/bancontact.png"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/addons/payment/static/img/american_express.png b/addons/payment/static/img/american_express.png
new file mode 100644
index 00000000000..9f31d21ef20
Binary files /dev/null and b/addons/payment/static/img/american_express.png differ
diff --git a/addons/payment/static/img/bancontact.png b/addons/payment/static/img/bancontact.png
new file mode 100644
index 00000000000..7941a69cf64
Binary files /dev/null and b/addons/payment/static/img/bancontact.png differ
diff --git a/addons/payment/static/img/cirrus.png b/addons/payment/static/img/cirrus.png
new file mode 100644
index 00000000000..eb4b2aa81f6
Binary files /dev/null and b/addons/payment/static/img/cirrus.png differ
diff --git a/addons/payment/static/img/diners_club_intl.png b/addons/payment/static/img/diners_club_intl.png
new file mode 100644
index 00000000000..888860a140e
Binary files /dev/null and b/addons/payment/static/img/diners_club_intl.png differ
diff --git a/addons/payment/static/img/discover.png b/addons/payment/static/img/discover.png
new file mode 100644
index 00000000000..d9222265651
Binary files /dev/null and b/addons/payment/static/img/discover.png differ
diff --git a/addons/payment/static/img/jcb.png b/addons/payment/static/img/jcb.png
new file mode 100644
index 00000000000..f3e3c5bfb06
Binary files /dev/null and b/addons/payment/static/img/jcb.png differ
diff --git a/addons/payment/static/img/maestro.png b/addons/payment/static/img/maestro.png
new file mode 100644
index 00000000000..a0a6b328380
Binary files /dev/null and b/addons/payment/static/img/maestro.png differ
diff --git a/addons/payment/static/img/mastercard.png b/addons/payment/static/img/mastercard.png
new file mode 100644
index 00000000000..2572a33b373
Binary files /dev/null and b/addons/payment/static/img/mastercard.png differ
diff --git a/addons/payment/static/img/unionpay.png b/addons/payment/static/img/unionpay.png
new file mode 100644
index 00000000000..8d830c5f944
Binary files /dev/null and b/addons/payment/static/img/unionpay.png differ
diff --git a/addons/payment/static/img/visa.png b/addons/payment/static/img/visa.png
new file mode 100644
index 00000000000..58cfab08725
Binary files /dev/null and b/addons/payment/static/img/visa.png differ
diff --git a/addons/payment_adyen/views/payment_adyen_templates.xml b/addons/payment_adyen/views/payment_adyen_templates.xml
index 4b8d178ef69..cdde7055be4 100644
--- a/addons/payment_adyen/views/payment_adyen_templates.xml
+++ b/addons/payment_adyen/views/payment_adyen_templates.xml
@@ -32,5 +32,27 @@
             </form>
         </template>
 
+        <template id="ayden_form">
+            <input type="hidden" name="merchantReference" t-att-value="merchantReference"/>
+            <input type="hidden" name="paymentAmount" t-att-value="paymentAmount"/>
+            <input type="hidden" name="currencyCode" t-att-value="currencyCode"/>
+            <input type="hidden" name="shipBeforeDate" t-att-value="shipBeforeDate"/>
+            <input type="hidden" name="skinCode" t-att-value="skinCode"/>
+            <input type="hidden" name="merchantAccount" t-att-value="merchantAccount"/>
+            <input type="hidden" name="shopperLocale" t-att-value="shopperLocale"/>
+            <input type="hidden" name="sessionValidity" t-att-value="sessionValidity"/>
+            <input type="hidden" name="merchantSig" t-att-value="merchantSig"/>
+            <!-- URLs -->
+            <input type='hidden' name='resURL'
+                t-att-value="resURL"/>
+            <!-- custom -->
+            <input t-if="merchantReturnData" type='hidden' name='merchantReturnData'
+                t-att-value="merchantReturnData"/>
+            <!-- shopperEmail is not included for SHA-1. To avoid breaking compatibility,
+                    include only if filled in -->
+            <input t-if="shopperEmail"
+                type='hidden' name='shopperEmail' t-att-value="shopperEmail"/>
+        </template>
+
     </data>
 </odoo>
diff --git a/addons/payment_authorize/views/payment_authorize_templates.xml b/addons/payment_authorize/views/payment_authorize_templates.xml
index c4b91605a00..0d201631d50 100644
--- a/addons/payment_authorize/views/payment_authorize_templates.xml
+++ b/addons/payment_authorize/views/payment_authorize_templates.xml
@@ -47,6 +47,45 @@
             </form>
         </template>
 
+        <template id="authorize_form">
+            <input type='hidden' name='x_login' t-att-value='x_login'/>
+            <input type='hidden' name='x_fp_hash' t-att-value='x_fp_hash'/>
+            <input type='hidden' name='x_amount' t-att-value='x_amount'/>
+            <input type='hidden' name='x_show_form' t-att-value="x_show_form"/>
+            <input type='hidden' name='x_type' t-att-value="x_type"/>
+            <input type='hidden' name='x_method' t-att-value="x_method"/>
+            <input type='hidden' name='x_fp_sequence' t-att-value='x_fp_sequence'/>
+            <input type='hidden' name='x_version' t-att-value="x_version"/>
+            <input type="hidden" name="x_relay_response" t-att-value="x_relay_response"/>
+            <input type="hidden" name="x_relay_url" t-att-value="x_relay_url"/>
+            <input type='hidden' name="x_fp_timestamp" t-att-value="x_fp_timestamp"/>
+            <input type="hidden" name='return_url' t-att-value="returndata"/>
+            <input type="hidden" name='x_cancel_url' t-att-value="x_cancel_url"/>
+            <!--Order Information -->
+            <input type='hidden' name='x_invoice_num' t-att-value='reference'/>
+            <input type='hidden' name='x_currency_code' t-att-value='x_currency_code'/>
+            <!-- Billing Information-->
+            <input type='hidden' name='x_first_name' t-att-value="billing_first_name"/>
+            <input type='hidden' name='x_last_name' t-att-value="billing_last_name"/>
+            <input type='hidden' name='x_address' t-att-value="billing_address"/>
+            <input type='hidden' name='x_city' t-att-value="billing_city"/>
+            <input type='hidden' name='x_zip' t-att-value="billing_zip_code"/>
+            <input type='hidden' name='x_country' t-att-value="billing_country"/>
+            <input type='hidden' name='x_phone' t-att-value='billing_phone'/>
+            <input type='hidden' name='x_email' t-att-value="billing_email"/>
+            <input type='hidden' name='x_state' t-att-value="billing_state"/>
+            <!-- Shipping Information-->
+            <input type='hidden' name='x_ship_to_first_name' t-att-value="first_name"/>
+            <input type='hidden' name='x_ship_to_last_name' t-att-value="last_name"/>
+            <input type='hidden' name='x_ship_to_address' t-att-value="address"/>
+            <input type='hidden' name='x_ship_to_city' t-att-value="city"/>
+            <input type='hidden' name='x_ship_to_zip' t-att-value="zip_code"/>
+            <input type='hidden' name='x_ship_to_country' t-att-value="country"/>
+            <input type='hidden' name='x_ship_to_phone' t-att-value='phone'/>
+            <input type='hidden' name='x_ship_to_email' t-att-value="email"/>
+            <input type='hidden' name='x_ship_to_state' t-att-value="state"/>
+        </template>
+
         <template id="payment_authorize_redirect" name="Payment Authorize">
             <script type="text/javascript">
                 window.location.href = '<t t-esc="return_url"/>';
diff --git a/addons/payment_buckaroo/views/payment_buckaroo_templates.xml b/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
index 820f923eb21..51e05a7413f 100644
--- a/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
+++ b/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
@@ -30,5 +30,24 @@
             </form>
         </template>
 
+        <template id="buckaroo_form">
+            <input type="hidden" name="Brq_websitekey" t-att-value="Brq_websitekey"/>
+            <input type="hidden" name="Brq_amount" t-att-value="Brq_amount"/>
+            <input type="hidden" name="Brq_currency" t-att-value="Brq_currency"/>
+            <input type="hidden" name="Brq_invoicenumber" t-att-value="Brq_invoicenumber"/>
+            <input type="hidden" name="Brq_signature" t-att-value="Brq_signature"/>
+            <input type="hidden" name="brq_test" t-att-value="brq_test"/>
+            <input type="hidden" name="Brq_culture" t-att-value="Brq_culture"/>
+            <!-- URLs -->
+            <input t-if="Brq_return" type='hidden' name='Brq_return'
+                t-att-value="Brq_return"/>
+            <input t-if="Brq_returncancel" type='hidden' name='Brq_returncancel'
+                t-att-value="Brq_returncancel"/>
+            <input t-if="Brq_returnerror" type='hidden' name='Brq_returnerror'
+                t-att-value="Brq_returnerror"/>
+            <input t-if="Brq_returnreject" type='hidden' name='Brq_returnreject'
+                t-att-value="Brq_returnreject"/>
+            <input type='hidden' name='add_returndata' t-att-value="add_returndata"/>
+        </template>
     </data>
 </odoo>
diff --git a/addons/payment_ogone/views/payment_ogone_templates.xml b/addons/payment_ogone/views/payment_ogone_templates.xml
index c70d461d0a7..49c79723d20 100644
--- a/addons/payment_ogone/views/payment_ogone_templates.xml
+++ b/addons/payment_ogone/views/payment_ogone_templates.xml
@@ -53,6 +53,39 @@
             </form>
         </template>
 
+        <template id="ogone_form">
+            <!-- seller -->
+            <input type='hidden' name='PSPID' t-att-value='PSPID'/>
+            <input type='hidden' name='ORDERID' t-att-value='ORDERID'/>
+            <!-- cart -->
+            <input type='hidden' name='AMOUNT' t-att-value='AMOUNT or "0.0"'/>
+            <input type='hidden' name='CURRENCY' t-att-value='CURRENCY'/>
+            <!-- buyer -->
+            <input type='hidden' name='LANGUAGE' t-att-value='LANGUAGE'/>
+            <input type='hidden' name='CN' t-att-value='CN'/>
+            <input type='hidden' name='EMAIL' t-att-value='EMAIL'/>
+            <input type='hidden' name='OWNERZIP' t-att-value='OWNERZIP'/>
+            <input type='hidden' name='OWNERADDRESS' t-att-value='OWNERADDRESS'/>
+            <input type='hidden' name='OWNERCTY' t-att-value='OWNERCTY'/>
+            <input type='hidden' name='OWNERTOWN' t-att-value='OWNERTOWN'/>
+            <input type='hidden' name='OWNERTELNO' t-att-value='OWNERTELNO'/>
+            <t t-if="acquirer.save_token in ['ask', 'always']">
+                <input type='hidden' name='ALIAS' t-att-value='ALIAS'/>
+                <input type='hidden' name='ALIASUSAGE' t-att-value='ALIASUSAGE'/>
+            </t>
+            <!-- before payment verification -->
+            <input type='hidden' name='SHASIGN' t-att-value='SHASIGN'/>
+            <!-- after payment parameters -->
+            <t t-if='PARAMPLUS'>
+                <input type='hidden' name="PARAMPLUS" t-att-value='PARAMPLUS'/>
+            </t>
+            <!-- redirection -->
+            <input type='hidden' name='ACCEPTURL' t-att-value='ACCEPTURL'/>
+            <input type='hidden' name='DECLINEURL' t-att-value='DECLINEURL'/>
+            <input type='hidden' name='EXCEPTIONURL' t-att-value='EXCEPTIONURL'/>
+            <input type='hidden' name='CANCELURL' t-att-value='CANCELURL'/>
+        </template>
+
         <template id="ogone_s2s_form">
             <input type="hidden" name="data_set" data-create-route="/payment/ogone/s2s/create_json_3ds"/>
             <input type="hidden" name="acquirer_id" t-att-value="id"/>
diff --git a/addons/payment_paypal/views/payment_paypal_templates.xml b/addons/payment_paypal/views/payment_paypal_templates.xml
index 9ba50a2b249..41af0c93a11 100644
--- a/addons/payment_paypal/views/payment_paypal_templates.xml
+++ b/addons/payment_paypal/views/payment_paypal_templates.xml
@@ -41,5 +41,35 @@
             </form>
         </template>
 
+        <template id="paypal_form">
+            <input type="hidden" name="cmd" t-att-value="cmd"/>
+            <input type="hidden" name="business" t-att-value="business"/>
+            <input type="hidden" name="item_name" t-att-value="item_name"/>
+            <input type="hidden" name="item_number" t-att-value="item_number"/>
+            <input type="hidden" name="amount" t-att-value="amount"/>
+            <input t-if="handling" type="hidden" name="handling"
+                t-att-value="handling"/>
+            <input type="hidden" name="currency_code" t-att-value="currency_code"/>
+            <!-- partner / address data -->
+            <input type="hidden" name="address1" t-att-value="address1"/>
+            <input type="hidden" name="city" t-att-value="city"/>
+            <input type="hidden" name="country" t-att-value="country"/>
+            <input type="hidden" name="email" t-att-value="email"/>
+            <input type="hidden" name="first_name" t-att-value="first_name"/>
+            <input type="hidden" name="last_name" t-att-value="last_name"/>
+            <input type="hidden" name="zip" t-att-value="zip_code"/>
+            <input t-if='state' type='hidden' name="state"
+                t-att-value='state'/>
+            <!-- after payment parameters -->
+            <input t-if='custom' type='hidden' name="custom"
+                t-att-value='custom'/>
+            <!-- URLs -->
+            <input t-if="paypal_return" type='hidden' name='return'
+                t-att-value="paypal_return"/>
+            <input t-if="acquirer.paypal_use_ipn" type='hidden' name='notify_url'
+                t-att-value="notify_url"/>
+            <input t-if="cancel_return" type="hidden" name="cancel_return"
+                t-att-value="cancel_return"/>
+        </template>
     </data>
 </odoo>
diff --git a/addons/payment_payumoney/views/payment_payumoney_templates.xml b/addons/payment_payumoney/views/payment_payumoney_templates.xml
index 3fd3ca8c254..6b5dd648b73 100644
--- a/addons/payment_payumoney/views/payment_payumoney_templates.xml
+++ b/addons/payment_payumoney/views/payment_payumoney_templates.xml
@@ -22,4 +22,20 @@
             </button>
         </form>
     </template>
+
+    <template id="payumoney_form">
+        <input type="hidden" name="key" t-att-value='key' />
+        <input type="hidden" name="txnid" t-att-value='txnid' />
+        <input type="hidden" name="amount" t-att-value='amount' />
+        <input type="hidden" name="productinfo" t-att-value='productinfo' />
+        <input type="hidden" name="firstname" t-att-value='firstname' />
+        <input type="hidden" name="email" t-att-value='email' />
+        <input type="hidden" name="phone" t-att-value='phone'/>
+        <input type="hidden" name="service_provider" t-att-value='service_provider' />
+        <input type="hidden" name="hash" t-att-value='hash' />
+        <input type="hidden" name="surl" t-att-value='surl' />
+        <input type="hidden" name="furl" t-att-value='furl' />
+        <input type="hidden" name="curl" t-att-value='curl' />
+        <input type="hidden" name="udf1" t-att-value='udf1'/>
+    </template>
 </odoo>
diff --git a/addons/payment_sips/views/payment_sips_templates.xml b/addons/payment_sips/views/payment_sips_templates.xml
index 1d8b487d379..3e4b0e7f87a 100644
--- a/addons/payment_sips/views/payment_sips_templates.xml
+++ b/addons/payment_sips/views/payment_sips_templates.xml
@@ -16,5 +16,10 @@
             </form>
         </template>
 
+        <template id="sips_form">
+            <input type="hidden" name="Data" t-att-value="Data"/>
+            <input type="hidden" name="InterfaceVersion" t-att-value="InterfaceVersion"/>
+            <input type="hidden" name="Seal" t-att-value="Seal"/>
+        </template>
     </data>
 </odoo>
diff --git a/addons/payment_stripe/views/payment_stripe_templates.xml b/addons/payment_stripe/views/payment_stripe_templates.xml
index 8f7f8edd0eb..9eb8b3b05a3 100644
--- a/addons/payment_stripe/views/payment_stripe_templates.xml
+++ b/addons/payment_stripe/views/payment_stripe_templates.xml
@@ -31,6 +31,30 @@
             </form>
         </template>
 
+        <template id="stripe_form">
+            <script src="https://checkout.stripe.com/checkout.js"></script>
+            <input type='hidden' name='stripe_image' t-att-value="acquirer.stripe_image_url"/>
+            <input type='hidden' name='merchant' t-att-value='acquirer.company_id.name'/>
+            <input type='hidden' name='amount' t-att-value="amount"/>
+            <input type="hidden" name='return_url' t-att-value='returndata'/>
+            <!--Order Information -->
+            <input type='hidden' name='invoice_num' t-att-value='reference'/>
+            <input type='hidden' name='currency' t-att-value='currency'/>
+            <input type='hidden' name='currency_id' t-att-value='currency_id'/>
+            <!-- Billing Information-->
+            <input type='hidden' name='name' t-att-value='name'/>
+            <input type='hidden' name='address_line1' t-att-value='address_line1'/>
+            <input type='hidden' name='address_city' t-att-value='address_city'/>
+            <input type='hidden' name='address_zip' t-att-value='address_zip'/>
+            <input type='hidden' name='address_country' t-att-value='address_country'/>
+            <input type='hidden' name='phone' t-att-value='phone'/>
+            <input type='hidden' name='email' t-att-value='email'/>
+            <input id="acquirer_stripe" type='hidden' name="acquirer" t-att-value="acquirer.id"/>
+            <input type='hidden' name="stripe_key" t-att-value="acquirer.stripe_publishable_key"/>
+            <!-- TBE TODO: Seems like the JS does something with the submit button, I need to check this out -->
+            <script type="text/javascript" src="/payment_stripe/static/src/js/stripe.js"></script>
+        </template>
+
         <template id="stripe_s2s_form">
             <input type="hidden" name="data_set" data-create-route="/payment/stripe/s2s/create_json_3ds"/>
             <div class="mt8">
@@ -56,11 +80,5 @@
                 <div class="clearfix"/>
             </div>
         </template>
-
-        <template id="payment_stripe_redirect" name="Payment Stripe">
-            <script type="text/javascript">
-                window.location.href = '<t t-esc="return_url"/>';
-            </script>
-        </template>
     </data>
 </odoo>
diff --git a/addons/payment_transfer/views/payment_transfer_templates.xml b/addons/payment_transfer/views/payment_transfer_templates.xml
index 0716d99c349..52d311d9eb4 100644
--- a/addons/payment_transfer/views/payment_transfer_templates.xml
+++ b/addons/payment_transfer/views/payment_transfer_templates.xml
@@ -19,5 +19,13 @@
             </form>
         </template>
 
+        <template id="transfer_form">
+            <t t-if="return_url">
+                <input type='hidden' name='return_url' t-att-value='return_url'/>
+            </t>
+            <input type='hidden' name='reference' t-att-value='reference'/>
+            <input type='hidden' name='amount' t-att-value='amount'/>
+            <input type='hidden' name='currency' t-att-value='currency.name'/>
+        </template>
     </data>
 </odoo>