Merge branch 'master' into develop

.travis.yml

@@ -2,7 +2,7 @@ language: php
 
 php:
   - 7.2
-  - 7.3
+  - 7.4
 
 env:
   matrix:

README.md

@@ -28,6 +28,7 @@ php artisan vendor:publish --provider=Stl30\LaravelMobilpay\LaravelMobilpayServi
 ```
 
 1.Complete package configuration file found in config/laravel-mobilpay.php
+
 2.doc for has transaction observer
 
 

composer.json

@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": "~7.2",
+        "netopia/payment": "^1.0",
         "illuminate/support": ">=6.0"
     },
     "require-dev": {

src/CustomActionsAndNotifications.php

@@ -1,8 +1,8 @@
 <?php
 namespace Stl30\LaravelMobilpay;
 
-use Stl30\LaravelMobilpay\Mobilpay\Payment\Request\Mobilpay_Payment_Request_Abstract;
-use Stl30\LaravelMobilpay\Mobilpay\Payment\Request\Mobilpay_Payment_Request_Card;
+use Netopia\Payment\Request\Card;
+use Netopia\Payment\Request\PaymentAbstract;
 
 abstract class CustomActionsAndNotifications
 {
@@ -25,9 +25,9 @@ public function setNotifications(array $notifications): void
         $this->notifications = $notifications;
     }
 
-    abstract public function beforeCreatingTransaction(Mobilpay_Payment_Request_Card $mobilpayRequestObject,$customDataParameter='');
+    abstract public function beforeCreatingTransaction(Card $mobilpayRequestObject,$customDataParameter='');
     abstract public function afterCreatingTransaction(MobilpayTransaction $transaction,$addTransactionIsSuccessful);
-    abstract public function beforeUpdatingTransaction(Mobilpay_Payment_Request_Abstract $mobilpayReturnObject, $orderStatus);
-    abstract public function afterUpdatingTransaction(MobilpayTransaction$transaction, $updatedIsSuccessful);
+    abstract public function beforeUpdatingTransaction(PaymentAbstract $mobilpayReturnObject, $orderStatus);
+    abstract public function afterUpdatingTransaction(MobilpayTransaction $transaction, $updatedIsSuccessful);
     abstract public function onTransactionError($errorCode, $errorType, $errorMessage, $mobilpayReturnObject);
 }

src/Http/Controllers/LaravelMobilpay/LaravelMobilpayController.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers\LaravelMobilpay;
+
+
+use Illuminate\Http\Request;
+use Netopia\Payment\Request\Card;
+use Netopia\Payment\Request\PaymentAbstract;
+use Stl30\LaravelMobilpay\Mobilpay\Payment\Request\Mobilpay_Payment_Request_Abstract;
+use Stl30\LaravelMobilpay\Mobilpay\Payment\Request\Mobilpay_Payment_Request_Card;
+
+class LaravelMobilpayController extends \Stl30\LaravelMobilpay\Http\Controllers\LaravelMobilpayController
+{
+    public function card()
+    {
+        return parent::card();
+    }
+
+    public function addTransaction(Card $mobilpayRequestObject, $customDataParameter = '')
+    {
+        return parent::addTransaction($mobilpayRequestObject, $customDataParameter);
+    }
+
+    public function updateTransaction(PaymentAbstract $mobilpayReturnObject, $orderStatus = 'possible error')
+    {
+        return parent::updateTransaction($mobilpayReturnObject, $orderStatus);
+    }
+
+    function addAutomatedTransactionError($errorCode, $errorType, $errorMessage, $mobilpayReturnObject)
+    {
+        return parent::addAutomatedTransactionError($errorCode, $errorType, $errorMessage, $mobilpayReturnObject);
+    }
+
+    public static function validatePaymentDetails(array $parameters = [])
+    {
+        return parent::validatePaymentDetails($parameters);
+    }
+
+    public function cardRedirect(array $paymentParameters = array())
+    {
+        return parent::cardRedirect($paymentParameters);
+    }
+
+    public function cardConfirm()
+    {
+        return parent::cardConfirm();
+    }
+
+    public function cardReturn(Request $request)
+    {
+        return parent::cardReturn($request);
+    }
+}

src/LaravelMobilpay/LaravelMobilpayCustomActionsAndNotifications.php

@@ -2,23 +2,23 @@
 
 namespace App\LaravelMobilpay;
 
+use Netopia\Payment\Request\Card;
+use Netopia\Payment\Request\PaymentAbstract;
 use Stl30\LaravelMobilpay\CustomActionsAndNotifications;
-use Stl30\LaravelMobilpay\Mobilpay\Payment\Request\Mobilpay_Payment_Request_Abstract;
-use Stl30\LaravelMobilpay\Mobilpay\Payment\Request\Mobilpay_Payment_Request_Card;
 use Stl30\LaravelMobilpay\MobilpayTransaction;
 
 class LaravelMobilpayCustomActionsAndNotifications extends CustomActionsAndNotifications
 {
-    public function beforeCreatingTransaction(Mobilpay_Payment_Request_Card $mobilpayRequestObject, $customDataParameter = '')
+    public function beforeCreatingTransaction(Card $mobilpayRequestObject, $customDataParameter = '')
     {
-        
+
     }
 
     public function afterCreatingTransaction(MobilpayTransaction $transaction, $addTransactionIsSuccessful)
     {
     }
 
-    public function beforeUpdatingTransaction(Mobilpay_Payment_Request_Abstract $mobilpayReturnObject, $orderStatus)
+    public function beforeUpdatingTransaction(PaymentAbstract $mobilpayReturnObject, $orderStatus)
     {
     }
 

src/LaravelMobilpayServiceProvider.php

@@ -42,35 +42,35 @@ public function boot()
             ], 'lang');
 
 
-            // Publishing Observes files.
-            //if you want to use observers uncoment below 
-//            $this->publishes([
-//                __DIR__.'/Observers' => app_path('Observers'),
-//            ]);
-
             // Publishing custom classes files.
             $this->publishes([
                 __DIR__.'/LaravelMobilpay' => app_path('LaravelMobilpay'),
+                __DIR__.'/Http/Controllers/LaravelMobilpay' => app_path('/Http/Controllers/LaravelMobilpay'),
+
             ]);
 
             // Registering package commands.
             // $this->commands([]);
         }
-
-//        if you want to use observers uncoment below
-//        if(config('laravel-mobilpay.transaction_observer_active')){
-//
-//            try {
-//                if(class_exists('App\Observers\TransactionsObserver')){
-//                    MobilpayTransaction::observe(TransactionsObserver::class);
-//                }
-//                else{
-//                    Log::debug(__METHOD__.' Transactions observer does not exist');
-//                }
-//            } catch (Exception $e) {
-//            }
-//
-//        }
+
+
+        if(config('laravel-mobilpay.transaction_observer_active')){
+
+            // Publishing Observes files.
+            $this->publishes([
+                __DIR__.'/Observers' => app_path('Observers'),
+            ]);
+            try {
+                if(class_exists('App\Observers\TransactionsObserver')){
+                    MobilpayTransaction::observe(TransactionsObserver::class);
+                }
+                else{
+                    Log::debug(__METHOD__.' Transactions observer does not exist');
+                }
+            } catch (Exception $e) {
+            }
+
+        }
     }
 
     /**