[IMP] pos: Gift card links

content/applications/sales/point_of_sale/use.rst

@@ -242,8 +242,8 @@ The steps to process a refund from the :ref:`POS register <pos/use/open-register
 the refund is :ref:`based on an order <pos/use/refund-order-based>` or processed as a
 :ref:`standalone refund that is not based on an order <pos/use/refund-standalone>`.
 
-In both cases, the amount can be refunded or a :ref:`gift card <pos/pricing/loyalty>` issued for the
-refunded amount.
+In both cases, the amount can be refunded or a :ref:`gift card <pos/pricing/giftcards_ewallet>`
+issued for the refunded amount.
 
 .. note::
    Once the return is validated, a corresponding credit note is generated, referencing the original
@@ -267,11 +267,11 @@ To process a refund based on an order, follow these steps:
 
    - To refund the customer, on the payment screen, select a payment method, then click
      :guilabel:`Validate`.
-   - To issue a :ref:`gift card <pos/pricing/loyalty>` for the refund amount, on the payment screen,
-     click :guilabel:`Back`. The cart displays the returned product(s) with a negative quantity.
-     Then, add the gift card from the product selector to the order; its value is automatically set
-     to match the total refund amount. Click :guilabel:`Payment`, then :guilabel:`Validate` the
-     refund.
+   - To issue a :ref:`gift card <pos/pricing/giftcards_ewallet>` for the refund amount, on the
+     payment screen, click :guilabel:`Back`. The cart displays the returned product(s) with a
+     negative quantity. Then, add the gift card from the product selector to the order; its value is
+     automatically set to match the total refund amount. Click :guilabel:`Payment`, then
+     :guilabel:`Validate` the refund.
 
 .. tip::
    - Alternatively, access the list of paid orders by clicking :guilabel:`Orders` in the POS
@@ -298,7 +298,29 @@ To process a standalone refund that is *not* based on an order, follow these ste
    negative quantity.
 #. Optionally, select the :ref:`gift card <pos/pricing/loyalty>` if needed for the process.
 #. Click :guilabel:`Payment` to open the payment screen.
+<<<<<<< 821fd3bc39eafa9ed0d7920ed51577d6f59fee1e
 #. Select a payment method, then click :guilabel:`Validate`.
+||||||| 1673f534e4aba0e98e54b23ea3b807f0511e5e7c
+#. Choose how to handle the refund:
+
+   - To refund the customer, on the payment screen, select a payment method, then click
+     :guilabel:`Validate`.
+   - To issue a :ref:`gift card <pos/pricing/loyalty>` for the refund amount, on the payment screen,
+     click :guilabel:`Back`. The cart displays the returned product(s) with a negative quantity.
+     Then, add the gift card from the product selector to the order; its value is automatically set
+     to match the total refund amount. Click :guilabel:`Payment`, then :guilabel:`Validate` the
+     refund.
+=======
+#. Choose how to handle the refund:
+
+   - To refund the customer, on the payment screen, select a payment method, then click
+     :guilabel:`Validate`.
+   - To issue a :ref:`gift card <pos/pricing/giftcards_ewallet>` for the refund amount, on the
+     payment screen, click :guilabel:`Back`. The cart displays the returned product(s) with a
+     negative quantity. Then, add the gift card from the product selector to the order; its value is
+     automatically set to match the total refund amount. Click :guilabel:`Payment`, then
+     :guilabel:`Validate` the refund.
+>>>>>>> f5cfcf49ebab450ac7918d126ce59f6fad029ae1
 
 .. tip::
    To facilitate management of standalone returns, create a :doc:`preset <extra/presets>` with only