Include changes from 2.1.4 release

Author: ivan-pugach-mondu

Components/MonduApi/Service/MonduClient.php

@@ -37,11 +37,26 @@ public function __construct(
     /**
      * @throws RequestException
      */
-    public function createOrder($order, $returnUrl, $cancelUrl, $declineUrl, $paymentMethod) {
+    public function createOrder($order, $returnUrl, $cancelUrl, $declineUrl, $paymentMethod, $userData) {
+        $user = $userData['additional']['user'];
+        $billing = $userData['billingaddress'];
+
         $order['payment_method'] = $paymentMethod;
         $order['success_url'] = $returnUrl;
         $order['cancel_url'] = $cancelUrl;
         $order['declined_url'] = $declineUrl;
+        $order['buyer'] = [
+            'email' => $user['email'],
+            'first_name' => $user['firstname'],
+            'last_name' => $user['lastname'],
+            'company_name' => $billing['company'],
+            'phone' => !$billing['phone'] ? null : (trim($billing['phone']) ?: null),
+            'is_registered' => (bool)$user['userID'],
+            'salutation' => $billing['salutation'],
+            'created_at' => $user['firstlogin'] . ' 00:00:00',
+            'updated_at' => $user['changed'],
+            'address_line1' => $billing['street']
+        ];
 
         $body = json_encode($order);
 

Helpers/OrderHelper.php

@@ -4,6 +4,7 @@
 
 use Mond1SWR5\Components\PluginConfig\Service\ConfigService;
 use Mond1SWR5\Enum\PaymentMethods;
+use Mond1SWR5\Services\OrderServices\AbstractOrderAdditionalCostsService;
 use Monolog\Logger;
 use Shopware\Components\HttpClient\RequestException;
 use Shopware\Components\Model\ModelManager;
@@ -43,20 +44,27 @@ class OrderHelper
      */
     private $customerHelper;
 
+    /**
+     * @var AbstractOrderAdditionalCostsService
+     */
+    private $orderAdditionalCostsService;
+
     public function __construct(
         ModelManager $modelManager,
         DocumentHelper $documentHelper,
         Logger $logger,
         ConfigService $configService,
         CartHelper $cartHelper,
-        CustomerHelper $customerHelper
+        CustomerHelper $customerHelper,
+        AbstractOrderAdditionalCostsService $orderAdditionalCostsService
     ) {
         $this->modelManager = $modelManager;
         $this->documentHelper = $documentHelper;
         $this->logger = $logger;
         $this->configService = $configService;
         $this->cartHelper = $cartHelper;
         $this->customerHelper = $customerHelper;
+        $this->orderAdditionalCostsService = $orderAdditionalCostsService;
     }
 
     public function canShipOrder($order): bool
@@ -72,7 +80,7 @@ public function canShipOrder($order): bool
      */
     public function shipOrder($order) {
         /**
-         * @var MonduClient
+         * @var $client MonduClient
          */
         $client = Shopware()->Container()->get(MonduClient::class);
 
@@ -195,6 +203,7 @@ public function getOrderFromOrderVariables($orderVariables) {
             'lines' => [
                 [
                     'discount_cents' => $this->getTotalDiscount($content, $chargeVat),
+                    'buyer_fee_cents' => $this->orderAdditionalCostsService->getAdditionalCostsCentsFromOrderVariables($orderVariables),
                     'shipping_price_cents' => round($shippingAmount * 100),
                     'line_items' => $this->removeDuplicateSwReferenceIds($this->getLineItems($content, $chargeVat))
                 ]
@@ -238,6 +247,7 @@ public function getOrderAdjustment($order) {
             'lines' => [
                 [
                     'discount_cents' => $totalDiscountGross,
+                    'buyer_fee_cents' => $this->orderAdditionalCostsService->getAdditionalCostsCentsFromOrder($order),
                     'shipping_price_cents' => round($order->getInvoiceShipping() * 100),
                     'line_items' => $this->removeDuplicateSwReferenceIds($lineitems)
                 ]
@@ -336,18 +346,19 @@ public function getInvoiceCreateState()
     }
 
     private function getBuyerParams($userData) {
-        $params = $userData['additional']['user'];
+        $user = $userData['additional']['user'];
         $billing = $userData['billingaddress'];
 
-        $phone = !$billing['phone'] ? null : (trim($billing['phone']) ?: null);
-
         return [
-            'email' => $params['email'],
-            'phone' => $phone,
+            'email' => $user['email'],
+            'first_name' => $user['firstname'],
+            'last_name' => $user['lastname'],
             'company_name' => $billing['company'],
-            'first_name' => $billing['firstname'],
-            'last_name' => $billing['lastname'],
+            'phone' => !$billing['phone'] ? null : (trim($billing['phone']) ?: null),
+            'is_registered' => (bool)$user['userID'],
             'salutation' => $billing['salutation'],
+            'created_at' => $user['firstlogin'] . ' 00:00:00',
+            'updated_at' => $user['changed'],
             'address_line1' => $billing['street']
         ];
     }

Resources/services.xml

@@ -26,6 +26,12 @@
         <service id="Mond1SWR5\Components\PluginConfig\Service\ConfigService" public="true">
             <argument key="$router" id="router" type="service"/>
         </service>
+
+        <service
+            id="Mond1SWR5\Services\OrderServices\AbstractOrderAdditionalCostsService"
+            class="Mond1SWR5\Services\OrderServices\OrderAdditionalCostsService"
+        />
+
         <service id="Mond1SWR5\Services\PaymentService" public="true"/>
         <service id="Mond1SWR5\Services\Webhook\WebhookService" public="true"/>
         <service id="Mond1SWR5\Services\PaymentStatusService" public="true"/>

Services/OrderServices/AbstractOrderAdditionalCostsService.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Mond1SWR5\Services\OrderServices;
+
+use Shopware\Models\Order\Order;
+
+abstract class AbstractOrderAdditionalCostsService {
+
+    /**
+     * Additional costs associated with order in cents from sOrderVariables (during checkout)
+     *
+     * @param $sOrderVariables mixed
+     * @return int
+     */
+    abstract public function getAdditionalCostsCentsFromOrderVariables($sOrderVariables): int;
+
+    /**
+     * Additional costs associated with order in cents from order (in admin panel)
+     *
+     * @param null|mixed|Order $order
+     * @return int
+     */
+    abstract public function getAdditionalCostsCentsFromOrder($order): int;
+}

Services/OrderServices/OrderAdditionalCostsService.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Mond1SWR5\Services\OrderServices;
+
+class OrderAdditionalCostsService extends AbstractOrderAdditionalCostsService {
+    /**
+     * {@inheritDoc}
+     */
+    public function getAdditionalCostsCentsFromOrderVariables($sOrderVariables): int
+    {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getAdditionalCostsCentsFromOrder($order): int
+    {
+        /**
+         * Check if $order instanceof Order and get the additional costs associated with the order
+         */
+        return 0;
+    }
+}

Services/OrderServices/README.md

@@ -0,0 +1,67 @@
+## Services
+
+### How to decorate a service
+
+1. Create a class that extends the abstract class of the service you want to decorate
+
+```php
+<?php
+
+namespace MonduExtendBuyerFees\Services;
+
+use Mond1SWR5\Services\OrderServices\AbstractOrderAdditionalCostsService;
+
+class OrderAdditionalCostsDecorator extends AbstractOrderAdditionalCostsService {
+    /**
+     * @var AbstractOrderAdditionalCostsService
+     */
+    protected $orderAdditionalCostsService;
+
+    public function __construct(AbstractOrderAdditionalCostsService $orderAdditionalCostsService) {
+        $this->orderAdditionalCostsService = $orderAdditionalCostsService;
+    }
+
+    /**
+     * Get the additional costs associated with the order (during the checkout)
+     *
+     * @param $sOrderVariables
+     * @return int
+     */
+    public function getAdditionalCostsCentsFromOrderVariables($sOrderVariables): int
+    {
+        // $original = $this->orderAdditionalCostsService->getAdditionalCostsCentsFromOrderVariables($sOrderVariables);
+        return 0;
+    }
+
+
+    /**
+     * Check if $order instanceof Order and get the additional costs associated with the order (in admin panels)
+     */
+    public function getAdditionalCostsCentsFromOrder($order): int
+    {
+        // $original = $this->orderAdditionalCostsService->getAdditionalCostsCentsFromOrder($order);
+        return 0;
+    }
+}
+```
+
+2. Map the decorator class in services.xml
+
+```xml
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service
+                id="MonduExtendBuyerFees\Services\OrderAdditionalCostsDecorator"
+                decorates="Mond1SWR5\Services\OrderServices\AbstractOrderAdditionalCostsService">
+            <argument type="service" id="MonduExtendBuyerFees\Services\OrderAdditionalCostsDecorator.inner" />
+        </service>
+    </services>
+</container>
+
+```
+
+You can get the boilerplate plugin for the quickstart [here](https://github.com/tikohov20/MonduSWR5Extension).

Services/SessionService.php

@@ -23,12 +23,14 @@ public function createCheckoutSession($returnUrl, $cancelUrl, $declineUrl, $paym
     {
         try {
             $this->reserveOrderNumber();
+            $userData = $this->session->get('sOrderVariables')['sUserData'];
             $monduOrder = $this->monduClient->createOrder(
                 $this->getOrder(),
                 $returnUrl,
                 $cancelUrl,
                 $declineUrl,
-                $paymentMethod
+                $paymentMethod,
+                $userData
             );
 
             $checkoutUrl = $monduOrder['hosted_checkout_url'];

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "mondu/bnpl-checkout-shopware5",
   "description": "Mondu payment method for shopware 5",
-  "version": "1.0.13",
+  "version": "2.1.4",
   "license": "MIT",
   "authors": [
     {
@@ -14,6 +14,6 @@
     "installer-name": "Mond1SWR5"
   },
   "require": {
-    "php": "^7.0 || ^8.0"
+    "php": "^7.1 || ^8.0"
   }
 }

plugin.xml

@@ -5,7 +5,7 @@
     <label lang="en">Mondu Payment</label>
     <label lang="de">Mondu Payment</label>
 
-    <version>2.1.2</version>
+    <version>2.1.4</version>
     <copyright>(c) Mondu GmbH</copyright>
     <author>Mondu GmbH</author>
     <link>https://mondu.ai</link>
@@ -15,6 +15,16 @@
     <description lang="en">This module offers you Mondu as a checkout option</description>
     <description lang="de">This module offers you Mondu as a checkout option</description>
 
+    <changelog version="2.1.4">
+        <changes lang="en">Bugfixes and improvements</changes>
+        <changes lang="de">Bugfixes and improvements</changes>
+    </changelog>
+
+    <changelog version="2.1.3">
+        <changes lang="en">Added OrderAdditionalCostsService that can be overwritten to include additional fees associated with order</changes>
+        <changes lang="de">Added OrderAdditionalCostsService that can be overwritten to include additional fees associated with order</changes>
+    </changelog>
+
     <changelog version="2.1.2">
         <changes lang="en">Bugfixes and improvements</changes>
         <changes lang="de">Bugfixes and improvements</changes>