Merge pull request #37 from D3lph1/dev

Integration of the shop with the payment aggregator Interkassa is added.

Author: D3lph1

README.md

@@ -32,7 +32,7 @@
 * The store itself is assynchronous a little less than completely.
 * Sale of in-game blocks, items, grafts.
 * The delivery of goods occurs through the means of the plug-in shopping cart reloaded.
-* Integration with the payment aggregator robokassa.
+* Integration with the payment aggregator **robokassa** and **interkassa**.
 * Multiserver.
 * Multi language (English and russian).
 * Separation of goods on each server by category.
@@ -92,6 +92,13 @@ Success Url: http://example.ru/payment/success/robokassa
 Fail Url: http://example.ru/payment/error/robokassa
 Method of sending data: any.
 
+Information for interkassa:
+Interaction url: http://example.ru/payment/result/interkassa
+Success Url: http://example.ru/payment/success/interkassa
+Fail Url: http://example.ru/payment/error/interkassa
+Wait Url: http://example.ru/payment/wait/interkassa
+Method of sending data: any.
+
 If you plan to use the L-Shop API, be sure to change the secret key. You can do this in the Administration> Management> API section.
 
 After the performed operations, we recommend installing the Directory root of your web server in the public folder.

README_RU.md

@@ -30,7 +30,7 @@
 * Сам магазин ассинхронен чуть менее, чем полностью.
 * Продажа внутриигровых блоков, предметов, привилегей.
 * Выдача товаров происходит по средствам плагина shopping cart reloaded.
-* Интеграция с платежным агрегатором robokassa.
+* Интеграция с платежными агрегаторами **Robokassa** и **Interkassa**.
 * Мультисерверность.
 * Мультиязычность (Английский и русский)
 * Разделение товаров на каждом сервере по категориям.
@@ -84,12 +84,19 @@
 11) Перейти в Администрирование > Управление > Платежи и указать данные от сервиса ROBOKASSA.
 12) Перейти в Администрирование > Управление > Оптимизация и обновить кэш маршрутов и конфигов. Это должно положительно сказаться на производительности приложения.
 
-Информация для robokassa:
+Информация для Robokassa:
 Result URL: http://example.ru/payment/result/robokassa
 Success Url: http://example.ru/payment/success/robokassa
 Fail Url: http://example.ru/payment/error/robokassa
 Метод отсылки данных: любой.​
 
+Информация для Interkassa:
+Url взаимодействия: http://example.ru/payment/result/interkassa
+URL успешной оплаты: http://example.ru/payment/success/interkassa
+URL неуспешной оплаты: http://example.ru/payment/error/interkassa
+URL ожидания проведения платежа: http://example.ru/payment/wait/interkassa
+Метод отсылки данных: любой.​
+
 Если вы планируете использовать API L-Shop обязательно смените секретный ключ. Сделать это можно в разделе Администрирование > Управление > API.
 
 После проделанных операций, рекомендуем установить Directory root вашего веб-сервера в папку public.

app/Exceptions/Payment/Interkassa/EmptyDescriptionException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Exceptions\Payment\Interkassa;
+
+use Throwable;
+
+class EmptyDescriptionException extends \RuntimeException
+{
+    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    {
+        parent::__construct('Invoice description is required and cannot be empty.', $code, $previous);
+    }
+}

app/Exceptions/Payment/Interkassa/UnexpectedStatusException.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Exceptions\Payment\Interkassa;
+
+use Throwable;
+
+/**
+ * Class UnexpectedStatusException
+ *
+ * @author  D3lph1 <d3lph1.contact@gmail.com>
+ *
+ * @package App\Exceptions\Payment\Interkassa
+ */
+class UnexpectedStatusException extends \RuntimeException
+{
+    public function __construct($status, $code = 0, Throwable $previous = null)
+    {
+        $message = "Expected \"success\" invoice status, \"$status\" given";
+
+        parent::__construct($message, $code, $previous);
+    }
+}

app/Exceptions/Payment/Interkassa/UnknownCheckoutException.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Exceptions\Payment\Interkassa;
+
+use Throwable;
+
+/**
+ * Class UnknownCheckoutException
+ *
+ * @author  D3lph1 <d3lph1.contact@gmail.com>
+ *
+ * @package App\Exceptions\Payment\Interkassa
+ */
+class UnknownCheckoutException extends \RuntimeException
+{
+    public function __construct($checkoutId, $code = 0, Throwable $previous = null)
+    {
+        $expected = s_get('payment.method.interkassa.checkout_id');
+        $message = "Checkout $expected expected, $checkoutId given";
+
+        parent::__construct($message, $code, $previous);
+    }
+}

…/Exception/EmptyDescriptionException.php …/Robokassa/EmptyDescriptionException.phpapp/Services/Payments/Robokassa/Exception/EmptyDescriptionException.php renamed to app/Exceptions/Payment/Robokassa/EmptyDescriptionException.php app/Services/Payments/Robokassa/Exception/EmptyDescriptionException.php renamed to app/Exceptions/Payment/Robokassa/EmptyDescriptionException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace App\Services\Payments\Robokassa\Exception;
+namespace App\Exceptions\Payment\Robokassa;
 
 /**
  * Class EmptyDescriptionException

…/Exception/InvalidInvoiceIdException.php …/Robokassa/InvalidInvoiceIdException.phpapp/Services/Payments/Robokassa/Exception/InvalidInvoiceIdException.php renamed to app/Exceptions/Payment/Robokassa/InvalidInvoiceIdException.php app/Services/Payments/Robokassa/Exception/InvalidInvoiceIdException.php renamed to app/Exceptions/Payment/Robokassa/InvalidInvoiceIdException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace App\Services\Payments\Robokassa\Exception;
+namespace App\Exceptions\Payment\Robokassa;
 
 /**
  * Class InvalidInvoiceIdException

…okassa/Exception/InvalidSumException.php …ayment/Robokassa/InvalidSumException.phpapp/Services/Payments/Robokassa/Exception/InvalidSumException.php renamed to app/Exceptions/Payment/Robokassa/InvalidSumException.php app/Services/Payments/Robokassa/Exception/InvalidSumException.php renamed to app/Exceptions/Payment/Robokassa/InvalidSumException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace App\Services\Payments\Robokassa\Exception;
+namespace App\Exceptions\Payment\Robokassa;
 
 /**
  * Class InvalidSumException

…Robokassa/Exception/PaymentException.php …s/Payment/Robokassa/PaymentException.phpapp/Services/Payments/Robokassa/Exception/PaymentException.php renamed to app/Exceptions/Payment/Robokassa/PaymentException.php app/Services/Payments/Robokassa/Exception/PaymentException.php renamed to app/Exceptions/Payment/Robokassa/PaymentException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace App\Services\Payments\Robokassa\Exception;
+namespace App\Exceptions\Payment\Robokassa;
 
 /**
  * Class PaymentException

app/Http/Controllers/Admin/Control/PaymentsController.php

@@ -29,6 +29,11 @@ class PaymentsController extends Controller
         'sha512'
     ];
 
+    private $interkassaAlgos = [
+        'md5',
+        'sha256'
+    ];
+
     /**
      * Render payments settings page.
      *
@@ -43,12 +48,24 @@ public function render(Request $request)
             'minSum' => s_get('payment.fillupbalance.minsum'),
             'currency' => s_get('shop.currency'),
             'currencyHtml' => s_get('shop.currency_html'),
+
+            'robokassaEnable' => s_get('payment.method.robokassa.enabled'),
             'robokassaLogin' => s_get('payment.method.robokassa.login'),
             'robokassaPassword1' => s_get('payment.method.robokassa.password1'),
             'robokassaPassword2' => s_get('payment.method.robokassa.password2'),
             'robokassaAlgo' => s_get('payment.method.robokassa.algo'),
             'robokassaIsTest' => (bool)s_get('payment.method.robokassa.test'),
-            'robokassaAlgos' => $this->robokassaAlgos
+            'robokassaAlgos' => $this->robokassaAlgos,
+
+            'interkassaEnable' => s_get('payment.method.interkassa.enabled'),
+            'interkassaLogin' => s_get('payment.method.interkassa.checkout_id'),
+            'interkassaKey' => s_get('payment.method.interkassa.key'),
+            'interkassaTestKey' => s_get('payment.method.interkassa.test_key'),
+            'interkassaAlgo' => s_get('payment.method.interkassa.algo'),
+            'interkassaIsTest' => (bool)s_get('payment.method.interkassa.test'),
+            'interkassaCurrency' => s_get('payment.method.interkassa.currency'),
+
+            'interkassaAlgos' => $this->interkassaAlgos,
         ];
 
         return view('admin.control.payments', $data);
@@ -72,6 +89,15 @@ public function save(SavePaymentsRequest $request)
 
             return back();
         }
+
+        try {
+            $this->interkassa($request);
+        } catch (\UnexpectedValueException $e) {
+            $this->msg->danger(__('messages.admin.control.payments.interkassa.unknowns_algo'));
+
+            return back();
+        }
+
         $this->msg->success(__('messages.admin.changes_saved'));
 
         return back();
@@ -95,6 +121,7 @@ private function all(Request $request)
      */
     private function robokassa(Request $request)
     {
+        $enabled = $request->get('robokassa_enabled');
         $login = $request->get('robokassa_login');
         $password1 = $request->get('robokassa_password1');
         $password2 = $request->get('robokassa_password2');
@@ -106,6 +133,7 @@ private function robokassa(Request $request)
         }
 
         s_set([
+            'payment.method.robokassa.enabled' => (bool)$enabled,
             'payment.method.robokassa.login' => $login,
             'payment.method.robokassa.password1' => $password1,
             'payment.method.robokassa.password2' => $password2,
@@ -115,6 +143,37 @@ private function robokassa(Request $request)
         s_save();
     }
 
+    /**
+     * Save settings for interkassa.
+     *
+     * @param Request $request
+     */
+    private function interkassa(Request $request)
+    {
+        $enabled = $request->get('interkassa_enabled');
+        $login = $request->get('interkassa_checkout_id');
+        $key = $request->get('interkassa_key');
+        $testKey = $request->get('interkassa_test_key');
+        $currency = $request->get('interkassa_currency');
+        $algo = $request->get('interkassa_algo');
+        $isTest = (bool)$request->get('interkassa_test');
+
+        if (!$this->checkAlgo($algo, 'interkassa')) {
+            throw New \UnexpectedValueException();
+        }
+
+        s_set([
+            'payment.method.interkassa.enabled' => (bool)$enabled,
+            'payment.method.interkassa.checkout_id' => $login,
+            'payment.method.interkassa.key' => $key,
+            'payment.method.interkassa.test_key' => $testKey,
+            'payment.method.interkassa.currency' => (string)$currency,
+            'payment.method.interkassa.algo' => $algo,
+            'payment.method.interkassa.test' => $isTest,
+        ]);
+        s_save();
+    }
+
     /**
      * Check algo on correct name.
      *