From 02209eb558843dc8f381bfd543180ecc5d707147 Mon Sep 17 00:00:00 2001
From: GotPPay <bilal.catic@hotmail.com>
Date: Tue, 26 Jun 2018 23:59:27 +0200
Subject: [PATCH] store and read additional fields in delivery_addresses table

---
 .../components/v2/helpers/AddressHelper.php   | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/api-wiaas/server/components/v2/helpers/AddressHelper.php b/api-wiaas/server/components/v2/helpers/AddressHelper.php
index 2a6a879..3b14885 100644
--- a/api-wiaas/server/components/v2/helpers/AddressHelper.php
+++ b/api-wiaas/server/components/v2/helpers/AddressHelper.php
@@ -9,6 +9,9 @@ class AddressHelper{
 
         $sqlDelivery = "SELECT
                  da.id,
+                 da.firstName as firstName,
+                 da.lastName as lastName,
+                 da.deliveryMail as deliveryMail,
                  da.detailedAddress AS detailedAddress,
                  da.city AS city,
                  da.zip AS zipCode,
@@ -187,6 +190,23 @@ class AddressHelper{
             $data['messages'][] = $checkMessage;
         }
 
+
+        if($type === 'profileAddress'){
+            if(isset($info->deliveryMail) &&  !empty($info->deliveryMail)) {
+                $checkMessage = $database->invalidLength('deliveryMail', $info->deliveryMail, 300);
+                if($checkMessage){
+                    $data['messages'][] = $checkMessage;
+                }
+
+                if(!filter_var($info->deliveryMail, FILTER_VALIDATE_EMAIL)){
+                    $data['messages'][] = [
+                        'code' => 'error',
+                        'message' => 'INVALID_DELIVERY_MAIL'
+                    ];
+                }
+            }
+        }
+
         if($type === 'billingAddress'){
             if(isset($info->invoiceMail) &&  !empty($info->invoiceMail)) {
                 $checkMessage = $database->invalidLength('invoiceMail', $info->invoiceMail, 300);
@@ -245,14 +265,20 @@ class AddressHelper{
 
         $idAddress = isset($profileAddress->id) ? $profileAddress->id : 'null';
 
-        $sql = "INSERT INTO ".TABLES['delivery_addresses']." (id, idUser, idCountry, city, detailedAddress, zip)
+        $sql = "INSERT INTO ".TABLES['delivery_addresses']." (id, idUser, firstName, lastName, deliveryMail, idCountry, city, detailedAddress, zip)
                 VALUES(".$idAddress.",
                     ".$idUser.",
+                    '".$profileAddress->firstName."',
+                    '".$profileAddress->lastName."',
+                    '".$profileAddress->deliveryMail."',
                     ".$profileAddress->idCountrySelected.",
                     '".$profileAddress->city."',
                     '".$profileAddress->detailedAddress."',
                     '".$profileAddress->zipCode."')
                 ON DUPLICATE KEY UPDATE
+                    firstName= VALUES(firstName),
+                    lastName= VALUES(lastName),
+                    deliveryMail= VALUES(deliveryMail),
                     idCountry= VALUES(idCountry),
                     city= VALUES(city),
                     detailedAddress=VALUES(detailedAddress),