Notification update

Added missing NotificationBody fields definitions
Updated names of NotificationBody fields
Added getNotificationAssociative() method in BasicPayment object

Examples/Notifications/PaymentNotificationExample.php

@@ -26,3 +26,8 @@ public function checkPayment()
 var_dump($notification->tr_id->getValue());
 //The above example will check the notification and print the value of received tr_id field
 //You can access any notification field by $notification->fieldName
+
+$notificationArray = $notification->getNotificationAssociative();
+var_dump($notificationArray);
+//The above method will get the notification as an associative array and print its contents.
+//You can access notification field value by $notificationArray['fieldName']

Model/Fields/Notification/Email.php

@@ -0,0 +1,12 @@
+<?php
+namespace tpaySDK\Model\Fields\Notification;
+
+use tpaySDK\Model\Fields\Field;
+
+class Email extends Field
+{
+    protected $name = 'tr_email';
+
+    protected $type = self::STRING;
+
+}

Model/Fields/Notification/Md5sum.php

@@ -5,7 +5,7 @@
 
 class Md5sum extends Field
 {
-    protected $name = __CLASS__;
+    protected $name = 'md5sum';
 
     protected $type = self::STRING;
 

Model/Fields/Notification/MerchantId.php

@@ -0,0 +1,12 @@
+<?php
+namespace tpaySDK\Model\Fields\Notification;
+
+use tpaySDK\Model\Fields\Field;
+
+class MerchantId extends Field
+{
+    protected $name = 'id';
+
+    protected $type = self::INT;
+
+}

Model/Fields/Notification/TestMode.php

@@ -5,7 +5,7 @@
 
 class TestMode extends Field
 {
-    protected $name = __CLASS__;
+    protected $name = 'test_mode';
 
     protected $type = self::INT;
 

Model/Fields/Notification/Wallet.php

@@ -5,7 +5,7 @@
 
 class Wallet extends Field
 {
-    protected $name = __CLASS__;
+    protected $name = 'wallet';
 
     protected $type = self::STRING;
 

Model/Objects/NotificationBody/BasicPayment.php

@@ -6,6 +6,7 @@
 use tpaySDK\Model\Fields\Notification\Description;
 use tpaySDK\Model\Fields\Notification\Error;
 use tpaySDK\Model\Fields\Notification\Md5sum;
+use tpaySDK\Model\Fields\Notification\MerchantId;
 use tpaySDK\Model\Fields\Notification\Paid;
 use tpaySDK\Model\Fields\Notification\TestMode;
 use tpaySDK\Model\Fields\Notification\TransactionAmount;
@@ -14,17 +15,16 @@
 use tpaySDK\Model\Fields\Notification\TransactionId;
 use tpaySDK\Model\Fields\Notification\TransactionStatus;
 use tpaySDK\Model\Fields\Notification\Wallet;
-use tpaySDK\Model\Fields\Person\Email;
+use tpaySDK\Model\Fields\Notification\Email;
 use tpaySDK\Model\Objects\ObjectHelper;
 use tpaySDK\Model\Objects\Objects;
-use tpaySDK\Model\Primitives\Id;
 
 class BasicPayment extends Objects
 {
     use ObjectHelper;
 
     const OBJECT_FIELDS = [
-        'id' => Id::class,
+        'id' => MerchantId::class,
         'tr_id' => TransactionId::class,
         'tr_date' => TransactionDate::class,
         'tr_crc' => Crc::class,
@@ -42,7 +42,7 @@ class BasicPayment extends Objects
     ];
 
     /**
-     * @var Id
+     * @var MerchantId
      */
     public $id;
 
@@ -133,4 +133,20 @@ public function getRequiredFields()
         ];
     }
 
+    /**
+     * Returns associative array containing all notification fields
+     * @return array
+     */
+    public function getNotificationAssociative()
+    {
+        $notification = [];
+        foreach (static::OBJECT_FIELDS as $fieldName => $fieldClass) {
+            if (isset($this->$fieldName) && !is_null($this->$fieldName->getValue())) {
+                $notification[$fieldName] = $this->$fieldName->getValue();
+            }
+        }
+
+        return $notification;
+    }
+
 }