diff --git a/README.md b/README.md
index 64001a19..ff36d18f 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,8 @@ $bundles = [
 
 You will find the templates you need to override in the [test application](https://github.com/Setono/SyliusGiftCardPlugin/tree/master/tests/Application/templates).
 
+If you enable the same input for Promotion and GiftCard (see [here](#using-same-input-for-promotion-and-giftcard)), remove all content of `SyliusShopBundle/Cart/Summary/_coupon.html.twig` since it is not needed.
+
 ### Extend `Product`, `Order`, `OrderRepository`, and `CustomerRepository`
 
 **Extend `Product`**
@@ -283,3 +285,17 @@ setono_sylius_gift_card_shop_remove_gift_card_from_order:
 The same applies for the `setono_sylius_gift_card_shop_partial_add_gift_card_to_order` route
 
 You can also override or decorate the service `setono_sylius_gift_card.resolver.redirect_url` to define a more custom way of redirecting
+
+## Using same input for Promotion and GiftCard
+
+You can configure the shop to use same input for GiftCards and Promotion coupons. To do so, set this configuration :
+
+```yaml
+# config/packages/setono_sylius_gift_card.yaml
+setono_sylius_gift_card:
+    cart:
+        use_same_input_for_promotion_and_gift_card: true
+```
+
+By doing so, the alias `setono_sylius_gift_card.controller.action.add_gift_card_to_order` will now point to `setono_sylius_gift_card.controller.action.add_gift_card_to_order.composed` instead of `setono_sylius_gift_card.controller.action.add_gift_card_to_order.simple`
+and will use its mechanisms.
diff --git a/src/Applicator/CouponCodeApplicator.php b/src/Applicator/CouponCodeApplicator.php
new file mode 100644
index 00000000..ff16dbcb
--- /dev/null
+++ b/src/Applicator/CouponCodeApplicator.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Applicator;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Setono\SyliusGiftCardPlugin\Model\OrderInterface;
+use Sylius\Component\Core\Model\PromotionCouponInterface;
+use Sylius\Component\Order\Processor\OrderProcessorInterface;
+use Sylius\Component\Promotion\Action\PromotionApplicatorInterface;
+use Sylius\Component\Promotion\Repository\PromotionCouponRepositoryInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Webmozart\Assert\Assert;
+
+final class CouponCodeApplicator implements CouponCodeApplicatorInterface
+{
+    /** @var PromotionCouponRepositoryInterface */
+    private $promotionCouponRepository;
+
+    /** @var OrderProcessorInterface */
+    private $orderProcessor;
+
+    /** @var EntityManagerInterface */
+    private $orderManager;
+
+    /** @var PromotionApplicatorInterface */
+    private $promotionApplicator;
+
+    public function __construct(
+        PromotionCouponRepositoryInterface $promotionCouponRepository,
+        OrderProcessorInterface $orderProcessor,
+        EntityManagerInterface $orderManager,
+        PromotionApplicatorInterface $promotionApplicator
+    ) {
+        $this->promotionCouponRepository = $promotionCouponRepository;
+        $this->orderProcessor = $orderProcessor;
+        $this->orderManager = $orderManager;
+        $this->promotionApplicator = $promotionApplicator;
+    }
+
+    public function apply(OrderInterface $order, string $couponCode): void
+    {
+        $promotionCoupon = $this->promotionCouponRepository->findOneBy(['code' => $couponCode]);
+        if ($promotionCoupon instanceof PromotionCouponInterface) {
+            $order->setPromotionCoupon($promotionCoupon);
+            $promotion = $promotionCoupon->getPromotion();
+            Assert::notNull($promotion);
+            $this->promotionApplicator->apply($order, $promotion);
+            $this->orderProcessor->process($order);
+
+            $this->orderManager->flush();
+        } else {
+            throw new NotFoundHttpException('Impossible to find the coupon');
+        }
+    }
+}
diff --git a/src/Applicator/CouponCodeApplicatorInterface.php b/src/Applicator/CouponCodeApplicatorInterface.php
new file mode 100644
index 00000000..06d15ce6
--- /dev/null
+++ b/src/Applicator/CouponCodeApplicatorInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Applicator;
+
+use Setono\SyliusGiftCardPlugin\Model\OrderInterface;
+
+interface CouponCodeApplicatorInterface
+{
+    public function apply(OrderInterface $order, string $couponCode): void;
+}
diff --git a/src/Controller/Action/AddGiftCardOrPromotionCouponToOrderAction.php b/src/Controller/Action/AddGiftCardOrPromotionCouponToOrderAction.php
new file mode 100644
index 00000000..783b2522
--- /dev/null
+++ b/src/Controller/Action/AddGiftCardOrPromotionCouponToOrderAction.php
@@ -0,0 +1,117 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Controller\Action;
+
+use FOS\RestBundle\View\View;
+use FOS\RestBundle\View\ViewHandlerInterface;
+use Setono\SyliusGiftCardPlugin\Applicator\CouponCodeApplicatorInterface;
+use Setono\SyliusGiftCardPlugin\Applicator\GiftCardApplicatorInterface;
+use Setono\SyliusGiftCardPlugin\Form\Type\AddGiftCardOrPromotionCouponToOrderType;
+use Setono\SyliusGiftCardPlugin\Model\OrderInterface;
+use Setono\SyliusGiftCardPlugin\Resolver\RedirectUrlResolverInterface;
+use Sylius\Component\Order\Context\CartContextInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Webmozart\Assert\Assert;
+
+final class AddGiftCardOrPromotionCouponToOrderAction
+{
+    /** @var ViewHandlerInterface */
+    private $viewHandler;
+
+    /** @var FormFactoryInterface */
+    private $formFactory;
+
+    /** @var CartContextInterface */
+    private $cartContext;
+
+    /** @var FlashBagInterface */
+    private $flashBag;
+
+    /** @var GiftCardApplicatorInterface */
+    private $giftCardApplicator;
+
+    /** @var RedirectUrlResolverInterface */
+    private $redirectRouteResolver;
+
+    /** @var CouponCodeApplicatorInterface */
+    private $couponCodeApplicator;
+
+    /** @var bool */
+    private $useSameInputForPromotionAndGiftCard;
+
+    public function __construct(
+        ViewHandlerInterface $viewHandler,
+        FormFactoryInterface $formFactory,
+        CartContextInterface $cartContext,
+        FlashBagInterface $flashBag,
+        GiftCardApplicatorInterface $giftCardApplicator,
+        RedirectUrlResolverInterface $redirectRouteResolver,
+        CouponCodeApplicatorInterface $couponCodeApplicator,
+        bool $useSameInputForPromotionAndGiftCard
+    ) {
+        $this->viewHandler = $viewHandler;
+        $this->formFactory = $formFactory;
+        $this->cartContext = $cartContext;
+        $this->flashBag = $flashBag;
+        $this->giftCardApplicator = $giftCardApplicator;
+        $this->redirectRouteResolver = $redirectRouteResolver;
+        $this->couponCodeApplicator = $couponCodeApplicator;
+        $this->useSameInputForPromotionAndGiftCard = $useSameInputForPromotionAndGiftCard;
+    }
+
+    public function __invoke(Request $request): Response
+    {
+        /** @var OrderInterface|null $order */
+        $order = $this->cartContext->getCart();
+
+        if (null === $order) {
+            throw new NotFoundHttpException();
+        }
+
+        $addGiftCardOrPromotionCouponToOrderCommand = new AddGiftCardOrPromotionCouponToOrderCommand();
+        $form = $this->formFactory->create(AddGiftCardOrPromotionCouponToOrderType::class, $addGiftCardOrPromotionCouponToOrderCommand);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $giftCard = $addGiftCardOrPromotionCouponToOrderCommand->getGiftCard();
+            $promotionCoupon = $addGiftCardOrPromotionCouponToOrderCommand->getPromotionCoupon();
+            if (null !== $giftCard) {
+                $this->giftCardApplicator->apply($order, $giftCard);
+            } elseif (null !== $promotionCoupon) {
+                $couponCode = $promotionCoupon->getCode();
+                Assert::notNull($couponCode);
+                $this->couponCodeApplicator->apply($order, $couponCode);
+            }
+
+            $this->flashBag->add('success', 'setono_sylius_gift_card.gift_card_added');
+
+            if ($request->isXmlHttpRequest()) {
+                return $this->viewHandler->handle(View::create([], Response::HTTP_CREATED));
+            }
+
+            return new RedirectResponse($this->redirectRouteResolver->getUrlToRedirectTo($request, 'sylius_shop_cart_summary'));
+        }
+
+        if ($request->isXmlHttpRequest()) {
+            return $this->viewHandler->handle(View::create($form, Response::HTTP_BAD_REQUEST)->setData([
+                'errors' => $form->getErrors(true, true),
+            ]));
+        }
+
+        $view = View::create()
+            ->setData([
+                'form' => $form->createView(),
+            ])
+            ->setTemplate('@SetonoSyliusGiftCardPlugin/Shop/addGiftCardToOrder.html.twig')
+        ;
+
+        return $this->viewHandler->handle($view);
+    }
+}
diff --git a/src/Controller/Action/AddGiftCardOrPromotionCouponToOrderCommand.php b/src/Controller/Action/AddGiftCardOrPromotionCouponToOrderCommand.php
new file mode 100644
index 00000000..cba07372
--- /dev/null
+++ b/src/Controller/Action/AddGiftCardOrPromotionCouponToOrderCommand.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Controller\Action;
+
+use Setono\SyliusGiftCardPlugin\Model\GiftCardInterface;
+use Sylius\Component\Core\Model\PromotionCouponInterface;
+
+final class AddGiftCardOrPromotionCouponToOrderCommand
+{
+    /** @var GiftCardInterface|null */
+    private $giftCard;
+
+    /** @var PromotionCouponInterface|null */
+    private $promotionCoupon;
+
+    public function getGiftCard(): ?GiftCardInterface
+    {
+        return $this->giftCard;
+    }
+
+    public function setGiftCard(?GiftCardInterface $giftCard): void
+    {
+        $this->giftCard = $giftCard;
+    }
+
+    public function getPromotionCoupon(): ?PromotionCouponInterface
+    {
+        return $this->promotionCoupon;
+    }
+
+    public function setPromotionCoupon(?PromotionCouponInterface $promotionCoupon): void
+    {
+        $this->promotionCoupon = $promotionCoupon;
+    }
+}
diff --git a/src/Controller/Action/AddGiftCardToOrderAction.php b/src/Controller/Action/AddGiftCardToOrderAction.php
index 988ddd07..3b9e4c38 100644
--- a/src/Controller/Action/AddGiftCardToOrderAction.php
+++ b/src/Controller/Action/AddGiftCardToOrderAction.php
@@ -6,6 +6,7 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Setono\SyliusGiftCardPlugin\Applicator\CouponCodeApplicatorInterface;
 use Setono\SyliusGiftCardPlugin\Applicator\GiftCardApplicatorInterface;
 use Setono\SyliusGiftCardPlugin\Form\Type\AddGiftCardToOrderType;
 use Setono\SyliusGiftCardPlugin\Model\OrderInterface;
@@ -39,13 +40,21 @@ final class AddGiftCardToOrderAction
     /** @var RedirectUrlResolverInterface */
     private $redirectRouteResolver;
 
+    /** @var CouponCodeApplicatorInterface */
+    private $couponCodeApplicator;
+
+    /** @var bool */
+    private $useSameInputForPromotionAndGiftCard;
+
     public function __construct(
         ViewHandlerInterface $viewHandler,
         FormFactoryInterface $formFactory,
         CartContextInterface $cartContext,
         FlashBagInterface $flashBag,
         GiftCardApplicatorInterface $giftCardApplicator,
-        RedirectUrlResolverInterface $redirectRouteResolver
+        RedirectUrlResolverInterface $redirectRouteResolver,
+        CouponCodeApplicatorInterface $couponCodeApplicator,
+        bool $useSameInputForPromotionAndGiftCard
     ) {
         $this->viewHandler = $viewHandler;
         $this->formFactory = $formFactory;
@@ -53,6 +62,8 @@ public function __construct(
         $this->flashBag = $flashBag;
         $this->giftCardApplicator = $giftCardApplicator;
         $this->redirectRouteResolver = $redirectRouteResolver;
+        $this->couponCodeApplicator = $couponCodeApplicator;
+        $this->useSameInputForPromotionAndGiftCard = $useSameInputForPromotionAndGiftCard;
     }
 
     public function __invoke(Request $request): Response
@@ -68,18 +79,42 @@ public function __invoke(Request $request): Response
         $form = $this->formFactory->create(AddGiftCardToOrderType::class, $addGiftCardToOrderCommand);
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            $giftCard = $addGiftCardToOrderCommand->getGiftCard();
-            Assert::notNull($giftCard);
-            $this->giftCardApplicator->apply($order, $giftCard);
+        if ($form->isSubmitted()) {
+            if ($form->isValid()) {
+                $giftCard = $addGiftCardToOrderCommand->getGiftCard();
+                Assert::notNull($giftCard);
+                $this->giftCardApplicator->apply($order, $giftCard);
 
-            $this->flashBag->add('success', 'setono_sylius_gift_card.gift_card_added');
+                $this->flashBag->add('success', 'setono_sylius_gift_card.gift_card_added');
 
-            if ($request->isXmlHttpRequest()) {
-                return $this->viewHandler->handle(View::create([], Response::HTTP_CREATED));
+                if ($request->isXmlHttpRequest()) {
+                    return $this->viewHandler->handle(View::create([], Response::HTTP_CREATED));
+                }
+
+                return new RedirectResponse($this->redirectRouteResolver->getUrlToRedirectTo($request, 'sylius_shop_cart_summary'));
             }
 
-            return new RedirectResponse($this->redirectRouteResolver->getUrlToRedirectTo($request, 'sylius_shop_cart_summary'));
+            if ($this->useSameInputForPromotionAndGiftCard) {
+                // Arrived here, the code applied is not a giftCard.
+                // Then check if it is a promotion and if so, apply it to order.
+                // Use NormData instead of Data since the form is invalid, Data is null
+                $promotionCouponCode = $form->get('giftCard')->getNormData();
+                if (null !== $promotionCouponCode) {
+                    try {
+                        $this->couponCodeApplicator->apply($order, $promotionCouponCode);
+
+                        $this->flashBag->add('success', 'setono_sylius_gift_card.gift_card_added');
+
+                        if ($request->isXmlHttpRequest()) {
+                            return $this->viewHandler->handle(View::create([], Response::HTTP_CREATED));
+                        }
+
+                        return new RedirectResponse($this->redirectRouteResolver->getUrlToRedirectTo($request, 'sylius_shop_cart_summary'));
+                    } catch (\Exception $exception) {
+                        // Do not do anything here, let FOSRest handle the response
+                    }
+                }
+            }
         }
 
         if ($request->isXmlHttpRequest()) {
diff --git a/src/DependencyInjection/Compiler/DefineControllerPass.php b/src/DependencyInjection/Compiler/DefineControllerPass.php
new file mode 100644
index 00000000..a4d9012d
--- /dev/null
+++ b/src/DependencyInjection/Compiler/DefineControllerPass.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * This class will be used to create an alias to for `setono_sylius_gift_card.controller.action.add_gift_card_to_order`
+ * According to whether we want the same input for GiftCard and PromotionCoupon or not.
+ */
+final class DefineControllerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $useSameInput = (bool) $container->getParameter('setono_sylius_gift_card.cart.use_same_input_for_promotion_and_gift_card');
+
+        if ($useSameInput) {
+            $container->setAlias(
+                'setono_sylius_gift_card.controller.action.add_gift_card_to_order',
+                'setono_sylius_gift_card.controller.action.add_gift_card_to_order.composed'
+            );
+        } else {
+            $container->setAlias(
+                'setono_sylius_gift_card.controller.action.add_gift_card_to_order',
+                'setono_sylius_gift_card.controller.action.add_gift_card_to_order.simple'
+            );
+        }
+
+        $container->getAlias('setono_sylius_gift_card.controller.action.add_gift_card_to_order')->setPublic(true);
+    }
+}
diff --git a/src/DependencyInjection/Compiler/OverrideCouponFormPass.php b/src/DependencyInjection/Compiler/OverrideCouponFormPass.php
new file mode 100644
index 00000000..4a2db83b
--- /dev/null
+++ b/src/DependencyInjection/Compiler/OverrideCouponFormPass.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+final class OverrideCouponFormPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $useSameInput = (bool) $container->getParameter('setono_sylius_gift_card.cart.use_same_input_for_promotion_and_gift_card');
+
+        if ($useSameInput) {
+            return;
+        }
+
+        $container->removeDefinition('setono_sylius_gift_card.form.type.promotion_coupon_to_code');
+    }
+}
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 1722fc3c..de3bcb92 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -44,6 +44,12 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->max(255)
                     ->example(16)
                 ->end()
+                ->arrayNode('cart')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->booleanNode('use_same_input_for_promotion_and_gift_card')->defaultFalse()->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 
diff --git a/src/DependencyInjection/SetonoSyliusGiftCardExtension.php b/src/DependencyInjection/SetonoSyliusGiftCardExtension.php
index 1eda3920..bed6221b 100644
--- a/src/DependencyInjection/SetonoSyliusGiftCardExtension.php
+++ b/src/DependencyInjection/SetonoSyliusGiftCardExtension.php
@@ -17,6 +17,11 @@ public function load(array $config, ContainerBuilder $container): void
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
 
         $container->setParameter('setono_sylius_gift_card.code_length', $config['code_length']);
+        $useSameInputForPromotionAndGiftCard = false;
+        if (array_key_exists('cart', $config) && array_key_exists('use_same_input_for_promotion_and_gift_card', $config['cart'])) {
+            $useSameInputForPromotionAndGiftCard = $config['cart']['use_same_input_for_promotion_and_gift_card'];
+        }
+        $container->setParameter('setono_sylius_gift_card.cart.use_same_input_for_promotion_and_gift_card', $useSameInputForPromotionAndGiftCard);
 
         $this->registerResources('setono_sylius_gift_card', $config['driver'], $config['resources'], $container);
 
diff --git a/src/Form/DataTransformer/GiftCardToCodeDataTransformer.php b/src/Form/DataTransformer/GiftCardToCodeDataTransformer.php
index 85ef3f6d..5d5597c0 100644
--- a/src/Form/DataTransformer/GiftCardToCodeDataTransformer.php
+++ b/src/Form/DataTransformer/GiftCardToCodeDataTransformer.php
@@ -8,10 +8,9 @@
 use Setono\SyliusGiftCardPlugin\Repository\GiftCardRepositoryInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Symfony\Component\Form\DataTransformerInterface;
-use Symfony\Component\Form\Exception\TransformationFailedException;
 use Webmozart\Assert\Assert;
 
-final class GiftCardToCodeDataTransformer implements DataTransformerInterface
+class GiftCardToCodeDataTransformer implements DataTransformerInterface
 {
     /** @var GiftCardRepositoryInterface */
     private $giftCardRepository;
@@ -47,15 +46,9 @@ public function reverseTransform($value): ?GiftCardInterface
             return null;
         }
 
-        $giftCard = $this->giftCardRepository->findOneEnabledByCodeAndChannel(
+        return $this->giftCardRepository->findOneEnabledByCodeAndChannel(
             $value,
             $this->channelContext->getChannel()
         );
-
-        if (null !== $giftCard) {
-            return $giftCard;
-        }
-
-        throw new TransformationFailedException('setono_sylius_gift_card.ui.gift_card_code_does_not_exist');
     }
 }
diff --git a/src/Form/DataTransformer/PromotionCouponToCodeDataTransformer.php b/src/Form/DataTransformer/PromotionCouponToCodeDataTransformer.php
new file mode 100644
index 00000000..16affffc
--- /dev/null
+++ b/src/Form/DataTransformer/PromotionCouponToCodeDataTransformer.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Form\DataTransformer;
+
+use Sylius\Component\Core\Model\PromotionCouponInterface;
+use Sylius\Component\Promotion\Repository\PromotionCouponRepositoryInterface;
+use Symfony\Component\Form\DataTransformerInterface;
+use Webmozart\Assert\Assert;
+
+class PromotionCouponToCodeDataTransformer implements DataTransformerInterface
+{
+    /** @var PromotionCouponRepositoryInterface */
+    private $promotionCouponRepository;
+
+    public function __construct(PromotionCouponRepositoryInterface $promotionCouponRepository)
+    {
+        $this->promotionCouponRepository = $promotionCouponRepository;
+    }
+
+    /**
+     * @param PromotionCouponInterface|mixed $value
+     */
+    public function transform($value): ?string
+    {
+        if (null === $value || '' === $value) {
+            return $value;
+        }
+
+        Assert::isInstanceOf($value, PromotionCouponInterface::class);
+
+        return $value->getCode();
+    }
+
+    public function reverseTransform($value): ?PromotionCouponInterface
+    {
+        if (null === $value || '' === $value) {
+            return null;
+        }
+
+        /** @var PromotionCouponInterface|null $promotionCoupon */
+        $promotionCoupon = $this->promotionCouponRepository->findOneBy(['code' => $value]);
+
+        return $promotionCoupon;
+    }
+}
diff --git a/src/Form/DataTransformer/StrictGiftCardToCodeDataTransformer.php b/src/Form/DataTransformer/StrictGiftCardToCodeDataTransformer.php
new file mode 100644
index 00000000..37712a29
--- /dev/null
+++ b/src/Form/DataTransformer/StrictGiftCardToCodeDataTransformer.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Form\DataTransformer;
+
+use Setono\SyliusGiftCardPlugin\Model\GiftCardInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+final class StrictGiftCardToCodeDataTransformer extends GiftCardToCodeDataTransformer
+{
+    public function reverseTransform($value): ?GiftCardInterface
+    {
+        $giftCard = parent::reverseTransform($value);
+        if (null !== $giftCard) {
+            return $giftCard;
+        }
+
+        throw new TransformationFailedException('setono_sylius_gift_card.ui.gift_card_code_does_not_exist');
+    }
+}
diff --git a/src/Form/Type/AddGiftCardOrPromotionCouponToOrderType.php b/src/Form/Type/AddGiftCardOrPromotionCouponToOrderType.php
new file mode 100644
index 00000000..edfdf807
--- /dev/null
+++ b/src/Form/Type/AddGiftCardOrPromotionCouponToOrderType.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Form\Type;
+
+use Setono\SyliusGiftCardPlugin\Controller\Action\AddGiftCardOrPromotionCouponToOrderCommand;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class AddGiftCardOrPromotionCouponToOrderType extends AbstractType
+{
+    /** @var DataTransformerInterface */
+    private $giftCardToCodeDataTransformer;
+
+    /** @var DataTransformerInterface */
+    private $promotionCouponToCodeDataTransformer;
+
+    /** @var array */
+    private $validationGroups;
+
+    public function __construct(
+        DataTransformerInterface $giftCardToCodeDataTransformer,
+        DataTransformerInterface $promotionCouponToCodeDataTransformer,
+        array $validationGroups
+    ) {
+        $this->giftCardToCodeDataTransformer = $giftCardToCodeDataTransformer;
+        $this->promotionCouponToCodeDataTransformer = $promotionCouponToCodeDataTransformer;
+        $this->validationGroups = $validationGroups;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('giftCardOrPromotion', TextType::class, [
+                'label' => false,
+                'mapped' => false,
+                'attr' => [
+                    'placeholder' => 'setono_sylius_gift_card.ui.enter_gift_card_code',
+                ],
+                'invalid_message' => 'setono_sylius_gift_card.add_gift_card_to_order_command.gift_card_or_coupon.does_not_exist',
+            ])
+            ->add('giftCard', HiddenType::class, [
+                'label' => false,
+                'required' => false,
+                'invalid_message' => 'setono_sylius_gift_card.add_gift_card_to_order_command.gift_card_or_coupon.does_not_exist',
+            ])
+            ->add('promotionCoupon', HiddenType::class, [
+                'label' => false,
+                'required' => false,
+                'invalid_message' => 'setono_sylius_gift_card.add_gift_card_to_order_command.gift_card_or_coupon.does_not_exist',
+            ])
+        ;
+
+        $builder->get('giftCard')->addModelTransformer($this->giftCardToCodeDataTransformer);
+        $builder->get('promotionCoupon')->addModelTransformer($this->promotionCouponToCodeDataTransformer);
+
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event): void {
+            $data = $event->getData();
+
+            $data['giftCard'] = $data['giftCardOrPromotion'];
+            $data['promotionCoupon'] = $data['giftCardOrPromotion'];
+
+            $event->setData($data);
+        });
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => AddGiftCardOrPromotionCouponToOrderCommand::class,
+            'validation_groups' => $this->validationGroups,
+        ]);
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return 'setono_sylius_gift_card_add_gift_card_to_order';
+    }
+}
diff --git a/src/Form/Type/PromotionCouponToCodeType.php b/src/Form/Type/PromotionCouponToCodeType.php
new file mode 100644
index 00000000..70aac630
--- /dev/null
+++ b/src/Form/Type/PromotionCouponToCodeType.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Form\Type;
+
+use Sylius\Bundle\PromotionBundle\Form\Type\PromotionCouponToCodeType as SyliusPromotionCouponToCodeType;
+use Sylius\Component\Promotion\Model\PromotionCouponInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class PromotionCouponToCodeType extends AbstractType implements DataTransformerInterface
+{
+    /** @var SyliusPromotionCouponToCodeType */
+    private $decoratedForm;
+
+    public function __construct(SyliusPromotionCouponToCodeType $decoratedForm)
+    {
+        $this->decoratedForm = $decoratedForm;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $this->decoratedForm->buildForm($builder, $options);
+    }
+
+    public function transform($coupon): string
+    {
+        return $this->decoratedForm->transform($coupon);
+    }
+
+    public function reverseTransform($code): ?PromotionCouponInterface
+    {
+        return $this->decoratedForm->reverseTransform($code);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $this->decoratedForm->configureOptions($resolver);
+    }
+
+    public function getParent(): string
+    {
+        return HiddenType::class;
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return $this->decoratedForm->getBlockPrefix();
+    }
+}
diff --git a/src/Resources/config/services/applicator.xml b/src/Resources/config/services/applicator.xml
index 36ad81a4..ff933e86 100644
--- a/src/Resources/config/services/applicator.xml
+++ b/src/Resources/config/services/applicator.xml
@@ -12,6 +12,14 @@
             <argument type="service" id="sylius.manager.order" />
         </service>
 
+        <service id="setono_sylius_gift_card.applicator.coupon_code"
+                 class="Setono\SyliusGiftCardPlugin\Applicator\CouponCodeApplicator">
+            <argument type="service" id="sylius.repository.promotion_coupon" />
+            <argument type="service" id="sylius.order_processing.order_processor.composite" />
+            <argument type="service" id="sylius.manager.order" />
+            <argument type="service" id="sylius.promotion_applicator" />
+        </service>
+
     </services>
 
 </container>
diff --git a/src/Resources/config/services/controller.xml b/src/Resources/config/services/controller.xml
index 427667d3..33076014 100644
--- a/src/Resources/config/services/controller.xml
+++ b/src/Resources/config/services/controller.xml
@@ -7,7 +7,7 @@
     <services>
         <defaults public="true"/>
 
-        <service id="setono_sylius_gift_card.controller.action.add_gift_card_to_order"
+        <service id="setono_sylius_gift_card.controller.action.add_gift_card_to_order.simple"
                  class="Setono\SyliusGiftCardPlugin\Controller\Action\AddGiftCardToOrderAction">
             <argument type="service" id="fos_rest.view_handler.default"/>
             <argument type="service" id="form.factory"/>
@@ -15,6 +15,20 @@
             <argument type="service" id="session.flash_bag"/>
             <argument type="service" id="setono_sylius_gift_card.applicator.gift_card"/>
             <argument type="service" id="setono_sylius_gift_card.resolver.redirect_url"/>
+            <argument type="service" id="setono_sylius_gift_card.applicator.coupon_code"/>
+            <argument>%setono_sylius_gift_card.cart.use_same_input_for_promotion_and_gift_card%</argument>
+        </service>
+
+        <service id="setono_sylius_gift_card.controller.action.add_gift_card_to_order.composed"
+                 class="Setono\SyliusGiftCardPlugin\Controller\Action\AddGiftCardOrPromotionCouponToOrderAction">
+            <argument type="service" id="fos_rest.view_handler.default"/>
+            <argument type="service" id="form.factory"/>
+            <argument type="service" id="sylius.context.cart"/>
+            <argument type="service" id="session.flash_bag"/>
+            <argument type="service" id="setono_sylius_gift_card.applicator.gift_card"/>
+            <argument type="service" id="setono_sylius_gift_card.resolver.redirect_url"/>
+            <argument type="service" id="setono_sylius_gift_card.applicator.coupon_code"/>
+            <argument>%setono_sylius_gift_card.cart.use_same_input_for_promotion_and_gift_card%</argument>
         </service>
 
         <service id="setono_sylius_gift_card.controller.action.remove_gift_card_from_order"
diff --git a/src/Resources/config/services/form.xml b/src/Resources/config/services/form.xml
index e9b5828c..b47cdf0d 100644
--- a/src/Resources/config/services/form.xml
+++ b/src/Resources/config/services/form.xml
@@ -27,6 +27,10 @@
         <parameter key="setono_sylius_gift_card.form.type.add_gift_card_to_order.validation_groups" type="collection">
             <parameter>setono_sylius_gift_card</parameter>
         </parameter>
+
+        <parameter key="setono_sylius_gift_card.form.type.add_gift_card_or_promotion_coupon_to_order.validation_groups" type="collection">
+            <parameter>setono_sylius_gift_card</parameter>
+        </parameter>
     </parameters>
     <services>
         <service id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code"
@@ -35,14 +39,32 @@
             <argument type="service" id="sylius.context.channel"/>
         </service>
 
+        <service id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code.strict"
+                 class="Setono\SyliusGiftCardPlugin\Form\DataTransformer\StrictGiftCardToCodeDataTransformer"
+                 parent="setono_sylius_gift_card.form.data_transformer.gift_card_to_code">
+        </service>
+
+        <service id="setono_sylius_gift_card.form.data_transformer.promotion_coupon_to_code"
+                 class="Setono\SyliusGiftCardPlugin\Form\DataTransformer\PromotionCouponToCodeDataTransformer">
+            <argument type="service" id="sylius.repository.promotion_coupon"/>
+        </service>
+
         <service id="setono_sylius_gift_card.form.type.extension.product"
                  class="Setono\SyliusGiftCardPlugin\Form\Extension\ProductTypeExtension">
             <tag name="form.type_extension" extended-type="Sylius\Bundle\ProductBundle\Form\Type\ProductType"/>
         </service>
 
+        <service id="setono_sylius_gift_card.form.type.add_gift_card_or_promotion_coupon_to_order"
+                 class="Setono\SyliusGiftCardPlugin\Form\Type\AddGiftCardOrPromotionCouponToOrderType">
+            <argument type="service" id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code"/>
+            <argument type="service" id="setono_sylius_gift_card.form.data_transformer.promotion_coupon_to_code"/>
+            <argument>%setono_sylius_gift_card.form.type.add_gift_card_or_promotion_coupon_to_order.validation_groups%</argument>
+            <tag name="form.type"/>
+        </service>
+
         <service id="setono_sylius_gift_card.form.type.add_gift_card_to_order"
                  class="Setono\SyliusGiftCardPlugin\Form\Type\AddGiftCardToOrderType">
-            <argument type="service" id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code"/>
+            <argument type="service" id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code.strict"/>
             <argument>%setono_sylius_gift_card.form.type.add_gift_card_to_order.validation_groups%</argument>
             <tag name="form.type"/>
         </service>
@@ -79,7 +101,7 @@
 
         <service id="setono_sylius_gift_card.form.type.gift_card_search"
                  class="Setono\SyliusGiftCardPlugin\Form\Type\GiftCardSearchType">
-            <argument type="service" id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code"/>
+            <argument type="service" id="setono_sylius_gift_card.form.data_transformer.gift_card_to_code.strict"/>
             <argument>%setono_sylius_gift_card.form.type.gift_card_search.validation_groups%</argument>
             <tag name="form.type"/>
         </service>
@@ -89,5 +111,11 @@
             <argument type="service" id="router"/>
             <tag name="form.type"/>
         </service>
+
+        <service id="setono_sylius_gift_card.form.type.promotion_coupon_to_code"
+                 class="Setono\SyliusGiftCardPlugin\Form\Type\PromotionCouponToCodeType"
+                 decorates="sylius.form.type.promotion_coupon_to_code">
+            <argument type="service" id="setono_sylius_gift_card.form.type.promotion_coupon_to_code.inner" />
+        </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/validator.xml b/src/Resources/config/services/validator.xml
index 39917049..01fada6d 100644
--- a/src/Resources/config/services/validator.xml
+++ b/src/Resources/config/services/validator.xml
@@ -7,5 +7,9 @@
         <service id="Setono\SyliusGiftCardPlugin\Validator\Constraints\HasBackgroundImage">
             <tag name="validator.constraint_validator" />
         </service>
+
+        <service id="Setono\SyliusGiftCardPlugin\Validator\Constraints\HasGiftCardOrPromotionCoupon">
+            <tag name="validator.constraint_validator" />
+        </service>
     </services>
 </container>
diff --git a/src/Resources/config/validation/AddGiftCardOrPromotionCouponToOrderCommand.xml b/src/Resources/config/validation/AddGiftCardOrPromotionCouponToOrderCommand.xml
new file mode 100644
index 00000000..5a58a0e0
--- /dev/null
+++ b/src/Resources/config/validation/AddGiftCardOrPromotionCouponToOrderCommand.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<constraint-mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
+    <class name="Setono\SyliusGiftCardPlugin\Controller\Action\AddGiftCardOrPromotionCouponToOrderCommand">
+        <constraint name="Setono\SyliusGiftCardPlugin\Validator\Constraints\HasGiftCardOrPromotionCoupon">
+            <option name="groups">setono_sylius_gift_card</option>
+        </constraint>
+    </class>
+</constraint-mapping>
diff --git a/src/Resources/views/Shop/addGiftCardToOrder.html.twig b/src/Resources/views/Shop/addGiftCardToOrder.html.twig
index 9d89ac9c..238b53c2 100644
--- a/src/Resources/views/Shop/addGiftCardToOrder.html.twig
+++ b/src/Resources/views/Shop/addGiftCardToOrder.html.twig
@@ -8,7 +8,13 @@
 
 <div>
     <div class="ui action input">
-        {{ form_widget(form.giftCard, {'attr': {'form': 'setono-sylius-gift-card-add-gift-card-to-order'}}) }}
+        {% if form.giftCardOrPromotion is defined %}
+            {{ form_widget(form.giftCardOrPromotion, {'attr': {'form': 'setono-sylius-gift-card-add-gift-card-to-order'}}) }}
+            {{ form_widget(form.giftCard) }}
+            {{ form_widget(form.promotionCoupon) }}
+        {% else %}
+            {{ form_widget(form.giftCard, {'attr': {'form': 'setono-sylius-gift-card-add-gift-card-to-order'}}) }}
+        {% endif %}
         <button type="submit" class="ui primary icon labeled button" form="setono-sylius-gift-card-add-gift-card-to-order">
             <i class="ticket icon"></i> {{ 'setono_sylius_gift_card.ui.add_gift_card_to_order'|trans }}
         </button>
diff --git a/src/Resources/views/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig b/src/Resources/views/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig
new file mode 100644
index 00000000..1a995019
--- /dev/null
+++ b/src/Resources/views/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig
@@ -0,0 +1,8 @@
+<div id="sylius-coupon" {{ sylius_test_html_attribute('cart-promotion-coupon') }}>
+    <div class="ui coupon action input">
+        {{ form_widget(form.promotionCoupon, sylius_test_form_attribute('cart-promotion-coupon-input')|sylius_merge_recursive({'attr': {'form': main_form, 'placeholder': 'sylius.ui.enter_your_code'|trans~'...'}})) }}
+        <button type="submit" id="sylius-save" {{ sylius_test_html_attribute('apply-coupon-button') }} class="ui teal icon labeled button" form="{{ main_form }}"><i class="ticket icon"></i> {{ 'sylius.ui.apply_coupon'|trans }}</button>
+    </div>
+    <br>
+    {{ form_errors(form.promotionCoupon) }}
+</div>
diff --git a/src/SetonoSyliusGiftCardPlugin.php b/src/SetonoSyliusGiftCardPlugin.php
index 6867a289..559930a8 100644
--- a/src/SetonoSyliusGiftCardPlugin.php
+++ b/src/SetonoSyliusGiftCardPlugin.php
@@ -5,6 +5,8 @@
 namespace Setono\SyliusGiftCardPlugin;
 
 use Setono\SyliusGiftCardPlugin\DependencyInjection\Compiler\AddAdjustmentsToOrderAdjustmentClearerPass;
+use Setono\SyliusGiftCardPlugin\DependencyInjection\Compiler\DefineControllerPass;
+use Setono\SyliusGiftCardPlugin\DependencyInjection\Compiler\OverrideCouponFormPass;
 use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
 use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
@@ -19,6 +21,8 @@ public function build(ContainerBuilder $container): void
         parent::build($container);
 
         $container->addCompilerPass(new AddAdjustmentsToOrderAdjustmentClearerPass());
+        $container->addCompilerPass(new OverrideCouponFormPass());
+        $container->addCompilerPass(new DefineControllerPass());
     }
 
     public function getSupportedDrivers(): array
diff --git a/src/Validator/Constraints/HasGiftCardOrPromotionCoupon.php b/src/Validator/Constraints/HasGiftCardOrPromotionCoupon.php
new file mode 100644
index 00000000..d26655cc
--- /dev/null
+++ b/src/Validator/Constraints/HasGiftCardOrPromotionCoupon.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+final class HasGiftCardOrPromotionCoupon extends Constraint
+{
+    /** @var string */
+    public $message = 'setono_sylius_gift_card.add_gift_card_to_order_command.gift_card.not_blank';
+
+    public function getTargets(): array
+    {
+        return [
+            self::CLASS_CONSTRAINT,
+        ];
+    }
+}
diff --git a/src/Validator/Constraints/HasGiftCardOrPromotionCouponValidator.php b/src/Validator/Constraints/HasGiftCardOrPromotionCouponValidator.php
new file mode 100644
index 00000000..6ec9f9d2
--- /dev/null
+++ b/src/Validator/Constraints/HasGiftCardOrPromotionCouponValidator.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Setono\SyliusGiftCardPlugin\Validator\Constraints;
+
+use Setono\SyliusGiftCardPlugin\Controller\Action\AddGiftCardOrPromotionCouponToOrderCommand;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
+
+final class HasGiftCardOrPromotionCouponValidator extends ConstraintValidator
+{
+    public function validate($value, Constraint $constraint): void
+    {
+        if (!$constraint instanceof HasGiftCardOrPromotionCoupon) {
+            throw new UnexpectedTypeException($constraint, HasGiftCardOrPromotionCoupon::class);
+        }
+
+        if (null === $value) {
+            return;
+        }
+
+        Assert::isInstanceOf($value, AddGiftCardOrPromotionCouponToOrderCommand::class);
+
+        if (null === $value->getGiftCard() && null === $value->getPromotionCoupon()) {
+            $this->context->buildViolation($constraint->message)
+                ->atPath('giftCardOrPromotion')
+                ->addViolation();
+        }
+    }
+}
diff --git a/tests/Application/config/packages/setono_sylius_gift_card.yaml b/tests/Application/config/packages/setono_sylius_gift_card.yaml
index ccb4949d..eb1d0815 100644
--- a/tests/Application/config/packages/setono_sylius_gift_card.yaml
+++ b/tests/Application/config/packages/setono_sylius_gift_card.yaml
@@ -1,3 +1,7 @@
 imports:
     - { resource: "@SetonoSyliusGiftCardPlugin/Resources/config/app/config.yaml" }
     - { resource: "@SetonoSyliusGiftCardPlugin/Resources/config/app/fixtures.yaml" }
+
+setono_sylius_gift_card:
+    cart:
+        use_same_input_for_promotion_and_gift_card: false
diff --git a/tests/Application/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig b/tests/Application/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig
new file mode 100644
index 00000000..11fc2178
--- /dev/null
+++ b/tests/Application/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig
@@ -0,0 +1,8 @@
+{#<div id="sylius-coupon" {{ sylius_test_html_attribute('cart-promotion-coupon') }}>#}
+{#    <div class="ui coupon action input">#}
+{#        {{ form_widget(form.promotionCoupon, sylius_test_form_attribute('cart-promotion-coupon-input')|sylius_merge_recursive({'attr': {'form': main_form, 'placeholder': 'sylius.ui.enter_your_code'|trans~'...'}})) }}#}
+{#        <button type="submit" id="sylius-save" {{ sylius_test_html_attribute('apply-coupon-button') }} class="ui teal icon labeled button" form="{{ main_form }}"><i class="ticket icon"></i> {{ 'sylius.ui.apply_coupon'|trans }}</button>#}
+{#    </div>#}
+{#    <br>#}
+{#    {{ form_errors(form.promotionCoupon) }}#}
+{#</div>#}
diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
index 9ea0a7f2..d1f75d04 100644
--- a/tests/DependencyInjection/ConfigurationTest.php
+++ b/tests/DependencyInjection/ConfigurationTest.php
@@ -43,6 +43,9 @@ public function processed_configuration_for_array_node_1(): void
             'setono_sylius_gift_card' => [],
         ], [
             'code_length' => 20,
+            'cart' => [
+                'use_same_input_for_promotion_and_gift_card' => false,
+            ],
             'driver' => SyliusResourceBundle::DRIVER_DOCTRINE_ORM,
             'resources' => [
                 'gift_card' => [