Merge branch '1.0'

* 1.0: [Documentation] Minor description fix Change channel assignment example on payment method fix form extension link [Translations] Updated translations from Crowdin Narrow typehints for TranslationTrait::getTranslation() calls Narrow typehints for Core's CustomerInterface
Sylius · Oct 26, 2017 · 1a8186f · 1a8186f
2 parents 8e33ffd + 245d4fe
commit 1a8186f
Show file tree

Hide file tree

Showing 28 changed files with 248 additions and 6 deletions.
diff --git a/docs/book/orders/payments.rst b/docs/book/orders/payments.rst
@@ -90,11 +90,11 @@ As usually, use a factory to create a new PaymentMethod and give it a unique cod
 
     $this->container->get('sylius.repository.payment_method')->add($paymentMethod);
 
-In order to have your new payment method available in the checkout remember to **add it to your desired channels**:
+In order to have your new payment method available in the checkout remember to **add your desired channel to the payment method**:
 
 .. code-block:: php
 
-    $channel->addPaymentMethod($paymentMethod);
+    $paymentMethod->addChannel($channel)
 
 Payment Gateway configuration
 -----------------------------

diff --git a/docs/customization/form.rst b/docs/customization/form.rst
@@ -121,7 +121,7 @@ Need more information?
 
 .. warning::
 
-    Some of the forms already have extensions in Sylius. Learn more about Extensions `here <http://symfony.com/doc/current/bundles/extension.html>`_.
+    Some of the forms already have extensions in Sylius. Learn more about Extensions `here <http://symfony.com/doc/current/form/create_form_type_extension.html>`_.
 
 For instance the ``ProductVariant`` admin form is defined under ``Sylius/Bundle/ProductBundle/Form/Type/ProductVariantType.php`` and later extended in
 ``Sylius/Bundle/CoreBundle/Form/Extension/ProductVariantTypeExtension.php``. If you again extend the base type form like this:

diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/translations/flashes.el.yml b/src/Sylius/Bundle/PaymentBundle/Resources/translations/flashes.el.yml
@@ -7,3 +7,5 @@ sylius:
         completed: 'Η πληρωμή ολοκληρώθηκε.'
         failed: 'Η πληρωμή απέτυχε.'
         processing: 'Η πληρωμή σας είναι σε επεξεργασία.'
+        refunded: 'Επιτυχής επιστροφή πληρωμής.'
+        unknown: 'Υπήρξε ένα άγνωστο πρόβλημα με την πληρωμή.'
diff --git a/src/Sylius/Bundle/ResourceBundle/Resources/translations/messages.el.yml b/src/Sylius/Bundle/ResourceBundle/Resources/translations/messages.el.yml
@@ -5,3 +5,4 @@ sylius:
     form:
         collection:
             add: Προσθήκη
+            delete: Διαγραφή
diff --git a/src/Sylius/Bundle/ShippingBundle/Resources/translations/messages.nl.yml b/src/Sylius/Bundle/ShippingBundle/Resources/translations/messages.nl.yml
@@ -36,9 +36,9 @@ sylius:
             configuration: Configuratie
             description: Omschrijving
             enabled: Toegestaan
-            match_all_category_requirement: Alle eenheden moeten dezelfde categorie hebben
-            match_any_category_requirement: Minstens 1 eenheid moet dezelfde categorie hebben
-            match_none_category_requirement: Geen van de eenheden moeten dezelfde categorie hebben
+            match_all_category_requirement: Alle eenheden moeten overeenkomen met de methodecategorie
+            match_any_category_requirement: Minstens 1 eenheid moet overeenkomen met de methodecategorie
+            match_none_category_requirement: Geen van de eenheden hoeven overeen te komen met de methodecategorie
             name: Naam
             position: Positie
             tax_category: Belasting categorie

diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.el.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.el.yml
@@ -76,6 +76,7 @@ sylius:
         date: 'Ημερομηνία'
         datetime: 'Ημερομηνία και ώρα'
         default_locale: 'Προεπιλεγμένες τοπικές ρυθμίσεις'
+        delete: 'Διαγραφή'
         description: 'Περιγραφή'
         editing_country: 'Επεξεργασία χώρας'
         editing_zone: 'Επεξεργασία ζώνης'

diff --git a/src/Sylius/Bundle/UserBundle/Resources/translations/flashes.el.yml b/src/Sylius/Bundle/UserBundle/Resources/translations/flashes.el.yml
@@ -10,4 +10,5 @@ sylius:
         verify_email: 'Το email σας έχει επαληθευτεί με επιτυχία.'
         verify_email_by_invalid_token: 'Το διακριτικό επαλήθευσης δεν είναι έγκυρο.'
         verify_email_request: 'Ένα email με σύνδεσμο επαλήθευσης έχει σταλεί στην διεύθυνση email σας.'
+        verify_no_user: 'Δεν υπάρχει κανένας συνδεδεμένος χρήστης.'
         verify_verified_email: 'Το email σας έχει ήδη επαληθευτεί.'
diff --git a/src/Sylius/Component/Attribute/Model/Attribute.php b/src/Sylius/Component/Attribute/Model/Attribute.php
@@ -16,12 +16,14 @@
 use Sylius\Component\Attribute\AttributeType\TextAttributeType;
 use Sylius\Component\Resource\Model\TimestampableTrait;
 use Sylius\Component\Resource\Model\TranslatableTrait;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 class Attribute implements AttributeInterface
 {
     use TimestampableTrait;
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
+        getTranslation as private doGetTranslation;
     }
 
     /**
@@ -173,6 +175,19 @@ public function setPosition(?int $position): void
         $this->position = $position;
     }
 
+    /**
+     * @param string|null $locale
+     *
+     * @return AttributeTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface
+    {
+        /** @var AttributeTranslationInterface $translation */
+        $translation = $this->doGetTranslation($locale);
+
+        return $translation;
+    }
+
     /**
      * @return AttributeTranslationInterface
      */

diff --git a/src/Sylius/Component/Attribute/Model/AttributeInterface.php b/src/Sylius/Component/Attribute/Model/AttributeInterface.php
@@ -17,6 +17,7 @@
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TimestampableInterface;
 use Sylius\Component\Resource\Model\TranslatableInterface;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 interface AttributeInterface extends
     ResourceInterface,
@@ -73,4 +74,11 @@ public function getPosition(): ?int;
      * @param int|null $position
      */
     public function setPosition(?int $position): void;
+
+    /**
+     * @param string|null $locale
+     *
+     * @return AttributeTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface;
 }
diff --git a/src/Sylius/Component/Core/Model/CustomerInterface.php b/src/Sylius/Component/Core/Model/CustomerInterface.php
@@ -16,6 +16,7 @@
 use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Customer\Model\CustomerInterface as BaseCustomerInterface;
 use Sylius\Component\User\Model\UserAwareInterface;
+use Sylius\Component\User\Model\UserInterface;
 
 interface CustomerInterface extends BaseCustomerInterface, UserAwareInterface, ProductReviewerInterface
 {
@@ -60,4 +61,14 @@ public function getAddresses(): Collection;
      * @return bool
      */
     public function hasUser(): bool;
+
+    /**
+     * @return ShopUserInterface|UserInterface|null
+     */
+    public function getUser(): ?UserInterface;
+
+    /**
+     * @param ShopUserInterface|UserInterface|null $user
+     */
+    public function setUser(?UserInterface $user);
 }
diff --git a/src/Sylius/Component/Core/Model/Product.php b/src/Sylius/Component/Core/Model/Product.php
@@ -18,6 +18,7 @@
 use Sylius\Component\Channel\Model\ChannelInterface as BaseChannelInterface;
 use Sylius\Component\Product\Model\Product as BaseProduct;
 use Sylius\Component\Product\Model\ProductTranslationInterface as BaseProductTranslationInterface;
+use Sylius\Component\Resource\Model\TranslationInterface;
 use Sylius\Component\Review\Model\ReviewInterface;
 use Sylius\Component\Taxonomy\Model\TaxonInterface as BaseTaxonInterface;
 use Webmozart\Assert\Assert;
@@ -347,6 +348,16 @@ public static function getVariantSelectionMethodLabels(): array
         ];
     }
 
+    /**
+     * @param string|null $locale
+     *
+     * @return ProductTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface
+    {
+        return parent::getTranslation($locale);
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Sylius/Component/Core/Model/ProductInterface.php b/src/Sylius/Component/Core/Model/ProductInterface.php
@@ -16,6 +16,7 @@
 use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Channel\Model\ChannelsAwareInterface;
 use Sylius\Component\Product\Model\ProductInterface as BaseProductInterface;
+use Sylius\Component\Resource\Model\TranslationInterface;
 use Sylius\Component\Review\Model\ReviewableInterface;
 use Sylius\Component\Review\Model\ReviewInterface;
 
@@ -83,4 +84,11 @@ public function setMainTaxon(?TaxonInterface $mainTaxon): void;
      * @return Collection|ReviewInterface[]
      */
     public function getAcceptedReviews(): Collection;
+
+    /**
+     * @param string|null $locale
+     *
+     * @return ProductTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface;
 }
diff --git a/src/Sylius/Component/Payment/Model/PaymentMethod.php b/src/Sylius/Component/Payment/Model/PaymentMethod.php
@@ -16,12 +16,14 @@
 use Sylius\Component\Resource\Model\TimestampableTrait;
 use Sylius\Component\Resource\Model\ToggleableTrait;
 use Sylius\Component\Resource\Model\TranslatableTrait;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 class PaymentMethod implements PaymentMethodInterface
 {
     use TimestampableTrait, ToggleableTrait;
     use TranslatableTrait {
         __construct as initializeTranslationsCollection;
+        getTranslation as private doGetTranslation;
     }
 
     /**
@@ -163,6 +165,19 @@ public function setPosition(?int $position): void
         $this->position = $position;
     }
 
+    /**
+     * @param string|null $locale
+     *
+     * @return PaymentMethodTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface
+    {
+        /** @var PaymentMethodTranslationInterface $translation */
+        $translation = $this->doGetTranslation($locale);
+
+        return $translation;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php b/src/Sylius/Component/Payment/Model/PaymentMethodInterface.php
@@ -18,6 +18,7 @@
 use Sylius\Component\Resource\Model\TimestampableInterface;
 use Sylius\Component\Resource\Model\ToggleableInterface;
 use Sylius\Component\Resource\Model\TranslatableInterface;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 interface PaymentMethodInterface extends
     CodeAwareInterface,
@@ -75,4 +76,11 @@ public function getPosition(): ?int;
      * @param int|null $position
      */
     public function setPosition(?int $position): void;
+
+    /**
+     * @param string|null $locale
+     *
+     * @return PaymentMethodTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface;
 }
diff --git a/src/Sylius/Component/Product/Model/Product.php b/src/Sylius/Component/Product/Model/Product.php
@@ -19,13 +19,15 @@
 use Sylius\Component\Resource\Model\TimestampableTrait;
 use Sylius\Component\Resource\Model\ToggleableTrait;
 use Sylius\Component\Resource\Model\TranslatableTrait;
+use Sylius\Component\Resource\Model\TranslationInterface;
 use Webmozart\Assert\Assert;
 
 class Product implements ProductInterface
 {
     use TimestampableTrait, ToggleableTrait;
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
+        getTranslation as private doGetTranslation;
     }
 
     /**
@@ -435,6 +437,19 @@ public function isConfigurable(): bool
         return !$this->isSimple();
     }
 
+    /**
+     * @param string|null $locale
+     *
+     * @return ProductTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface
+    {
+        /** @var ProductTranslationInterface $translation */
+        $translation = $this->doGetTranslation($locale);
+
+        return $translation;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Sylius/Component/Product/Model/ProductAssociationType.php b/src/Sylius/Component/Product/Model/ProductAssociationType.php
@@ -15,12 +15,14 @@
 
 use Sylius\Component\Resource\Model\TimestampableTrait;
 use Sylius\Component\Resource\Model\TranslatableTrait;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 class ProductAssociationType implements ProductAssociationTypeInterface
 {
     use TimestampableTrait;
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
+        getTranslation as private doGetTranslation;
     }
 
     /**
@@ -94,6 +96,19 @@ public function setName(?string $name): void
         $this->getTranslation()->setName($name);
     }
 
+    /**
+     * @param string|null $locale
+     *
+     * @return ProductAssociationTypeTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface
+    {
+        /** @var ProductAssociationTypeTranslationInterface $translation */
+        $translation = $this->doGetTranslation($locale);
+
+        return $translation;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Sylius/Component/Product/Model/ProductAssociationTypeInterface.php b/src/Sylius/Component/Product/Model/ProductAssociationTypeInterface.php
@@ -17,6 +17,7 @@
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TimestampableInterface;
 use Sylius\Component\Resource\Model\TranslatableInterface;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 interface ProductAssociationTypeInterface extends
     CodeAwareInterface,
@@ -33,4 +34,11 @@ public function getName(): ?string;
      * @param string|null $name
      */
     public function setName(?string $name): void;
+
+    /**
+     * @param null|string $locale
+     *
+     * @return ProductAssociationTypeTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface;
 }
diff --git a/src/Sylius/Component/Product/Model/ProductInterface.php b/src/Sylius/Component/Product/Model/ProductInterface.php
@@ -21,6 +21,7 @@
 use Sylius\Component\Resource\Model\TimestampableInterface;
 use Sylius\Component\Resource\Model\ToggleableInterface;
 use Sylius\Component\Resource\Model\TranslatableInterface;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 interface ProductInterface extends
     AttributeSubjectInterface,
@@ -149,4 +150,11 @@ public function isSimple(): bool;
      * @return bool
      */
     public function isConfigurable(): bool;
+
+    /**
+     * @param string|null $locale
+     *
+     * @return ProductTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface;
 }
diff --git a/src/Sylius/Component/Product/Model/ProductOption.php b/src/Sylius/Component/Product/Model/ProductOption.php
@@ -17,12 +17,14 @@
 use Doctrine\Common\Collections\Collection;
 use Sylius\Component\Resource\Model\TimestampableTrait;
 use Sylius\Component\Resource\Model\TranslatableTrait;
+use Sylius\Component\Resource\Model\TranslationInterface;
 
 class ProductOption implements ProductOptionInterface
 {
     use TimestampableTrait;
     use TranslatableTrait {
         __construct as private initializeTranslationsCollection;
+        getTranslation as private doGetTranslation;
     }
 
     /**
@@ -155,6 +157,19 @@ public function hasValue(ProductOptionValueInterface $value): bool
         return $this->values->contains($value);
     }
 
+    /**
+     * @param string|null $locale
+     *
+     * @return ProductOptionTranslationInterface
+     */
+    public function getTranslation(?string $locale = null): TranslationInterface
+    {
+        /** @var ProductOptionTranslationInterface $translation */
+        $translation = $this->doGetTranslation($locale);
+
+        return $translation;
+    }
+
     /**
      * {@inheritdoc}
      */