Server and payment vouchers fix (#170)

ksroga · web-flow · commit 1f88bdde83b4 · 2026-01-29T12:37:44.000+01:00
* Server and payment discount vouchers fix

* Improvements in ux

* Improvements in voucher js logic

* Updated type view in voucher crud

* Added translations for vouchers
diff --git a/src/Core/Controller/Panel/VoucherCrudController.php b/src/Core/Controller/Panel/VoucherCrudController.php
@@ -64,12 +64,19 @@ protected function getPermissionMapping(): array
 
     public function configureFields(string $pageName): iterable
     {
+        $translator = $this->translator;
+
         return [
             NumberField::new('id', 'ID')->onlyOnIndex(),
-            ChoiceField::new('type', $this->translator->trans('pteroca.crud.voucher.type'))
+            ChoiceField::new('type', $translator->trans('pteroca.crud.voucher.type'))
                 ->setChoices(VoucherTypeEnum::getChoices())
+                ->formatValue(function ($value) use ($translator) {
+                    $choices = VoucherTypeEnum::getChoices();
+                    $translationKey = array_search($value, $choices, true);
+                    return $translationKey ? $translator->trans($translationKey) : $value;
+                })
                 ->setColumns(4)
-                ->setHelp($this->translator->trans('pteroca.crud.voucher.type_help')),
+                ->setHelp($translator->trans('pteroca.crud.voucher.type_help')),
             TextField::new('code', $this->translator->trans('pteroca.crud.voucher.code'))
                 ->setColumns(4)
                 ->setHelp($this->translator->trans('pteroca.crud.voucher.code_help')),
diff --git a/src/Core/Resources/translations/messages.cn.yaml b/src/Core/Resources/translations/messages.cn.yaml
@@ -1318,6 +1318,8 @@ pteroca:
       minimum_order_amount_required: '您必须至少订购 {{ amount }} 才能使用此代金券。'
       error_during_redeeming: '兑换代金券时发生错误。'
       only_during_order: '代金券仅可在下单时使用。'
+      server_discount_only_on_purchase: '此优惠券只能在购买或续订服务器时使用。请前往商店使用此优惠券。'
+      payment_discount_only_on_payment: '此优惠券只能在付款页面使用。请前往结账以应用此优惠券。'
 
   email:
     creation_not_sent_misconfigured: '服务器已成功创建，但由于电子邮件配置问题，无法发送确认电子邮件。请检查您的电子邮件设置。'
diff --git a/src/Core/Resources/translations/messages.de.yaml b/src/Core/Resources/translations/messages.de.yaml
@@ -1304,6 +1304,8 @@ pteroca:
       minimum_order_amount_required: 'Sie müssen mindestens {{ amount }} bestellen, um diesen Gutschein zu verwenden.'
       error_during_redeeming: 'Fehler beim Einlösen des Gutscheins.'
       only_during_order: 'Gutschein kann nur während der Bestellung verwendet werden.'
+      server_discount_only_on_purchase: 'Dieser Gutschein kann nur beim Kauf oder der Verlängerung eines Servers verwendet werden. Bitte gehen Sie zum Shop, um diesen Gutschein zu verwenden.'
+      payment_discount_only_on_payment: 'Dieser Gutschein kann nur auf der Zahlungsseite verwendet werden. Bitte fahren Sie mit der Kasse fort, um diesen Gutschein anzuwenden.'
 
   email:
     creation_not_sent_misconfigured: 'Server wurde erfolgreich erstellt, aber die Bestätigungs-E-Mail konnte aufgrund von E-Mail-Konfigurationsproblemen nicht gesendet werden. Bitte überprüfen Sie Ihre E-Mail-Einstellungen.'
diff --git a/src/Core/Resources/translations/messages.de_CH.yaml b/src/Core/Resources/translations/messages.de_CH.yaml
@@ -1298,6 +1298,8 @@ pteroca:
       minimum_order_amount_required: 'Sie müssen für mindestens {{ amount }} bestellen, um diesen Gutschein zu verwenden.'
       error_during_redeeming: 'Beim Einlösen des Gutscheins ist ein Fehler aufgetreten.'
       only_during_order: 'Der Gutschein kann nur während der Bestellung verwendet werden.'
+      server_discount_only_on_purchase: 'Dieser Gutschein kann nur beim Kauf oder der Verlängerung eines Servers verwendet werden. Bitte gehen Sie zum Shop, um diesen Gutschein zu verwenden.'
+      payment_discount_only_on_payment: 'Dieser Gutschein kann nur auf der Zahlungsseite verwendet werden. Bitte fahren Sie mit der Kasse fort, um diesen Gutschein anzuwenden.'
 
   email:
     creation_not_sent_misconfigured: 'Server wurde erfolgreich erstellt, aber die Bestätigungs-E-Mail konnte aufgrund von E-Mail-Konfigurationsproblemen nicht gesendet werden. Bitte überprüfen Sie Ihre E-Mail-Einstellungen.'
diff --git a/src/Core/Resources/translations/messages.en.yaml b/src/Core/Resources/translations/messages.en.yaml
@@ -1290,6 +1290,8 @@ pteroca:
       minimum_order_amount_required: 'You must order at least {{ amount }} to use this voucher.'
       error_during_redeeming: 'An error occurred while redeeming the voucher.'
       only_during_order: 'Voucher can only be used during the order.'
+      server_discount_only_on_purchase: 'This voucher can only be used when purchasing or renewing a server. Please go to the store to use this voucher.'
+      payment_discount_only_on_payment: 'This voucher can only be used on the payment page. Please proceed to the checkout to apply this voucher.'
 
   email:
     creation_not_sent_misconfigured: 'Server was created successfully, but the confirmation email could not be sent due to email configuration issues. Please check your email settings.'
diff --git a/src/Core/Resources/translations/messages.es.yaml b/src/Core/Resources/translations/messages.es.yaml
@@ -1304,6 +1304,8 @@ pteroca:
       minimum_order_amount_required: 'Debes hacer un pedido de al menos {{ amount }} para usar este cupón.'
       error_during_redeeming: 'Ocurrió un error al canjear el cupón.'
       only_during_order: 'El cupón solo puede usarse durante el pedido.'
+      server_discount_only_on_purchase: 'Este cupón solo se puede usar al comprar o renovar un servidor. Por favor, ve a la tienda para usar este cupón.'
+      payment_discount_only_on_payment: 'Este cupón solo se puede usar en la página de pago. Por favor, procede al checkout para aplicar este cupón.'
 
   email:
     creation_not_sent_misconfigured: 'Se creó el servidor correctamente, pero no se pudo enviar el correo electrónico de confirmación debido a problemas de configuración del correo electrónico. Por favor, verifica tu configuración de correo electrónico.'
diff --git a/src/Core/Resources/translations/messages.fr.yaml b/src/Core/Resources/translations/messages.fr.yaml
@@ -1303,6 +1303,8 @@ pteroca:
       minimum_order_amount_required: 'Vous devez commander pour au moins {{ amount }} pour utiliser ce bon.'
       error_during_redeeming: 'Une erreur est survenue lors de l''utilisation du bon.'
       only_during_order: 'Le bon ne peut être utilisé que lors de la commande.'
+      server_discount_only_on_purchase: 'Ce bon d''achat ne peut être utilisé que lors de l''achat ou du renouvellement d''un serveur. Veuillez vous rendre à la boutique pour utiliser ce bon d''achat.'
+      payment_discount_only_on_payment: 'Ce bon d''achat ne peut être utilisé que sur la page de paiement. Veuillez procéder à la caisse pour appliquer ce bon d''achat.'
 
   email:
     creation_not_sent_misconfigured: 'Le serveur a été créé avec succès, mais l''e-mail de confirmation n''a pas pu être envoyé en raison de problèmes de configuration de l''e-mail. Veuillez vérifier vos paramètres d''e-mail.'
diff --git a/src/Core/Resources/translations/messages.hi.yaml b/src/Core/Resources/translations/messages.hi.yaml
@@ -1304,6 +1304,8 @@ pteroca:
       minimum_order_amount_required: 'इस वाउचर का उपयोग करने के लिए आपको कम से कम {{ amount }} का ऑर्डर करना होगा।'
       error_during_redeeming: 'वाउचर रिडीम करते समय त्रुटि हुई।'
       only_during_order: 'वाउचर केवल ऑर्डर करते समय ही उपयोग किया जा सकता है।'
+      server_discount_only_on_purchase: 'यह वाउचर केवल सर्वर खरीदने या नवीनीकरण करने के समय इस्तेमाल किया जा सकता है। कृपया इस वाउचर का इस्तेमाल करने के लिए स्टोर पर जाएं।'
+      payment_discount_only_on_payment: 'यह वाउचर केवल भुगतान पृष्ठ पर इस्तेमाल किया जा सकता है। कृपया इस वाउचर को लागू करने के लिए चेकआउट पर जाएं।'
 
   email:
     creation_not_sent_misconfigured: 'सर्वर सफलतापूर्वक बनाया गया, लेकिन ईमेल कॉन्फ़िगरेशन समस्याओं के कारण पुष्टि ईमेल नहीं भेजा जा सका। कृपया अपनी ईमेल सेटिंग जांचें।'
diff --git a/src/Core/Resources/translations/messages.id.yaml b/src/Core/Resources/translations/messages.id.yaml
@@ -1299,6 +1299,8 @@ pteroca:
       minimum_order_amount_required: 'Anda harus memesan setidaknya {{ amount }} untuk menggunakan voucher ini.'
       error_during_redeeming: 'Terjadi kesalahan saat menebus voucher.'
       only_during_order: 'Voucher hanya dapat digunakan selama pemesanan.'
+      server_discount_only_on_purchase: 'Voucher ini hanya dapat digunakan saat membeli atau memperpanjang server. Silakan pergi ke toko untuk menggunakan voucher ini.'
+      payment_discount_only_on_payment: 'Voucher ini hanya dapat digunakan di halaman pembayaran. Silakan lanjutkan ke checkout untuk menerapkan voucher ini.'
 
   email:
     creation_not_sent_misconfigured: 'Server dibuat dengan sukses, tetapi email konfirmasi tidak dapat dikirim karena masalah konfigurasi email. Silakan periksa pengaturan email Anda.'
diff --git a/src/Core/Resources/translations/messages.it.yaml b/src/Core/Resources/translations/messages.it.yaml
@@ -1304,6 +1304,8 @@ pteroca:
       minimum_order_amount_required: 'Devi effettuare un ordine di almeno {{ amount }} per utilizzare questo voucher.'
       error_during_redeeming: 'Si è verificato un errore durante il riscatto del voucher.'
       only_during_order: 'Il voucher può essere utilizzato solo durante l''ordine.'
+      server_discount_only_on_purchase: 'Questo buono può essere utilizzato solo durante l''acquisto o il rinnovo di un server. Si prega di andare al negozio per utilizzare questo buono.'
+      payment_discount_only_on_payment: 'Questo buono può essere utilizzato solo nella pagina di pagamento. Si prega di procedere al checkout per applicare questo buono.'
 
   email:
     creation_not_sent_misconfigured: 'Il server è stato creato con successo, ma l''email di conferma non è stata inviata a causa di problemi di configurazione dell''email. Si prega di controllare le impostazioni email.'
diff --git a/src/Core/Resources/translations/messages.nl.yaml b/src/Core/Resources/translations/messages.nl.yaml
@@ -1291,6 +1291,8 @@ pteroca:
       minimum_order_amount_required: 'U moet minimaal {{ amount }} bestellen om deze voucher te gebruiken.'
       error_during_redeeming: 'Er is een fout opgetreden tijdens het inwisselen van de voucher.'
       only_during_order: 'Voucher kan alleen worden gebruikt tijdens de bestelling.'
+      server_discount_only_on_purchase: 'Deze voucher kan alleen worden gebruikt bij het kopen of verlengen van een server. Ga naar de winkel om deze voucher te gebruiken.'
+      payment_discount_only_on_payment: 'Deze voucher kan alleen worden gebruikt op de betalings pagina. Ga naar de checkout om deze voucher toe te passen.'
   email:
     creation_not_sent_misconfigured: 'Server is succesvol aangemaakt, maar de bevestigingsmail kon niet worden verzonden vanwege e-mailconfiguratieproblemen. Controleer uw e-mailinstellingen.'
     renewal_not_sent_misconfigured: 'Server is succesvol verlengd, maar de bevestigingsmail kon niet worden verzonden vanwege e-mailconfiguratieproblemen. Controleer uw e-mailinstellingen.'
diff --git a/src/Core/Resources/translations/messages.pl.yaml b/src/Core/Resources/translations/messages.pl.yaml
@@ -1304,6 +1304,8 @@ pteroca:
       minimum_order_amount_required: 'Aby użyć tego vouchera, musisz zamówić za co najmniej {{ amount }}.'
       error_during_redeeming: 'Wystąpił błąd podczas realizacji vouchera.'
       only_during_order: 'Voucher może być użyty tylko podczas składania zamówienia.'
+      server_discount_only_on_purchase: 'Ten kupon może być używany tylko podczas zakupu lub odnawiania serwera. Przejdź do sklepu, aby użyć tego kuponu.'
+      payment_discount_only_on_payment: 'Ten kupon może być używany tylko na stronie płatności. Przejdź do kasy, aby zastosować ten kupon.'
 
   email:
     creation_not_sent_misconfigured: 'Serwer został pomyślnie utworzony, ale wiadomość e-mail z potwierdzeniem nie mogła zostać wysłana z powodu problemów z konfiguracją poczty e-mail. Sprawdź ustawienia poczty e-mail.'
diff --git a/src/Core/Resources/translations/messages.pt.yaml b/src/Core/Resources/translations/messages.pt.yaml
@@ -1306,6 +1306,8 @@ pteroca:
       minimum_order_amount_required: 'Você deve fazer um pedido de pelo menos {{ amount }} para usar este voucher.'
       error_during_redeeming: 'Ocorreu um erro ao resgatar o voucher.'
       only_during_order: 'O voucher só pode ser usado durante o pedido.'
+      server_discount_only_on_purchase: 'Este voucher só pode ser usado ao comprar ou renovar um servidor. Por favor, vá à loja para usar este voucher.'
+      payment_discount_only_on_payment: 'Este voucher só pode ser usado na página de pagamento. Por favor, proceda ao checkout para aplicar este voucher.'
 
   email:
     creation_not_sent_misconfigured: 'O servidor foi criado com sucesso, mas o e-mail de confirmação não pôde ser enviado devido a problemas de configuração de e-mail. Por favor, verifique suas configurações de e-mail.'
diff --git a/src/Core/Resources/translations/messages.ru.yaml b/src/Core/Resources/translations/messages.ru.yaml
@@ -1307,6 +1307,8 @@ pteroca:
       minimum_order_amount_required: 'Вы должны оформить заказ на сумму не менее {{ amount }}, чтобы использовать этот купон.'
       error_during_redeeming: 'Произошла ошибка при активации купона.'
       only_during_order: 'Купон можно использовать только во время оформления заказа.'
+      server_discount_only_on_purchase: 'Этот ваучер можно использовать только при покупке или продлении сервера. Пожалуйста, перейдите в магазин, чтобы использовать этот ваучер.'
+      payment_discount_only_on_payment: 'Этот ваучер можно использовать только на странице оплаты. Пожалуйста, перейдите к оформлению заказа, чтобы применить этот ваучер.'
 
   email:
     creation_not_sent_misconfigured: 'Сервер был успешно создан, но письмо с подтверждением не удалось отправить из-за проблем с конфигурацией электронной почты. Пожалуйста, проверьте настройки электронной почты.'
diff --git a/src/Core/Resources/translations/messages.ua.yaml b/src/Core/Resources/translations/messages.ua.yaml
@@ -1313,6 +1313,8 @@ pteroca:
       minimum_order_amount_required: 'Ви повинні зробити замовлення щонайменше на {{ amount }}, щоб використати цей ваучер.'
       error_during_redeeming: 'Сталася помилка під час використання ваучера.'
       only_during_order: 'Ваучер можна використати лише під час оформлення замовлення.'
+      server_discount_only_on_purchase: 'Цей ваучер можна використовувати лише під час покупки або продовження сервера. Будь ласка, перейдіть до магазину, щоб використати цей ваучер.'
+      payment_discount_only_on_payment: 'Цей ваучер можна використовувати лише на сторінці оплати. Будь ласка, перейдіть до оформлення замовлення, щоб застосувати цей ваучер.'
 
   email:
     creation_not_sent_misconfigured: 'Сервер було успішно створено, але лист із підтвердженням не вдалося надіслати через проблеми з конфігурацією електронної пошти. Будь ласка, перевірте налаштування електронної пошти.'
diff --git a/src/Core/Service/Voucher/VoucherPaymentService.php b/src/Core/Service/Voucher/VoucherPaymentService.php
@@ -31,12 +31,9 @@ public function getVoucher(string $voucherCode): ?Voucher
      */
     public function validateVoucherCode(string $voucherCode, UserInterface $user, VoucherTypeEnum $voucherType): void
     {
-        $redeemResult = $this->voucherService->redeemVoucher($voucherCode, null, $user);
-        if (false === $redeemResult->isSuccess()) {
-            throw new Exception($redeemResult->getMessage());
-        }
+        $voucher = $this->voucherService->validateVoucherForRedemption($voucherCode, null, $user);
 
-        if ($redeemResult->getType() !== $voucherType->value) {
+        if ($voucher->getType() !== $voucherType) {
             throw new Exception($this->translator->trans('pteroca.voucher.invalid_voucher_type'));
         }
     }
@@ -46,14 +43,9 @@ public function validateVoucherCode(string $voucherCode, UserInterface $user, Vo
      */
     public function redeemPaymentVoucher(float $amount, string $voucherCode, UserInterface $user): float
     {
-        $redeemResult = $this->voucherService->redeemVoucher($voucherCode, $amount, $user);
-        if (false === $redeemResult->isSuccess()) {
-            throw new Exception($redeemResult->getMessage());
-        }
-
-        $voucher = $this->voucherService->getValidVoucher($voucherCode);
+        $voucher = $this->voucherService->validateVoucherForRedemption($voucherCode, $amount, $user);
         $this->voucherService->redeemVoucherForUser($voucher, $user);
 
-        return $amount * (1 - $redeemResult->getValue() / 100);
+        return $amount * (1 - $voucher->getValue() / 100);
     }
 }
diff --git a/src/Core/Service/Voucher/VoucherService.php b/src/Core/Service/Voucher/VoucherService.php
@@ -132,6 +132,28 @@ public function redeemVoucher(string $code, ?float $orderAmount, UserInterface $
         }
     }
 
+    /**
+     * Validates if a voucher can be redeemed WITHOUT actually consuming it.
+     * Use this for pre-validation checks before calling redeemVoucher().
+     *
+     * @param string $code Voucher code to validate
+     * @param float|null $orderAmount Order amount for minimum validation
+     * @param UserInterface $user User attempting to redeem
+     * @return Voucher The validated voucher entity
+     * @throws Exception if voucher is invalid or cannot be used
+     */
+    public function validateVoucherForRedemption(string $code, ?float $orderAmount, UserInterface $user): Voucher
+    {
+        $voucher = $this->getValidVoucher($code);
+        $this->userVerificationService->validateUserVerification($user);
+        $this->validateNewAccountRequirementIfNeeded($voucher, $user);
+        $this->validateOneUsePerUserRequirementIfNeeded($voucher, $user);
+        $this->validateMinimumTopupAmountRequirementIfNeeded($voucher, $user);
+        $this->validateMinimumOrderAmountRequirementIfNeeded($orderAmount, $voucher);
+
+        return $voucher;
+    }
+
     /**
      * @throws Exception
      */
diff --git a/themes/default/components/use_voucher_modal.html.twig b/themes/default/components/use_voucher_modal.html.twig
diff --git a/themes/default/panel/cart/topup.html.twig b/themes/default/panel/cart/topup.html.twig
