Merge pull request #93 from pagarme/release/2.2.0

Release 2.2.0

Author: fabiano-mallmann

composer.json

@@ -2,7 +2,7 @@
   "name": "pagarme/ecommerce-module-core",
   "description": "Core component for Pagar.me e-commerce platform modules.",
   "license": "MIT",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "authors": [
     {
       "name":"Open Source Team"

src/Kernel/Abstractions/AbstractDatabaseDecorator.php

@@ -19,6 +19,7 @@ abstract class AbstractDatabaseDecorator
     const TABLE_RECURRENCE_CHARGE = 12;
     const TABLE_RECURRENCE_SUBSCRIPTION = 13;
     const TABLE_RECURRENCE_SUBSCRIPTION_ITEM = 14;
+    const TABLE_RECIPIENTS = 15;
 
     protected $db;
     protected $tablePrefix;
@@ -57,4 +58,4 @@ abstract protected function doQuery($query);
     abstract protected function doFetch($query);
     abstract protected function formatResults($query);
     abstract protected function setLastInsertId($insertId);
-}
+}

src/Kernel/Abstractions/AbstractPlatformOrderDecorator.php

@@ -35,42 +35,37 @@ public function getPlatformOrder()
     public function setPlatformOrder($platformOrder)
     {
         $this->platformOrder = $platformOrder;
+        $this->handleSplitOrder();
     }
 
     public function setStatus(OrderStatus $status)
     {
         $currentStatus = '';
         try {
             $currentStatus = $this->getStatus();
-        } catch(\Exception $e) {
-
-        } catch(\Throwable $e) {
-
+        } catch (\Throwable $e) {
         }
 
         $statusInfo = (object)[
             "from" => $currentStatus,
             "to" => $status,
 
         ];
-       $this->logService->orderInfo(
-           $this->getCode(),
-           'Status Change',
-           $statusInfo
-       );
+        $this->logService->orderInfo(
+            $this->getCode(),
+            'Status Change',
+            $statusInfo
+        );
 
-       $this->setStatusAfterLog($status);
+        $this->setStatusAfterLog($status);
     }
 
     public function setState(OrderState $state)
     {
         $currentState = '';
         try {
             $currentState = $this->getState();
-        } catch(\Exception $e) {
-
-        } catch(\Throwable $e) {
-
+        } catch (\Throwable $e) {
         }
 
         $stateInfo = (object)[
@@ -204,4 +199,4 @@ public function getPaymentMethod()
     abstract protected function addMPHistoryComment($message, $notifyCustomer);
     abstract protected function setStatusAfterLog(OrderStatus $status);
     abstract protected function setStateAfterLog(OrderState $state);
-}
+}

src/Kernel/Aggregates/Configuration.php

@@ -9,6 +9,7 @@
 use Pagarme\Core\Kernel\ValueObjects\AbstractValidString;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\AddressAttributes;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\CardConfig;
+use Pagarme\Core\Kernel\ValueObjects\Configuration\MarketplaceConfig;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\PixConfig;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\RecurrenceConfig;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\VoucherConfig;
@@ -160,6 +161,11 @@ final class Configuration extends AbstractEntity
      */
     private $pixConfig;
 
+    /**
+     * @var MarketplaceConfig
+     */
+    private $marketplaceConfig;
+
     public function __construct()
     {
         $this->saveCards = false;
@@ -226,6 +232,22 @@ public function getPixConfig()
         return $this->pixConfig;
     }
 
+    /**
+     * @param MarketplaceConfig $marketplaceConfig
+     */
+    public function setMarketplaceConfig(MarketplaceConfig $marketplaceConfig)
+    {
+        $this->marketplaceConfig = $marketplaceConfig;
+    }
+
+    /**
+     * @return MarketplaceConfig
+     */
+    public function getMarketplaceConfig()
+    {
+        return $this->marketplaceConfig;
+    }
+
     /**
      * @return VoucherConfig
      */
@@ -770,7 +792,8 @@ public function jsonSerialize()
             "createOrder" => $this->isCreateOrderEnabled(),
             "voucherConfig" => $this->getVoucherConfig(),
             "debitConfig" => $this->getDebitConfig(),
-            "pixConfig" => $this->getPixConfig()
+            "pixConfig" => $this->getPixConfig(),
+            "marketplaceConfig" => $this->getMarketplaceConfig()
         ];
     }
 

src/Kernel/Aggregates/Order.php

@@ -192,6 +192,25 @@ public function updateCharge(ChargeInterface $updatedCharge, $overwriteId = fals
         $this->addCharge($updatedCharge);
     }
 
+    public function getSplitInfo()
+    {
+        $splitInfo = [];
+        foreach ($this->getCharges() as $charge) {
+            $transaction = $charge->getLastTransaction();
+            $postData = $transaction->getPostData();
+            $chargeId = $transaction->getChargeId()->getValue();
+            if (empty($postData->split)) {
+                continue;
+            }
+            foreach($postData->split as $split) {
+                $splitInfo[$chargeId][] = $split->recipient->name .
+                    ' (' . $split->recipient->id . ') - ' .
+                    $split->type . ': ' . $split->amount;
+            }
+        }
+        return $splitInfo;
+    }
+
     /**
      * Specify data which should be serialized to JSON
      *

src/Kernel/Factories/ConfigurationFactory.php

@@ -5,6 +5,7 @@
 use Pagarme\Core\Kernel\Abstractions\AbstractEntity;
 use Pagarme\Core\Kernel\Aggregates\Configuration;
 use Pagarme\Core\Kernel\Factories\Configurations\DebitConfigFactory;
+use Pagarme\Core\Kernel\Factories\Configurations\MarketplaceConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\PixConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\RecurrenceConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\VoucherConfigFactory;
@@ -223,6 +224,13 @@ public function createFromJsonData($json)
             );
         }
 
+        if (!empty($data->marketplaceConfig)) {
+            $config->setMarketplaceConfig(
+                (new MarketplaceConfigFactory())
+                    ->createFromDbData($data->marketplaceConfig)
+            );
+        }
+
         return $config;
     }
 

src/Kernel/Factories/Configurations/MarketplaceConfigFactory.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Pagarme\Core\Kernel\Factories\Configurations;
+
+use Pagarme\Core\Kernel\Interfaces\FactoryCreateFromDbDataInterface;
+use Pagarme\Core\Kernel\ValueObjects\Configuration\MarketplaceConfig;
+
+class MarketplaceConfigFactory implements FactoryCreateFromDbDataInterface
+{
+
+    /**
+     * @param object $data
+     * @return MarketplaceConfig
+     */
+    public function createFromDbData($data)
+    {
+        $marketplaceConfig = new MarketplaceConfig();
+
+        if (isset($data->enabled)) {
+            $marketplaceConfig->setEnabled(
+                (bool) $data->enabled
+            );
+        }
+
+        if (isset($data->responsibilityForProcessingFees)) {
+            $marketplaceConfig->setResponsibilityForProcessingFees(
+                $data->responsibilityForProcessingFees
+            );
+        }
+
+        if (isset($data->responsibilityForChargebacks)) {
+            $marketplaceConfig->setResponsibilityForChargebacks(
+                $data->responsibilityForChargebacks
+            );
+        }
+
+        if (isset($data->responsibilityForReceivingSplitRemainder)) {
+            $marketplaceConfig->setResponsibilityForReceivingSplitRemainder(
+                $data->responsibilityForReceivingSplitRemainder
+            );
+        }
+
+        if (isset($data->responsibilityForReceivingExtrasAndDiscounts)) {
+            $marketplaceConfig->setResponsibilityForReceivingExtrasAndDiscounts(
+                $data->responsibilityForReceivingExtrasAndDiscounts
+            );
+        }
+
+        if (isset($data->mainRecipientId)) {
+            $marketplaceConfig->setMainRecipientId(
+                $data->mainRecipientId
+            );
+        }
+
+        return $marketplaceConfig;
+    }
+}

src/Kernel/I18N/ENUS.php

@@ -94,6 +94,13 @@ protected function getTable()
             "The sum of payments is greater than the order amount! Review the information and try again." => null,
             "The card brand '%s' or the amount %.2f doesn't allow %d installment(s)! Please review the information and try again." => null,
             "Passed value:" => null,
+            "ChargeId: %s - Split rules:" => null,
+            "name" => null,
+            "documentType" => null,
+            "type" => null,
+            "holderName" => null,
+            "holderType" => null,
+            "holderDocument" => null,
         ];
     }
 }

src/Kernel/I18N/PTBR.php

@@ -95,6 +95,13 @@ protected function getTable()
             "The sum of payments is greater than the order amount! Review the information and try again." => "A soma dos pagamentos é maior do que o valor do pedido! Verifique as informações de sua compra e tente novamente.",
             "The card brand '%s' or the amount %.2f doesn't allow %d installment(s)! Please review the information and try again." => "A bandeira do cartão '%s' ou o valor %.2f não permite %d parcela(s)! Por favor revise os dados e tente novamente.",
             "Passed value:" => "Valor informado:",
+            "ChargeId: %s - Split rules:" => "ChargeId: %s - Regras de Split:",
+            "name" => "Nome",
+            "documentType" => "Tipo do Documento",
+            "type" => "Tipo",
+            "holderName" => "Nome do Titular",
+            "holderType" => "Tipo do Titular",
+            "holderDocument" => "Documento do Titular",
         ];
     }
 }

src/Kernel/Interfaces/PlatformOrderInterface.php

@@ -5,6 +5,7 @@
 use Pagarme\Core\Kernel\ValueObjects\Id\OrderId;
 use Pagarme\Core\Kernel\ValueObjects\OrderState;
 use Pagarme\Core\Kernel\ValueObjects\OrderStatus;
+use Pagarme\Core\Marketplace\Aggregates\Split;
 use Pagarme\Core\Payment\Aggregates\Customer;
 use Pagarme\Core\Payment\Aggregates\Item;
 use Pagarme\Core\Payment\Aggregates\Payments\AbstractPayment;
@@ -77,7 +78,7 @@ public function getCode();
     public function getData();
     /**
      *
-     * @return OrderId 
+     * @return OrderId
      */
     public function getPagarmeId();
 
@@ -99,6 +100,9 @@ public function getPaymentMethodCollection();
     /** @return null|Shipping */
     public function getShipping();
 
+    /** @return null|Split */
+    public function handleSplitOrder();
+
     /** @since  1.6.5 */
     public function getTotalCanceled();
 
@@ -119,4 +123,4 @@ public function sendEmail($message);
      * @return string
      */
     public function getStatusLabel(OrderStatus $orderStatus);
-}
+}