Skip to content

Commit

Permalink
Merge pull request #7 from cashier-provider/1.x
Browse files Browse the repository at this point in the history
[1.x] Changed the namespace when transferring to the organization
  • Loading branch information
Andrey Helldar authored Oct 21, 2021
2 parents 413e1ae + e29c737 commit 524a720
Show file tree
Hide file tree
Showing 37 changed files with 176 additions and 176 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
patreon: andrey_helldar
tidelift: "packagist/andrey-helldar/cashier"
open_collective: "laravel-cashier-provider"
custom: [ "https://paypal.me/helldar", "https://yoomoney.ru/to/410012608840929" ]
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
To get the latest version of `Tinkoff QR Cashier Driver`, simply require the project using [Composer](https://getcomposer.org):

```bash
$ composer require andrey-helldar/cashier-tinkoff-qr
$ composer require cashier-provider/tinkoff-qr
```

Or manually update `require` block of `composer.json` and run `composer update`.

```json
{
"require": {
"andrey-helldar/cashier-tinkoff-qr": "^1.0"
"cashier-provider/tinkoff-qr": "^1.0"
}
}
```
Expand All @@ -28,7 +28,7 @@ Or manually update `require` block of `composer.json` and run `composer update`.

> **Note**:
>
> This project is the driver for [Cashier](https://github.com/andrey-helldar/cashier).
> This project is the driver for [Cashier](https://github.com/cashier-provider/core).
>
> Terminal Key and Secret must be provided by the bank manager in response to the agreement concluded with the bank.
Expand All @@ -40,8 +40,8 @@ Add your driver information to the `config/cashier.php` file:
```php
use App\Models\Payment;
use App\Payments\Tinkoff as TinkoffQrDetails;
use Helldar\Cashier\Constants\Driver;
use Helldar\CashierDriver\Tinkoff\QrCode\Driver as TinkoffQrDriver;
use CashierProvider\Core\Constants\Driver;
use CashierProvider\Tinkoff\QrCode\Driver as TinkoffQrDriver;

return [
'payment' => [
Expand All @@ -64,14 +64,14 @@ return [

### Resource

Create a model resource class inheriting from `Helldar\Cashier\Resources\Model` in your application.
Create a model resource class inheriting from `CashierProvider\Core\Resources\Model` in your application.

Use the `$this->model` link to refer to the payment model. When executed, the `$model` parameter will contain the payment instance.

```php
namespace App\Payments;

use Helldar\Cashier\Resources\Model;
use CashierProvider\Core\Resources\Model;

class Tinkoff extends Model
{
Expand Down Expand Up @@ -107,7 +107,7 @@ In order for the payment to be authorized with the required authorization data,
namespace App\Payments;

use App\Models\Payment;
use Helldar\Cashier\Resources\Model;
use CashierProvider\Core\Resources\Model;
use Illuminate\Database\Eloquent\Builder;

class Tinkoff extends Model
Expand Down Expand Up @@ -160,7 +160,7 @@ class Tinkoff extends Model

### Response

All requests to the bank and processing of responses are carried out by the [`Cashier`](https://github.com/andrey-helldar/cashier) project.
All requests to the bank and processing of responses are carried out by the [`Cashier`](https://github.com/cashier-provider/core) project.

To get a link, contact him through the cast:

Expand Down Expand Up @@ -201,19 +201,19 @@ $payment->cashier->details->toArray(): array

Available as part of the Tidelift Subscription.

The maintainers of `andrey-helldar/cashier-tinkoff-qr` and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source
The maintainers of `cashier-provider/tinkoff-qr` and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source
packages you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you
use. [Learn more](https://tidelift.com/subscription/pkg/packagist-andrey-helldar-cashier-tinkoff-qr?utm_source=packagist-andrey-helldar-cashier-tinkoff&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
.

[badge_downloads]: https://img.shields.io/packagist/dt/andrey-helldar/cashier-tinkoff-qr.svg?style=flat-square
[badge_downloads]: https://img.shields.io/packagist/dt/cashier-provider/tinkoff-qr.svg?style=flat-square

[badge_license]: https://img.shields.io/packagist/l/andrey-helldar/cashier-tinkoff-qr.svg?style=flat-square
[badge_license]: https://img.shields.io/packagist/l/cashier-provider/tinkoff-qr.svg?style=flat-square

[badge_stable]: https://img.shields.io/github/v/release/andrey-helldar/cashier-tinkoff-qr?label=stable&style=flat-square
[badge_stable]: https://img.shields.io/github/v/release/cashier-provider/tinkoff-qr?label=stable&style=flat-square

[badge_unstable]: https://img.shields.io/badge/unstable-dev--main-orange?style=flat-square

[link_license]: LICENSE

[link_packagist]: https://packagist.org/packages/andrey-helldar/cashier-tinkoff-qr
[link_packagist]: https://packagist.org/packages/cashier-provider/tinkoff-qr
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "andrey-helldar/cashier-tinkoff-qr",
"description": "Driver for payment with QR codes via Tinkoff (see andrey-helldar/cashier)",
"name": "cashier-provider/tinkoff-qr",
"description": "Driver for payment with QR codes via Tinkoff (see cashier-provider/core)",
"type": "library",
"license": "MIT",
"keywords": [
Expand All @@ -20,17 +20,17 @@
}
],
"support": {
"issues": "https://github.com/andrey-helldar/cashier-tinkoff-qr/issues",
"source": "https://github.com/andrey-helldar/cashier-tinkoff-qr"
"issues": "https://github.com/cashier-provider/tinkoff-qr/issues",
"source": "https://github.com/cashier-provider/tinkoff-qr"
},
"require": {
"php": "^7.3|^8.0",
"andrey-helldar/cashier-tinkoff-auth": "^1.2",
"cashier-provider/core": "^1.26",
"cashier-provider/tinkoff-auth": "^1.2",
"psr/http-message": "^1.0"
},
"require-dev": {
"ext-json": "*",
"andrey-helldar/cashier": "^1.26",
"andrey-helldar/support": "^4.1",
"illuminate/database": "^6.0|^7.0|^8.0",
"orchestra/testbench": "^4.0|^5.0|^6.0",
Expand All @@ -39,7 +39,7 @@
},
"autoload": {
"psr-4": {
"Helldar\\CashierDriver\\Tinkoff\\QrCode\\": "src"
"CashierProvider\\Tinkoff\\QrCode\\": "src"
}
},
"autoload-dev": {
Expand Down
4 changes: 2 additions & 2 deletions phpunit.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,7 +12,7 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

/*
Expand Down
4 changes: 2 additions & 2 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
~ This file is part of the "cashier-provider/tinkoff-qr" project.
~
~ For the full copyright and license information, please view the LICENSE
~ file that was distributed with this source code.
Expand All @@ -12,7 +12,7 @@
~
~ @license MIT
~
~ @see https://github.com/andrey-helldar/cashier-tinkoff-qr
~ @see https://github.com/cashier-provider/tinkoff-qr
-->

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down
32 changes: 16 additions & 16 deletions src/Driver.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,23 +12,23 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

namespace Helldar\CashierDriver\Tinkoff\QrCode;

use Helldar\Cashier\Facades\Helpers\Model;
use Helldar\Cashier\Services\Driver as BaseDriver;
use Helldar\CashierDriver\Tinkoff\QrCode\Exceptions\Manager;
use Helldar\CashierDriver\Tinkoff\QrCode\Helpers\Statuses;
use Helldar\CashierDriver\Tinkoff\QrCode\Requests\Cancel;
use Helldar\CashierDriver\Tinkoff\QrCode\Requests\GetQR;
use Helldar\CashierDriver\Tinkoff\QrCode\Requests\GetState;
use Helldar\CashierDriver\Tinkoff\QrCode\Requests\Init;
use Helldar\CashierDriver\Tinkoff\QrCode\Resources\Details;
use Helldar\CashierDriver\Tinkoff\QrCode\Responses\QrCode;
use Helldar\CashierDriver\Tinkoff\QrCode\Responses\Refund;
use Helldar\CashierDriver\Tinkoff\QrCode\Responses\State;
namespace CashierProvider\Tinkoff\QrCode;

use CashierProvider\Core\Facades\Helpers\Model;
use CashierProvider\Core\Services\Driver as BaseDriver;
use CashierProvider\Tinkoff\QrCode\Exceptions\Manager;
use CashierProvider\Tinkoff\QrCode\Helpers\Statuses;
use CashierProvider\Tinkoff\QrCode\Requests\Cancel;
use CashierProvider\Tinkoff\QrCode\Requests\GetQR;
use CashierProvider\Tinkoff\QrCode\Requests\GetState;
use CashierProvider\Tinkoff\QrCode\Requests\Init;
use CashierProvider\Tinkoff\QrCode\Resources\Details;
use CashierProvider\Tinkoff\QrCode\Responses\QrCode;
use CashierProvider\Tinkoff\QrCode\Responses\Refund;
use CashierProvider\Tinkoff\QrCode\Responses\State;
use Helldar\Contracts\Cashier\Http\Response;

class Driver extends BaseDriver
Expand Down
32 changes: 16 additions & 16 deletions src/Exceptions/Manager.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,24 +12,24 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

namespace Helldar\CashierDriver\Tinkoff\QrCode\Exceptions;
namespace CashierProvider\Tinkoff\QrCode\Exceptions;

use Helldar\Cashier\Exceptions\Http\BankInternalErrorException;
use Helldar\Cashier\Exceptions\Http\BuyerNotFoundClientException;
use Helldar\Cashier\Exceptions\Http\CardHasStolenException;
use Helldar\Cashier\Exceptions\Http\ContactTheSellerClientException;
use Helldar\Cashier\Exceptions\Http\InsufficientFundsCardException;
use Helldar\Cashier\Exceptions\Http\InvalidCardException;
use Helldar\Cashier\Exceptions\Http\PaymentCompletedException;
use Helldar\Cashier\Exceptions\Http\PaymentDeclinedException;
use Helldar\Cashier\Exceptions\Http\PaymentTypeNotAvailableException;
use Helldar\Cashier\Exceptions\Http\SumException;
use Helldar\Cashier\Exceptions\Http\TooManyRequestsException;
use Helldar\Cashier\Exceptions\Http\TryAgainLaterClientException;
use Helldar\Cashier\Exceptions\Manager as ExceptionManager;
use CashierProvider\Core\Exceptions\Http\BankInternalErrorException;
use CashierProvider\Core\Exceptions\Http\BuyerNotFoundClientException;
use CashierProvider\Core\Exceptions\Http\CardHasStolenException;
use CashierProvider\Core\Exceptions\Http\ContactTheSellerClientException;
use CashierProvider\Core\Exceptions\Http\InsufficientFundsCardException;
use CashierProvider\Core\Exceptions\Http\InvalidCardException;
use CashierProvider\Core\Exceptions\Http\PaymentCompletedException;
use CashierProvider\Core\Exceptions\Http\PaymentDeclinedException;
use CashierProvider\Core\Exceptions\Http\PaymentTypeNotAvailableException;
use CashierProvider\Core\Exceptions\Http\SumException;
use CashierProvider\Core\Exceptions\Http\TooManyRequestsException;
use CashierProvider\Core\Exceptions\Http\TryAgainLaterClientException;
use CashierProvider\Core\Exceptions\Manager as ExceptionManager;

class Manager extends ExceptionManager
{
Expand Down
8 changes: 4 additions & 4 deletions src/Helpers/Statuses.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,12 +12,12 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

namespace Helldar\CashierDriver\Tinkoff\QrCode\Helpers;
namespace CashierProvider\Tinkoff\QrCode\Helpers;

use Helldar\Cashier\Services\Statuses as BaseStatus;
use CashierProvider\Core\Services\Statuses as BaseStatus;

class Statuses extends BaseStatus
{
Expand Down
10 changes: 5 additions & 5 deletions src/Requests/BaseRequest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,15 +12,15 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

declare(strict_types=1);

namespace Helldar\CashierDriver\Tinkoff\QrCode\Requests;
namespace CashierProvider\Tinkoff\QrCode\Requests;

use Helldar\Cashier\Http\Request;
use Helldar\CashierDriver\Tinkoff\Auth\Auth;
use CashierProvider\Core\Http\Request;
use CashierProvider\Tinkoff\Auth\Auth;

abstract class BaseRequest extends Request
{
Expand Down
6 changes: 3 additions & 3 deletions src/Requests/Cancel.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,12 +12,12 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

declare(strict_types=1);

namespace Helldar\CashierDriver\Tinkoff\QrCode\Requests;
namespace CashierProvider\Tinkoff\QrCode\Requests;

class Cancel extends BaseRequest
{
Expand Down
6 changes: 3 additions & 3 deletions src/Requests/GetQR.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of the "andrey-helldar/cashier-tinkoff-qr" project.
* This file is part of the "cashier-provider/tinkoff-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,12 +12,12 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-tinkoff-qr
* @see https://github.com/cashier-provider/tinkoff-qr
*/

declare(strict_types=1);

namespace Helldar\CashierDriver\Tinkoff\QrCode\Requests;
namespace CashierProvider\Tinkoff\QrCode\Requests;

class GetQR extends BaseRequest
{
Expand Down
Loading

0 comments on commit 524a720

Please sign in to comment.