Merge 38bc576 into 8190413

Bukashk0zzz · Apr 2, 2021 · 6044596 · 6044596
2 parents 8190413 + 38bc576
commit 6044596
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 0 deletions.
diff --git a/src/Model/Offer/AbstractOffer.php b/src/Model/Offer/AbstractOffer.php
@@ -128,6 +128,11 @@ abstract class AbstractOffer implements OfferInterface
      */
     private $weight;
 
+    /**
+     * @var string
+     */
+    private $dimensions;
+
     /**
      * @var int
      */
@@ -639,6 +644,34 @@ public function setWeight($weight)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getDimensions()
+    {
+        return $this->dimensions;
+    }
+
+    /**
+     * @param float $length
+     * @param float $width
+     * @param float $height
+     *
+     * @return $this
+     */
+    public function setDimensions($length, $width, $height)
+    {
+        $dimensions = [
+            \round((float) $length, 3),
+            \round((float) $width, 3),
+            \round((float) $height, 3),
+        ];
+
+        $this->dimensions = \implode('/', $dimensions);
+
+        return $this;
+    }
+
     /**
      * @return int
      */
@@ -886,6 +919,7 @@ private function getHeaderOptions()
                 'delivery' => $this->isDelivery(),
                 'local_delivery_cost' => $this->getLocalDeliveryCost(),
                 'weight' => $this->getWeight(),
+                'dimensions' => $this->getDimensions(),
                 'name' => $this->getName(),
                 'enable_auto_discounts' => $this->getAutoDiscount(),
             ] + $this->getCustomElements();

diff --git a/tests/AbstractGeneratorTest.php b/tests/AbstractGeneratorTest.php
@@ -117,6 +117,11 @@ protected function createOffers()
                 ->setOldPrice($this->faker->numberBetween(1, 9999))
                 ->setPurchasePrice($this->faker->numberBetween(1, 9999))
                 ->setWeight($this->faker->numberBetween(1, 9999))
+                ->setDimensions(
+                    $this->faker->randomFloat(3, 0),
+                    $this->faker->randomFloat(3, 0),
+                    $this->faker->randomFloat(3, 0)
+                )
                 ->setCurrencyId('UAH')
                 ->setCategoryId($id)
                 ->setDelivery($this->faker->boolean)

diff --git a/tests/dtd/ArtistTitle.dtd b/tests/dtd/ArtistTitle.dtd
@@ -44,6 +44,7 @@
     delivery?,
     local_delivery_cost?,
     weight?,
+    dimensions?,
     enable_auto_discounts?,
     artist?,
     title,
@@ -165,6 +166,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param

diff --git a/tests/dtd/Audiobook.dtd b/tests/dtd/Audiobook.dtd
@@ -44,6 +44,7 @@
         delivery?,
         local_delivery_cost?,
         weight?,
+        dimensions?,
         name,
         enable_auto_discounts?,
         author?,
@@ -173,6 +174,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param

diff --git a/tests/dtd/Book.dtd b/tests/dtd/Book.dtd
@@ -45,6 +45,7 @@
         delivery?,
         local_delivery_cost?,
         weight?,
+        dimensions?,
         name,
         enable_auto_discounts?,
         author?,
@@ -170,6 +171,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param

diff --git a/tests/dtd/Custom.dtd b/tests/dtd/Custom.dtd
@@ -48,6 +48,7 @@
                 deliveryIncluded?,
                 local_delivery_cost?,
                 weight?,
+                dimensions?,
                 enable_auto_discounts?,
                 orderingTime?,
                 typePrefix?,
@@ -162,6 +163,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param

diff --git a/tests/dtd/EventTicket.dtd b/tests/dtd/EventTicket.dtd
@@ -44,6 +44,7 @@
         delivery?,
         local_delivery_cost?,
         weight?,
+        dimensions?,
         name,
         enable_auto_discounts?,
         place,
@@ -103,6 +104,7 @@
 <!ELEMENT price (#PCDATA)>
 <!ELEMENT oldprice (#PCDATA)>
 <!ELEMENT purchase_price (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT wprice (#PCDATA)>
 <!ELEMENT currencyId (#PCDATA)>
 <!ELEMENT categoryId (#PCDATA)>

diff --git a/tests/dtd/OfferDeliveryOptions.dtd b/tests/dtd/OfferDeliveryOptions.dtd
@@ -46,6 +46,7 @@
         delivery?,
         local_delivery_cost?,
         weight?,
+        dimensions?,
         name,
         enable_auto_discounts?,
         vendor?,
@@ -160,6 +161,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param

diff --git a/tests/dtd/Simple.dtd b/tests/dtd/Simple.dtd
@@ -46,6 +46,7 @@
         delivery?,
         local_delivery_cost?,
         weight?,
+        dimensions?,
         name,
         enable_auto_discounts?,
         vendor?,
@@ -159,6 +160,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param

diff --git a/tests/dtd/Tour.dtd b/tests/dtd/Tour.dtd
@@ -44,6 +44,7 @@
         delivery?,
         local_delivery_cost?,
         weight?,
+        dimensions?,
         name,
         enable_auto_discounts?,
         worldRegion?,
@@ -170,6 +171,7 @@
 <!ELEMENT adult (#PCDATA)>
 <!ELEMENT age (#PCDATA)>
 <!ELEMENT weight (#PCDATA)>
+<!ELEMENT dimensions (#PCDATA)>
 <!ELEMENT barcode (#PCDATA)>
 <!ELEMENT param (#PCDATA)>
 <!ATTLIST param