Browse Source
Merge branch 'develop' of https://gitea.laclic.fr/Laclic/CaracoleBundle into develop
feature/ticket
4 changed files with 5 additions and 5 deletions
+ 2
- 2
Model/Merchant/MerchantModel.php
View File
| protected $productCategories; | protected $productCategories; | ||||
| /** | /** | ||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\News\NewsInterface", mappedBy="merchant", orphanRemoval=true) | |||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Site\NewsInterface", mappedBy="merchant", orphanRemoval=true) | |||||
| */ | */ | ||||
| protected $news; | protected $news; | ||||
| protected $newsletters; | protected $newsletters; | ||||
| /** | /** | ||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\User\GroupUser", mappedBy="merchant") | |||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\User\GroupUserInterface", mappedBy="merchant") | |||||
| */ | */ | ||||
| protected $groupUsers; | protected $groupUsers; | ||||
+ 1
- 1
Model/Order/OrderShopModel.php
View File
| protected $orderReductionCredits; | protected $orderReductionCredits; | ||||
| /** | /** | ||||
| * @ORM\ManyToMany(targetEntity="Lc\CaracoleBundle\Model\Order\DocumentInterface", inversedBy="orderShops") | |||||
| * @ORM\ManyToMany(targetEntity="Lc\CaracoleBundle\Model\File\DocumentInterface", inversedBy="orderShops") | |||||
| */ | */ | ||||
| protected $documents; | protected $documents; | ||||
+ 1
- 1
Model/PointSale/PointSaleModel.php
View File
| protected $code; | protected $code; | ||||
| /** | /** | ||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Pointsale\PointSaleDayInfoInterface", mappedBy="pointSale", orphanRemoval=true) | |||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\PointSale\PointSaleDayInfoInterface", mappedBy="pointSale", orphanRemoval=true) | |||||
| */ | */ | ||||
| protected $pointSaleDayInfos; | protected $pointSaleDayInfos; | ||||
+ 1
- 1
Model/User/VisitorModel.php
View File
| protected $totalVisit; | protected $totalVisit; | ||||
| /** | /** | ||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Order\OrderShop", mappedBy="visitor") | |||||
| * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Order\OrderShopInterface", mappedBy="visitor") | |||||
| */ | */ | ||||
| protected $orders; | protected $orders; | ||||
Loading…