Merge branch 'master' into '256-privacy-policy-for-warranty'

# Conflicts:
#   src/Entity/PrivacyPolicy.php

config/api_acl.yaml

@@ -18,8 +18,6 @@ access_keys:
           label: Cancel
         - id: warranty.delete
           label: Delete
-        - id: warranty.set.privacypolicy
-          label: Set Privacy Policy
     - id: batterybrand
       label: Battery Brand Access
       acls:

src/Entity/Warranty.php

@@ -127,13 +127,6 @@ class Warranty
      */
     protected $flag_activated;
 
-    // privacy policy
-    /**
-     * @ORM\ManyToOne(targetEntity="PrivacyPolicy", inversedBy="warranties")
-     * @ORM\JoinColumn(name="warranty_privacy_policy", referencedColumnName="id", nullable=true)
-     */
-    protected $privacy_policy;
-
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -373,23 +366,4 @@ class Warranty
     {
         return $this->flag_activated;
     }
-
-    public function hasPrivacyPolicy()
-    {
-        if ($this->privacy_policy == null)
-            return false;
-
-        return true;
-    }
-
-    public function setPrivacyPolicy($privacy_policy)
-    {
-        $this->privacy_policy = $privacy_policy;
-        return $this;
-    }
-
-    public function getPrivacyPolicy()
-    {
-        return $this->privacy_policy;
-    }
 }