Merge branch 'develop' of https://forge.laclic.fr/Laclic/CaracoleBundle into develop

Model/Address/AddressInterface.php

@@ -14,89 +14,89 @@ interface AddressInterface
 {
     public function getUser(): ?UserInterface;
 
-    public function setUser(?UserInterface $user): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setUser(?UserInterface $user): AddressModel;
 
     public function getTitle(): ?string;
 
-    public function setTitle(string $title): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setTitle(string $title): AddressModel;
 
     public function getType(): ?string;
 
-    public function setType(string $type): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setType(string $type): AddressModel;
 
     public function getCivility(): ?bool;
 
-    public function setCivility(?bool $civility): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setCivility(?bool $civility): AddressModel;
 
     public function getLastname(): ?string;
 
-    public function setLastname(?string $lastname): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setLastname(?string $lastname): AddressModel;
 
     public function getFirstname(): ?string;
 
-    public function setFirstname(?string $firstname): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setFirstname(?string $firstname): AddressModel;
 
     public function getAddress(): ?string;
 
-    public function setAddress(string $address): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setAddress(string $address): AddressModel;
 
     public function getZip(): ?string;
 
-    public function setZip(string $zip): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setZip(string $zip): AddressModel;
 
     public function getCity(): ?string;
 
-    public function setCity(string $city): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setCity(string $city): AddressModel;
 
     public function getCountry(): ?string;
 
-    public function setCountry(string $country): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setCountry(string $country): AddressModel;
 
     public function getLatitude(): ?string;
 
-    public function setLatitude(?string $latitude): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setLatitude(?string $latitude): AddressModel;
 
     public function getLongitude(): ?string;
 
-    public function setLongitude(?string $longitude): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setLongitude(?string $longitude): AddressModel;
 
     public function getLatitudeOverride(): ?string;
 
-    public function setLatitudeOverride(?string $latitudeOverride): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setLatitudeOverride(?string $latitudeOverride): AddressModel;
 
     public function getLongitudeOverride(): ?string;
 
-    public function setLongitudeOverride(?string $longitudeOverride): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setLongitudeOverride(?string $longitudeOverride): AddressModel;
 
     public function getCompany(): ?string;
 
-    public function setCompany(?string $company): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setCompany(?string $company): AddressModel;
 
     public function getSiret(): ?string;
 
-    public function setSiret(?string $siret): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setSiret(?string $siret): AddressModel;
 
     public function getTva(): ?string;
 
-    public function setTva(?string $tva): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setTva(?string $tva): AddressModel;
 
     public function getPhone(): ?array;
 
-    public function setPhone(?array $phone): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setPhone(?array $phone): AddressModel;
 
     public function getComment(): ?string;
 
-    public function setComment(?string $comment): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setComment(?string $comment): AddressModel;
 
     public function getPointSale(): ?PointSaleInterface;
 
-    public function setPointSale(PointSaleInterface $pointSale): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setPointSale(PointSaleInterface $pointSale): AddressModel;
 
     public function getMerchant(): ?MerchantInterface;
 
-    public function setMerchant(MerchantInterface $merchant): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setMerchant(MerchantInterface $merchant): AddressModel;
 
     public function getDeliveryInfos(): ?string;
 
-    public function setDeliveryInfos(?string $deliveryInfos): \Lc\CaracoleBundle\Model\Address\AddressModel;
+    public function setDeliveryInfos(?string $deliveryInfos): AddressModel;
 }

Model/Config/TaxRateInterface.php

@@ -1,20 +1,50 @@
 <?php
+/**
+ * @author La clic ! <contact@laclic.fr>
+ */
 
 namespace Lc\CaracoleBundle\Model\Config;
 
 
+use Lc\SovBundle\Doctrine\Extension\BlameableTrait;
+use Lc\SovBundle\Doctrine\Extension\DevAliasTrait;
+use Lc\SovBundle\Doctrine\Extension\TimestampableTrait;
+use Lc\SovBundle\Model\User\UserInterface;
+
 /**
  * @ORM\MappedSuperclass()
  */
 interface TaxRateInterface
 {
+    public function getCreatedBy(): ?UserInterface;
+
+    public function setCreatedBy(?UserInterface $createdBy);
+
+    public function getUpdatedBy(): ?UserInterface;
+
+    public function setUpdatedBy(?UserInterface $updatedBy);
+
+    public function getDevAlias(): ?string;
+
+    public function setDevAlias(?string $devAlias);
+
     public function getBehaviorTaxRateChoices(): array;
 
+    public function __toString();
+
     public function getTitle(): ?string;
 
-    public function setTitle(string $title): \Lc\CaracoleBundle\Model\Config\TaxRateModel;
+    public function setTitle(string $title);
 
     public function getValue(): ?float;
 
-    public function setValue(float $value): \Lc\CaracoleBundle\Model\Config\TaxRateModel;
+    public function setValue(float $value): TaxRateModel;
+
+    public function getCreatedAt(): ?\DateTimeInterface;
+
+    public function setCreatedAt(\DateTimeInterface $createdAt);
+
+    public function getUpdatedAt(): ?\DateTimeInterface;
+
+    public function setUpdatedAt(\DateTimeInterface $updatedAt);
 }

Model/Config/UnitInterface.php

@@ -1,36 +1,66 @@
 <?php
+/**
+ * @author La clic ! <contact@laclic.fr>
+ */
 
 namespace Lc\CaracoleBundle\Model\Config;
 
 
+use Lc\SovBundle\Doctrine\Extension\BlameableTrait;
+use Lc\SovBundle\Doctrine\Extension\DevAliasTrait;
+use Lc\SovBundle\Doctrine\Extension\TimestampableTrait;
+use Lc\SovBundle\Model\User\UserInterface;
+
 /**
  * @ORM\MappedSuperclass
  */
 interface UnitInterface
 {
+    public function getCreatedBy(): ?UserInterface;
+
+    public function setCreatedBy(?UserInterface $createdBy);
+
+    public function getUpdatedBy(): ?UserInterface;
+
+    public function setUpdatedBy(?UserInterface $updatedBy);
+
+    public function getDevAlias(): ?string;
+
+    public function setDevAlias(?string $devAlias);
+
+    public function getCreatedAt(): ?\DateTimeInterface;
+
+    public function setCreatedAt(\DateTimeInterface $createdAt);
+
+    public function getUpdatedAt(): ?\DateTimeInterface;
+
+    public function setUpdatedAt(\DateTimeInterface $updatedAt);
+
     public function getUnitAmountChoices(): array;
 
+    public function __toString();
+
     public function getUnit(): ?string;
 
-    public function setUnit(string $unit);
+    public function setUnit(string $unit): UnitModel;
 
     public function getWording(): ?string;
 
-    public function setWording(string $wording);
+    public function setWording(string $wording): UnitModel;
 
     public function getWordingUnit(): ?string;
 
-    public function setWordingUnit(string $wordingUnit);
+    public function setWordingUnit(string $wordingUnit): UnitModel;
 
     public function getWordingShort(): ?string;
 
-    public function setWordingShort(string $wordingShort);
+    public function setWordingShort(string $wordingShort): UnitModel;
 
     public function getCoefficient(): ?int;
 
-    public function setCoefficient(int $coefficient);
+    public function setCoefficient(int $coefficient): UnitModel;
 
     public function getUnitReference(): ?self;
 
-    public function setUnitReference(?UnitModel $unitReference): self;
+    public function setUnitReference(?UnitModel $unitReference);
 }

Model/Credit/CreditHistoryInterface.php

@@ -1,8 +1,92 @@
 <?php
+/**
+ * @author La clic ! <contact@laclic.fr>
+ */
 
 namespace Lc\CaracoleBundle\Model\Credit;
 
+
+use Lc\CaracoleBundle\Doctrine\Extension\PayoffTrait;
+use Lc\CaracoleBundle\Model\Order\OrderPaymentInterface;
+use Lc\CaracoleBundle\Model\Order\OrderRefundInterface;
+use Lc\CaracoleBundle\Model\User\UserMerchantInterface;
+use Lc\SovBundle\Doctrine\Extension\BlameableTrait;
+use Lc\SovBundle\Doctrine\Extension\DevAliasTrait;
+use Lc\SovBundle\Doctrine\Extension\TimestampableTrait;
+use Lc\SovBundle\Model\User\UserInterface;
+
+/**
+ * @ORM\MappedSuperclass()
+ */
 interface CreditHistoryInterface
 {
+    public function getCreatedBy(): ?UserInterface;
+
+    public function setCreatedBy(?UserInterface $createdBy);
+
+    public function getUpdatedBy(): ?UserInterface;
+
+    public function setUpdatedBy(?UserInterface $updatedBy);
+
+    public function __toString();
+
+    public function getAmount(): ?float;
+
+    public function setAmount(?float $amount);
+
+    public function getAmountInherited(): float;
+
+    public function getMeanPaymentInherited(): string;
+
+    public function getPaidAtInherited(): ?\DateTimeInterface;
+
+    public function getReferenceInherited(): ?string;
+
+    public function getCommentInherited(): ?string;
+
+    public function getMeanPaymentInheritedLabel(): string;
+
+    public function getType(): ?string;
+
+    public function setType(string $type): CreditHistoryModel;
+
+    public function getUserMerchant(): ?UserMerchantInterface;
+
+    public function setUserMerchant(?UserMerchantInterface $userMerchant): CreditHistoryModel;
+
+    public function getOrderPayment(): ?OrderPaymentInterface;
+
+    public function setOrderPayment(?OrderPaymentInterface $orderPayment): CreditHistoryModel;
+
+    public function getOrderRefund(): ?OrderRefundInterface;
+
+    public function setOrderRefund(?OrderRefundInterface $orderRefund): CreditHistoryModel;
+
+    public function getDevAlias(): ?string;
+
+    public function setDevAlias(?string $devAlias);
+
+    public function setMeanPayment(?string $meanPayment): CreditHistoryModel;
+
+    public function getMeanPayment(): ?string;
+
+    public function getReference(): ?string;
+
+    public function setReference(?string $reference): CreditHistoryModel;
+
+    public function getPaidAt(): ?\DateTimeInterface;
+
+    public function setPaidAt(?\DateTimeInterface $paidAt): CreditHistoryModel;
+
+    public function getComment(): ?string;
+
+    public function setComment(?string $comment): CreditHistoryModel;
+
+    public function getCreatedAt(): ?\DateTimeInterface;
+
+    public function setCreatedAt(\DateTimeInterface $createdAt);
+
+    public function getUpdatedAt(): ?\DateTimeInterface;
 
-}
+    public function setUpdatedAt(\DateTimeInterface $updatedAt);
+}

Model/Credit/CreditHistoryModel.php

@@ -15,10 +15,10 @@ use Lc\SovBundle\Doctrine\Pattern\AbstractLightEntity;
 /**
  * @ORM\MappedSuperclass()
  */
-abstract class CreditHistoryModel extends AbstractLightEntity implements PayoffInterface
+abstract class CreditHistoryModel extends AbstractLightEntity implements PayoffInterface, CreditHistoryInterface
 {
     use PayoffTrait;
-    use BlameableNullableTrait;
+
 
     const TYPE_CREDIT = 'credit';
     const TYPE_DEBIT = 'debit';

Model/File/DocumentModel.php

@@ -21,7 +21,7 @@ use Lc\SovBundle\Doctrine\Pattern\AbstractFullEntity;
  */
 abstract class DocumentModel extends AbstractFullEntity implements FilterSectionInterface
 {
-    use BlameableNullableTrait;
+
 
     const TYPE_INVOICE = 'invoice';
     const TYPE_QUOTATION = 'quotation';

Model/Order/OrderShopModel.php

@@ -23,7 +23,7 @@ use Lc\SovBundle\Model\User\UserInterface;
  */
 abstract class OrderShopModel extends AbstractLightEntity implements FilterSectionInterface, OrderShopInterface
 {
-    use BlameableNullableTrait;
+
 
     const DELIVERY_TYPE_HOME = 'home';
     const DELIVERY_TYPE_POINTSALE = 'point-sale';

Model/Order/OrderStatusHistoryModel.php

@@ -13,7 +13,7 @@ use Lc\SovBundle\Doctrine\Pattern\AbstractLightEntity;
  */
 abstract class OrderStatusHistoryModel extends AbstractLightEntity
 {
-    use BlameableNullableTrait;
+
 
     /**
      * @ORM\ManyToOne(targetEntity="Lc\CaracoleBundle\Model\Order\OrderShopInterface", inversedBy="orderStatusHistories")

Model/Product/ProductFamilyModel.php

@@ -24,7 +24,7 @@ abstract class ProductFamilyModel extends AbstractFullEntity implements ProductP
                                                                         FilterSectionInterface, ProductFamilyInterface
 {
     use ProductPropertyTrait;
-    use BlameableNullableTrait;
+
 
     const BEHAVIOR_COUNT_STOCK_UNLIMITED = 'unlimited';
     const BEHAVIOR_COUNT_STOCK_BY_MEASURE = 'by-measure';

Model/Product/ProductModel.php

@@ -24,7 +24,7 @@ abstract class ProductModel extends AbstractLightEntity implements SortableInter
     use SortableTrait;
     use ProductPropertyTrait;
     use StatusTrait;
-    use BlameableNullableTrait;
+
 
     /**
      * @ORM\ManyToOne(targetEntity="Lc\CaracoleBundle\Model\Product\ProductFamilyInterface", inversedBy="products",  cascade={"persist"})