[ADD] payment_providers: Pay on site & Cash on delivery

task-4987726
Group bank payments (wire transfer and SDD) in a single file

closes odoo/documentation#15308

Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>

content/applications/finance/accounting/payments/batch_sdd.rst

@@ -81,13 +81,13 @@ To create an |sdd| mandate:
      (:guilabel:`gear`) icon, then select :guilabel:`Mandate form`.
    - The :guilabel:`SDD Scheme` depends on the type of customer: Select :guilabel:`CORE` for B2C
      customers and :guilabel:`B2B` for B2B customers.
-   - |sdd| mandates are created automatically for :doc:`online payments made with SDD
+   - |sdd| mandates are created automatically for :ref:`online payments made with SDD
-     <../../payment_providers/sdd>`.
+     <payment_providers/bank_payments/sdd>`.
 
 Once an |sdd| mandate is active, subsequent |sdd| payments can be generated via Odoo and
 :ref:`uploaded to your online banking interface <accounting/batch_sdd/XML>`. Customers with an
-active |sdd| mandate can also use this payment method for :doc:`online purchases
+active |sdd| mandate can also use this payment method for :ref:`online purchases
-<../../payment_providers/sdd>`.
+<payment_providers/bank_payments/sdd>`.
 
 .. _accounting/batch_sdd/close-revoke-mandate:
 
@@ -139,7 +139,7 @@ of all posted |sdd| payments to your online banking interface. To do so, follow
 
 .. seealso::
    - :doc:`batch`
-   - :doc:`SEPA Direct Debit for online payments <../../payment_providers/sdd>`
+   - :ref:`SEPA Direct Debit for online payments <payment_providers/bank_payments/sdd>`
    - `SEPA guidelines
      <https://www.europeanpaymentscouncil.eu/document-library/implementation-guidelines/sepa-credit-transfer-inter-psp-implementation-guidelines>`_
 

content/applications/finance/accounting/payments/online.rst

@@ -19,7 +19,7 @@ Configuration
 Make sure your :doc:`payment providers are correctly configured <../../payment_providers>`.
 
 .. note::
-   By default, ":doc:`Wire Transfer </applications/finance/payment_providers/wire_transfer>`" is the
+   By default, :ref:`Wire Transfer <payment_providers/bank_payments/wire_transfer>` is the
    only payment provider activated, but you still have to fill out the payment details.
 
 To activate the Invoice Online Payment, go to :menuselection:`Accounting --> Configuration -->

content/applications/finance/payment_providers.rst

@@ -7,8 +7,6 @@ Online payments
 .. toctree::
    :titlesonly:
 
-   payment_providers/wire_transfer
-   payment_providers/sdd
    payment_providers/adyen
    payment_providers/amazon_payment_services
    payment_providers/asiapay
@@ -27,6 +25,8 @@ Online payments
    payment_providers/stripe
    payment_providers/worldline
    payment_providers/xendit
+   payment_providers/bank_payments
+   payment_providers/inperson_payments
 
 Odoo embeds several **payment providers** that allow your customers to pay online, on their
 *customer portals*, or on your *eCommerce website*. They can pay sales orders, invoices, or
@@ -52,7 +52,8 @@ Supported payment providers
 
 To access the supported payment providers, go to :menuselection:`Accounting --> Configuration -->
 Payment Providers`, :menuselection:`Website --> Configuration --> Payment Providers`, or
-:menuselection:`Sales --> Configuration --> Payment Providers`.
+:menuselection:`Sales --> Configuration --> Payment Providers`. Click the relevant payment provider
+card to access and configure the related provider.
 
 .. _payment_providers/online_providers:
 
@@ -196,12 +197,20 @@ Online payment providers
 Bank payments
 -------------
 
-- | :doc:`Wire Transfer <payment_providers/wire_transfer>`
+- | :ref:`Wire Transfer <payment_providers/bank_payments/wire_transfer>`
-  | When selected, Odoo displays your payment information with a payment reference. You have to
+  | Odoo displays your payment information with a payment reference. You have to approve the payment
-    approve the payment manually once you have received it in your bank account.
+    manually once it has been received in your bank account.
-- | :doc:`SEPA Direct Debit <payment_providers/sdd>`
+- | :ref:`SEPA Direct Debit <payment_providers/bank_payments/sdd>`
-  | Your customers can make a bank transfer to register a SEPA Direct Debit mandate and get their
+  | Customers can make a bank transfer to register a SEPA Direct Debit mandate and allow their
-    bank account charged directly.
+    account to be charged directly for future payments.
+
+In-person payments
+------------------
+
+- | :ref:`Pay on Site <payment_providers/inperson_payments/pay_on_site>`
+  | Customers can reserve products online and pay when collecting their orders in store.
+- | :ref:`Cash on Delivery <payment_providers/inperson_payments/cash_on_delivery>`
+  | Customers can pay for their orders upon delivery.
 
 .. _payment_providers/add_new:
 
@@ -258,36 +267,39 @@ are the ones that have been activated. To activate or deactivate a payment metho
 click :guilabel:`Enable Payment Methods`, then click the toggle button of the related method.
 
 .. tip::
-   Payment methods are displayed on your website based on their sequence order. To reorder them,
+   - To view the complete list of supported payment methods, go to :menuselection:`Accounting -->
-   click :guilabel:`Enable Payment Methods` in the payment provider form, then, in the
+     Configuration --> Payment Methods`, :menuselection:`Website --> Configuration -->
-   :guilabel:`Payment Methods` list, drag and drop the payment methods in the desired order.
+     Payment Methods`, or :menuselection:`Sales --> Configuration --> Payment Methods`.
+   - Payment methods are displayed on the ecommerce website based on their sequence order. To
+     reorder them, drag and drop the payment methods into the desired order in the
+     :guilabel:`Payment Methods` list.
 
 Icons and brands
 ----------------
 
 The icons displayed next to the payment method on your website are either the icons of the brands
 activated for the payment method or, if there aren't any, the icons of the payment methods
-themselves. To modify them, go to :menuselection:`Accounting --> Configuration --> Payment Methods`,
+themselves. To modify them, :ref:`access the list of payment methods
-:menuselection:`Website --> Configuration --> Payment Methods` or :menuselection:`Sales -->
+<payment_providers/payment_methods>`, then click the relevant one.
-Configuration --> Payment Methods`, then click on the payment method.
 
 To modify a payment method's icon, hover your mouse over the image in the upper-right corner of the
 payment method's form and click the :icon:`fa-pencil` (:guilabel:`pencil`) icon.
 
 Select the :guilabel:`Brands` tab to view the brands that have been activated for the payment
 method. The brands and their related icons are displayed based on their sequence order; to reorder
-them, drag and drop them in the desired order. To modify a brand's icon, select the brand, then,
+them, drag and drop them into the desired order. To modify a brand's icon, select the brand, then,
 in the popup window that opens, hover the mouse over the image in the upper-right corner and click
 the :icon:`fa-pencil` (:guilabel:`pencil`) icon.
 
 Advanced configuration
 ----------------------
 
-To configure payment methods further, go to :menuselection:`Accounting --> Configuration --> Payment
+To further configure payment methods, follow these steps:
-Methods`, :menuselection:`Website --> Configuration --> Payment Methods` or :menuselection:`Sales
+
---> Configuration --> Payment Methods`. Click on the payment method, then activate the
+#. Activate the :ref:`developer mode <developer-mode>`.
-:ref:`developer mode <developer-mode>`. Click the :guilabel:`Configuration` tab to adapt the
+#. :ref:`Access the list of payment methods <payment_providers/payment_methods>` and click the
-features.
+   relevant one.
+#. Go to the :guilabel:`Configuration` tab and adjust the features as needed.
 
 .. danger::
    - Each payment method is preconfigured in a way that aligns with the payment providers'
@@ -483,8 +495,6 @@ payments from other payments.
    :alt: Define an outstanding account for a payment provider.
 
 .. seealso::
-   - :doc:`payment_providers/wire_transfer`
-   - :doc:`payment_providers/sdd`
    - :doc:`payment_providers/adyen`
    - :doc:`payment_providers/authorize`
    - :doc:`payment_providers/asiapay`
@@ -500,4 +510,6 @@ payments from other payments.
    - :doc:`payment_providers/stripe`
    - :doc:`payment_providers/worldline`
    - :doc:`payment_providers/xendit`
+   - :doc:`payment_providers/bank_payments`
+   - :doc:`payment_providers/inperson_payments`
    - :doc:`accounting/bank`

content/applications/finance/payment_providers/bank_payments.rst

@@ -1,4 +1,56 @@
-=================
+=============
+Bank payments
+=============
+
+.. seealso::
+   :doc:`../payment_providers`
+
+.. _payment_providers/bank_payments/wire_transfer:
+
+Wire transfer
+=============
+
+The **Wire Transfer** payment method allows you to provide payment instructions to customers,
+such as your bank details and a reference to include with the payment. These instructions are
+displayed after the customer selects :guilabel:`Wire Transfer` as the payment method and clicks the
+:guilabel:`Pay now` button at the end of the checkout process on your ecommerce website or on the
+customer portal.
+
+.. note::
+   - While this method is widely accessible and requires minimal setup, it is not efficient
+     process-wise. It is recommended to set up a :doc:`payment provider <../payment_providers>`
+     instead.
+   - Online orders remain in the :guilabel:`Quotation sent` (i.e., unpaid order) stage until you
+     receive the payment and manually :guilabel:`Confirm` the order.
+
+To configure **Wire Transfer**, follow these steps:
+
+#. :ref:`Navigate to the Wire Transfer payment provider <payment_providers/supported_providers>`.
+#. In the :guilabel:`Configuration` tab, select whether the memo or :guilabel:`Communication` to be
+   displayed alongside the payment instructions should be:
+
+   - :guilabel:`Based on Document Reference`: the sales order or invoice number
+   - :guilabel:`Based on Customer ID`: the customer identifier
+
+#. Enable :guilabel:`Enable QR codes` to activate QR code payments.
+
+   .. note::
+      :doc:`Additional accounting setup <../accounting/customer_invoices/epc_qr_code>` is required
+      to use QR codes.
+
+#. Define the payment instructions in the :guilabel:`Messages` tab. If :doc:`a bank account
+   <../accounting/bank>` has already been defined, the account number is automatically added to the
+   default message generated by Odoo. You can also add it afterward and update the message by
+   clicking :guilabel:`Reload pending message`.
+#. Set the :guilabel:`State` field to :guilabel:`Enabled`.
+
+.. tip::
+   The **Wire transfer** payment method can serve as a template for other payment methods that are
+   processed manually, such as checks. :ref:`Access the Wire Transfer payment method
+   <payment_providers/payment_methods>`, then duplicate it if needed and rename it accordingly.
+
+.. _payment_providers/bank_payments/sdd:
+
 SEPA Direct Debit
 =================
 
@@ -24,7 +76,7 @@ customers' bank accounts based on a signed :ref:`SEPA Direct Debit mandate
 .. _sdd/configuration:
 
 Configuration
-=============
+-------------
 
 To configure **SEPA Direct Debit**, follow these steps:
 
@@ -54,11 +106,8 @@ To configure **SEPA Direct Debit**, follow these steps:
 .. tip::
    You can also test SEPA direct debit payments using the :ref:`payment_providers/test-mode`.
 
-.. seealso::
-   :doc:`../payment_providers`
-
 Online payments with |sdd|
-==========================
+--------------------------
 
 Customers selecting |sdd| as a payment method are prompted to enter their IBAN to complete the
 :ref:`SEPA Direct Debit mandate <accounting/batch_sdd/sdd_mandates>`.

content/applications/finance/payment_providers/inperson_payments.rst

@@ -0,0 +1,40 @@
+==================
+In-person payments
+==================
+
+.. note::
+   Sales orders are automatically confirmed when paid using an in-person payment method.
+
+.. _payment_providers/inperson_payments/pay_on_site:
+
+Pay on site
+===========
+
+To allow customers to reserve products online and pay when collecting them in-store, enable and
+configure the :ref:`Click & Collect feature <ecommerce/shipping/instore-pickup>`. The **Pay on
+Site** payment provider is automatically enabled and published. To edit the default instructions
+shown to customers, :ref:`access the payment provider form <payment_providers/supported_providers>`
+and go to the :guilabel:`Messages` tab.
+
+.. note::
+   The method is only available at checkout for customers who select the **Pick up in store**
+   delivery method.
+
+.. _payment_providers/inperson_payments/cash_on_delivery:
+
+Cash on delivery
+================
+
+The **Cash on Delivery** payment method allows customers to pay for their order at the time of
+delivery. To make it available to customers, :doc:`navigate to the relevant delivery method form
+</applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/new_delivery_method>`
+and enable :guilabel:`Cash on Delivery`. The **Cash on Delivery** payment provider is automatically
+enabled and published. To edit the default instructions shown to customers, :ref:`access the payment
+provider form <payment_providers/supported_providers>` and go to the :guilabel:`Messages` tab.
+
+.. note::
+   This method is only available at checkout for customers who select a delivery method with the
+   :guilabel:`Cash on Delivery` feature enabled.
+
+.. seealso::
+   :doc:`../payment_providers`

content/applications/finance/payment_providers/wire_transfer.rst

@@ -1,58 +0,0 @@
-==============
-Wire transfers
-==============
-
-The **Wire Transfer** payment method allows you to provide payment instructions to your customers,
-such as your bank details and a reference to include with the payment. These instructions are
-displayed after the customer selects :guilabel:`Wire Transfer` as the payment method and clicks the
-:guilabel:`Pay now` button at the end of the checkout process on your ecommerce website or
-on the customer portal.
-
-.. image:: wire_transfer/payment_instructions_portal.png
-   :scale: 80%
-   :alt: Payment instructions on the customer portal
-
-.. note::
-   - While this method is widely accessible and requires minimal setup, it is not efficient
-     process-wise. It is recommended to set up a :doc:`payment provider <../payment_providers>`
-     instead.
-   - Online orders remain in the :guilabel:`Quotation sent` (i.e., unpaid order) stage until you
-     receive the payment and manually :guilabel:`Confirm` the order.
-
-.. tip::
-   **Wire transfer** can be used as a template for other payment methods that are processed
-   manually, such as checks, by renaming or duplicating it.
-
-Configuration
-=============
-
-To configure **Wire Transfer**:
-
-#. :ref:`Navigate to the Wire Transfer payment provider <payment_providers/supported_providers>`.
-#. In the :guilabel:`Configuration` tab, select whether the memo or :guilabel:`Communication` to be
-   displayed alongside the payment instructions should be:
-
-   - :guilabel:`Based on Document Reference`: the sales order or invoice number
-   - :guilabel:`Based on Customer ID`: the customer identifier
-
-#. Enable :guilabel:`Enable QR codes` to activate QR code payments.
-
-   .. note::
-      :doc:`Additional accounting setup <../accounting/customer_invoices/epc_qr_code>` is required
-      to use QR codes.
-
-#. Define the payment instructions in the :guilabel:`Messages` tab. If :doc:`a bank account
-   <../accounting/bank>` has already been defined, the account number is automatically added to the
-   default message generated by Odoo. You can also add it afterward and update the message by
-   clicking :guilabel:`Reload pending message`.
-
-   .. image:: wire_transfer/payment_instructions.png
-      :alt: Define payment instructions
-
-#. Set the :guilabel:`State` field to :guilabel:`Enabled`.
-
-.. tip::
-   You can also test wire transfers using the :ref:`payment_providers/test-mode`.
-
-.. seealso::
-   :doc:`../payment_providers`

content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/new_delivery_method.rst

@@ -12,14 +12,14 @@ product, and the shipping details can be added to the delivery order.
 Configuration
 -------------
 
-To configure delivery methods, go to :menuselection:`Inventory app --> Configuration --> Delivery
+To configure delivery methods, go to :menuselection:`Inventory --> Configuration --> Delivery
 Methods`.
 
 .. note::
    If the :guilabel:`Delivery Methods` option is not available from the :guilabel:`Configuration`
    drop-down menu, verify whether the feature is enabled by following these steps:
 
-   #. Go to :menuselection:`Inventory app --> Configuration --> Settings`.
+   #. Go to :menuselection:`Inventory --> Configuration --> Settings`.
    #. Scroll to the :guilabel:`Shipping` section and enable the :guilabel:`Delivery Methods` feature
       by checking the corresponding checkbox.
 
@@ -33,14 +33,18 @@ a form to provide details about the shipping provider, including:
 
 - :guilabel:`Delivery Method` (*Required field*): the name of the delivery method (e.g. `flat-rate
   shipping`, `same day delivery`, etc.).
-- :guilabel:`Website`: configure shipping methods for an **eCommerce** page. Select the applicable
+- :guilabel:`Website`: configure :doc:`delivery methods for an ecommerce
-  website from the drop-down menu, or leave it blank to apply the method to all web pages.
+  </applications/websites/ecommerce/shipping>`. Select the applicable website from the drop-down
+  menu, or leave it blank to apply the method to all web pages.
 - :guilabel:`Provider` (*Required field*): choose the delivery service, like FedEx, if using a
   :ref:`third-party carrier <inventory/shipping/third_party>`. Ensure the integration with the
   shipping carrier is properly installed and select the provider from the drop-down menu. For more
   details on configuring custom shipping methods, such as :ref:`fixed price
   <inventory/shipping/fixed>` or :ref:`based on rules <inventory/shipping/rules>` options, refer to
   their respective sections below.
+- :guilabel:`Cash on Delivery`: allow customers to choose the :ref:`Cash on Delivery
+  <payment_providers/inperson_payments/cash_on_delivery>` payment method when selecting this
+  delivery option on the ecommerce website.
 - :guilabel:`Company`: If the shipping method should apply to a specific company, select it from the
   drop-down menu. Leave the field blank to apply the method to all companies.
 - :guilabel:`Routes`: select the applicable routes to define different delivery methods, such as
@@ -76,7 +80,7 @@ For examples on how to configure specific shipping methods, refer to the section
 Fixed price
 -----------
 
-To configure a shipping price that is the same for all orders, go to :menuselection:`Inventory app
+To configure a shipping price that is the same for all orders, go to :menuselection:`Inventory
 --> Configuration --> Delivery Methods`. Then, click :guilabel:`New`, and on the shipping method
 form, set the :guilabel:`Provider` to the :guilabel:`Fixed Price` option. Selecting this option
 makes the :guilabel:`Fixed Price` field become available, which is where the fixed rate shipping
@@ -172,7 +176,7 @@ different :doc:`routes <../daily_operations/use_routes>` for it.
    - in-store pickup or home delivery: ship from the central warehouse, or pick from the store's
      stock, depending on customer selection.
 
-To set up routes, go to :menuselection:`Inventory app --> Configuration --> Routes`. Click
+To set up routes, go to :menuselection:`Inventory --> Configuration --> Routes`. Click
 :guilabel:`New`, or select the desired route.
 
 On the route form, in the :guilabel:`Applicable On` section, tick the :guilabel:`Shipping Methods`
@@ -183,7 +187,7 @@ checkbox.
 
    Routes form with the :guilabel:`Shipping Method` checkbox ticked.
 
-Then, go to :menuselection:`Inventory app --> Configuration --> Delivery Methods`, and select the
+Then, go to :menuselection:`Inventory --> Configuration --> Delivery Methods`, and select the
 desired shipping method.
 
 On the shipping method form, in the :guilabel:`Routes` field, select the available fulfillment

content/applications/websites/ecommerce/shipping.rst

@@ -99,14 +99,14 @@ In the :guilabel:`Provider` field, select :ref:`Based on Rules <inventory/shippi
 Click & Collect
 ===============
 
-To allow customers to reserve products online and pay for/collect them in-store, follow these steps:
+To allow customers to reserve products online and collect them in-store, follow these steps:
 
 #. Go to :menuselection:`Website --> Configuration --> Settings`.
-#. Scroll to the :guilabel:`Delivery` section, enable :guilabel:`Click & Collect`, and
+#. Scroll to the :guilabel:`eCommerce` section, enable :guilabel:`Click & Collect`, and
    :guilabel:`Save`.
 #. Click :icon:`fa-arrow-right` :guilabel:`Configure Pickup Locations` to :ref:`configure
-   <inventory/shipping_receiving/configure-delivery-method>` the delivery method and ensure the
+   <inventory/shipping_receiving/configure-delivery-method>` the delivery method if needed and
-   :guilabel:`Provider` field is set to :guilabel:`Pick up in store`.
+   ensure the :guilabel:`Provider` field is set to :guilabel:`Pick up in store`.
 #. In the :guilabel:`Stores` tab, click :guilabel:`Add a line` and select the warehouse(s) where
    customers can collect their orders.
 #. Once your setup is complete, click the :guilabel:`Unpublish` button to change the status to
@@ -122,4 +122,7 @@ To allow customers to reserve products online and pay for/collect them in-store,
      selector on the product page.
    - Each warehouse must have a **complete address** to ensure its location is accurately displayed
      to customers. Incomplete addresses prevent the warehouse from being shown.
-   - The Click & Collect option is not available for services.
+   - The :guilabel:`Click & Collect` option is not available for services.
+   - By default, the :ref:`Pay on Site <payment_providers/inperson_payments/pay_on_site>` payment
+     method is :ref:`enabled and published <payment_providers/add_new>` when the :guilabel:`Click &
+     Collect` feature is activated.

redirects/19.0.txt

@@ -8,3 +8,8 @@ applications/inventory_and_mrp/inventory/product_management/inventory_valuation/
 applications/inventory_and_mrp/inventory/product_management/inventory_valuation/inventory_valuation_config.rst applications/inventory_and_mrp/inventory/inventory_valuation/cheat_sheet.rst
 applications/inventory_and_mrp/inventory/product_management/inventory_valuation/using_inventory_valuation.rst applications/inventory_and_mrp/inventory/inventory_valuation/cheat_sheet.rst
 applications/inventory_and_mrp/inventory/product_management/inventory_valuation/valuation_by_lots.rst applications/inventory_and_mrp/inventory/inventory_valuation/valuation_by_lots.rst
+
+# applications/finance
+
+applications/finance/payment_providers/wire_transfer.rst applications/finance/payment_providers/bank_payments.rst
+applications/finance/payment_providers/sdd.rst applications/finance/payment_providers/bank_payments.rst