[HEIDELPAY-130] Several code optimizations

heidelpay · Nov 5, 2019 · 6078478 · 6078478
1 parent ff4f783
commit 6078478
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 14 deletions.
diff --git a/src/Components/Document/InvoiceGenerator.php b/src/Components/Document/InvoiceGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace HeidelPayment\Components\Document;
 
 use HeidelPayment\Components\ClientFactory\ClientFactoryInterface;

diff --git a/src/Components/WebhookHandler/PaymentStatusWebhookHandler.php b/src/Components/WebhookHandler/PaymentStatusWebhookHandler.php
@@ -54,7 +54,7 @@ public function supports(Webhook $webhook, SalesChannelContext $context): bool
      */
     public function execute(Webhook $webhook, SalesChannelContext $context): void
     {
-        $client  = $client  = $this->clientFactory->createClient();
+        $client  = $this->clientFactory->createClient();
         $payment = $client->getResourceService()->fetchResourceByUrl($webhook->getRetrieveUrl());
 
         if (!$payment instanceof Payment) {
@@ -63,7 +63,7 @@ public function execute(Webhook $webhook, SalesChannelContext $context): void
 
         $transaction = $this->getOrderTransaction($payment, $context->getContext());
 
-        if (null === $transaction) {
+        if ($transaction === null) {
             return;
         }
 

diff --git a/src/EventListeners/Checkout/FinishPageEventListener.php b/src/EventListeners/Checkout/FinishPageEventListener.php
@@ -72,7 +72,7 @@ public function onCheckoutFinish(CheckoutFinishPageLoadedEvent $event): void
     private function getInvoiceTransactions(OrderTransactionCollection $transactionCollection)
     {
         return $transactionCollection->filter(
-            function (OrderTransactionEntity $orderTransaction) {
+            static function (OrderTransactionEntity $orderTransaction) {
                 return in_array($orderTransaction->getPaymentMethodId(), InvoiceGenerator::SUPPORTED_PAYMENT_METHODS);
             }
         );

diff --git a/src/HeidelPayment.php b/src/HeidelPayment.php
@@ -108,15 +108,13 @@ public function uninstall(UninstallContext $uninstallContext): void
 
     public function getViewPaths(): array
     {
-        return array_merge(parent::getViewPaths(), [
-            'Resources/views/storefront',
-            'Resources/views/administration',
-            'Resources/views/framework',
-        ]);
-    }
-
-    public function getStorefrontScriptPath(): string
-    {
-        return 'Resources/dist/storefront/js';
+        return array_merge(
+            parent::getViewPaths(),
+            [
+                'Resources/views/storefront',
+                'Resources/views/administration',
+                'Resources/views/framework',
+            ]
+        );
     }
 }
diff --git a/src/Resources/dist/storefront/js/heidel-payment.js b/src/Resources/dist/storefront/js/heidel-payment.js
diff --git a/src/Resources/storefront/script/plugin/heidelpay/heidelpay-invoice-factoring.plugin.js b/src/Resources/storefront/script/plugin/heidelpay/heidelpay-invoice-factoring.plugin.js
@@ -15,13 +15,34 @@ export default class HeidelpayInvoiceFactoringPlugin extends Plugin {
      */
     static heidelpayPlugin = null;
 
+    /**
+     * @type {Object}
+     *
+     * @public
+     */
+    static b2bCustomer = null;
+
     init() {
         this.heidelpayPlugin = window.PluginManager.getPluginInstances('HeidelpayBase')[0];
         this.invoiceFactoring = this.heidelpayPlugin.heidelpayInstance.InvoiceFactoring();
+        this.b2bCustomer = this.heidelpayPlugin.heidelpayInstance.B2BCustomer();
 
+        this._createForm();
         this._registerEvents();
     }
 
+    _createForm() {
+        this.b2bCustomer.initFormFields({
+            'companyInfo': {
+                'commercialSector': 'AIR_TRANSPORT',
+            },
+        });
+
+        this.b2bCustomer.create({
+            containerId: 'heidelpay-invoice-commercial-sector',
+        });
+    }
+
     _registerEvents() {
         this.heidelpayPlugin.$emitter.subscribe('heidelpayBase_createResource', () => this._onCreateResource(), {
             scope: this,

diff --git a/src/Resources/views/storefront/component/heidelpay/frames/invoice-factoring.html.twig b/src/Resources/views/storefront/component/heidelpay/frames/invoice-factoring.html.twig
@@ -15,6 +15,12 @@
                        form="confirmOrderForm"
                        required="required"
                        {% if context.customer.birthday is not empty %}value="{{ context.customer.birthday|date('Y-m-d') }}"{% endif %}/>
+
+                {% if context.customer.activeBillingAddress.company %}
+                    <div id="heidelpay-invoice-commercial-sector">
+
+                    </div>
+                {% endif %}
             </div>
         {% endblock %}
     </div>