Merge pull request #34 from MakarovIgor/master

Change delivery

Author: igorbunov

.gitignore

@@ -7,3 +7,4 @@ nbproject/*
 index.php
 /build/logs/*
 .phpunit.result.cache
+test.php

src/Mappers/Receipts/DeliveryMapper.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace igorbunov\Checkbox\Mappers\Receipts;
+
+use igorbunov\Checkbox\Models\Receipts\Delivery;
+
+class DeliveryMapper
+{
+    /**
+     * @param Delivery $delivery
+     * @return array<string, mixed>
+     */
+    public function objectToJson(Delivery $delivery): array
+    {
+        $output = [];
+
+        if (!empty($delivery->emails())) {
+            $output['emails'] = $delivery->emails();
+        }
+
+        if (!empty($delivery->phone())) {
+            $output['phone'] = $delivery->phone();
+        }
+
+        return $output;
+    }
+}

src/Mappers/Receipts/SellReceiptMapper.php

@@ -15,21 +15,11 @@ class SellReceiptMapper
      */
     public function objectToJson(SellReceipt $receipt): array
     {
-        $delivery = [];
-
-        if (!empty($receipt->deliveryEmail)) {
-            $delivery['email'] = $receipt->deliveryEmail;
-        }
-
-        if (!empty($receipt->deliveryPhone)) {
-            $delivery['phone'] = $receipt->deliveryPhone;
-        }
-
         $output = [
             'cashier_name' => $receipt->cashier_name,
             'departament' => $receipt->departament,
             'goods' => (new GoodsMapper())->objectToJson($receipt->goods),
-            'delivery' => $delivery,
+            'delivery' => (new DeliveryMapper())->objectToJson($receipt->delivery),
             'discounts' => (new DiscountsMapper())->objectToJson($receipt->discounts),
             'payments' => (new PaymentsMapper())->objectToJson($receipt->payments),
             'header' => $receipt->header,

src/Models/Receipts/Delivery.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace igorbunov\Checkbox\Models\Receipts;
+
+class Delivery
+{
+    /** @var string $phone */
+    private string $phone;
+    /** @var array<string> $emails */
+    private array $emails;
+
+    /**
+     * Constructor
+     *
+     * @param array<string> $emails
+     * @param string $phone
+     *
+     */
+    public function __construct(array $emails = [], string $phone = '')
+    {
+        $this->phone = $phone;
+        $this->emails = $emails;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function emails(): array
+    {
+        return $this->emails;
+    }
+
+    /**
+     * @return string
+     */
+    public function phone(): string
+    {
+        return $this->phone;
+    }
+}

src/Models/Receipts/SellReceipt.php

@@ -14,10 +14,8 @@ class SellReceipt
     public $departament;
     /** @var Goods $goods */
     public $goods;
-    /** @var string $deliveryEmail */
-    public $deliveryEmail;
-    /** @var string $deliveryPhone */
-    public $deliveryPhone;
+    /** @var Delivery $delivery */
+    public Delivery $delivery;
     /** @var Discounts|null $discounts */
     public $discounts;
     /** @var Payments $payments */
@@ -40,21 +38,19 @@ public function __construct(
         string $cashier_name,
         string $departament,
         Goods $goods,
-        string $deliveryEmail,
+        Delivery $delivery,
         Payments $payments,
         ?Discounts $discounts = null,
         string $header = '',
         string $footer = '',
         string $barcode = '',
-        string $id = '',
-        string $deliveryPhone = '',
+        string $id = ''
     ) {
         $this->id = $id;
         $this->cashier_name = $cashier_name;
         $this->departament = $departament;
         $this->goods = $goods;
-        $this->deliveryEmail = $deliveryEmail;
-        $this->deliveryPhone = $deliveryPhone;
+        $this->delivery = $delivery;
         $this->discounts = $discounts;
         $this->payments = $payments;
         $this->header = $header;

tests/Mappers/SellReceiptTest.php

@@ -7,6 +7,7 @@
 use igorbunov\Checkbox\Mappers\Receipts\ReceiptMapper;
 use igorbunov\Checkbox\Mappers\Receipts\SellReceiptMapper;
 use igorbunov\Checkbox\Mappers\Receipts\Taxes\GoodTaxMapper;
+use igorbunov\Checkbox\Models\Receipts\Delivery;
 use igorbunov\Checkbox\Models\Receipts\Goods\GoodItemModel;
 use igorbunov\Checkbox\Models\Receipts\Goods\GoodModel;
 use igorbunov\Checkbox\Models\Receipts\Goods\Goods;
@@ -34,7 +35,7 @@ public function setUp(): void
             'er":"","footer":"","price":5000,"tax":["123123"],"uktzed":""},"quantity":1000,"is_return":false,' .
             '"discounts":[]},{"good":{"code":"vm-124","name":"\u0411\u0438\u043e\u0432\u0430\u043a 2",' .
             '"barcode":"","header":"","footer":"","price":2000,"tax":["123123"],"uktzed":""},' .
-            '"quantity":2000,"is_return":false,"discounts":[]}],"delivery":{"email":"[email protected]"},' .
+            '"quantity":2000,"is_return":false,"discounts":[]}],"delivery":{"emails":["[email protected]"]},' .
             '"discounts":[],"payments":[{"type":"CASHLESS","value":"4000","la' .
             'bel":"\u0411\u0435\u0437\u0433\u043e\u0442\u0456\u0432\u043a\u043e\u0432\u0438\u0439"},{"ty' .
             'pe":"CASH","value":"5000","label":"\u0413\u043e\u0442\u0456\u0432\u043a\u043e\u044e"}],"head' .
@@ -405,7 +406,7 @@ public function testMap(): void
                     )
                 ]
             ),
-            '[email protected]',
+            new Delivery(['[email protected]']),
             new Payments([
                 new CardPaymentPayload(
                     "4000" // 40 грн
@@ -472,7 +473,7 @@ public function testMapWithId()
                     )
                 ]
             ),
-            '[email protected]',
+            new Delivery(['[email protected]']),
             new Payments([
                 new CardPaymentPayload(
                     "4000" // 40 грн
@@ -496,7 +497,7 @@ public function testMapWithId()
         $this->assertEquals(json_encode($mappedJsonString), $result);
     }
 
-    public function testMapReceiptReuslt()
+    public function testMapReceiptResult()
     {
         $jsonResponse = json_decode($this->jsonString, true);