Skip to content

Commit

Permalink
Merge pull request #11 from cashier-provider/1.x
Browse files Browse the repository at this point in the history
[1.x] Changed namespace for transfer to organization
  • Loading branch information
Andrey Helldar authored Oct 21, 2021
2 parents c931c6d + 9347de3 commit 22347e8
Show file tree
Hide file tree
Showing 38 changed files with 178 additions and 188 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +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" ]
35 changes: 13 additions & 22 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 `Sber QR Cashier Driver`, simply require the project using [Composer](https://getcomposer.org):

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

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

```json
{
"require": {
"andrey-helldar/cashier-sber-qr": "^1.0"
"cashier-provider/sber-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 Provider`](https://github.com/cashier-provider/core).
>
> Member ID and Terminal ID must be provided by the bank manager in response to the agreement concluded with the bank.
>
Expand All @@ -42,8 +42,8 @@ Add your driver information to the `config/cashier.php` file:
```php
use App\Models\Payment;
use App\Payments\Sber as SberQrDetails;
use Helldar\Cashier\Constants\Driver;
use Helldar\CashierDriver\Sber\QrCode\Driver as SberQrDriver;
use CashierProvider\Core\Constants\Driver;
use CashierProvider\Sber\QrCode\Driver as SberQrDriver;

return [
'payment' => [
Expand Down Expand Up @@ -73,14 +73,14 @@ return [

### Resource

Create a model resource class inheriting from `Helldar\CashierDriver\Sber\QrCode\Resources\Model` in your application.
Create a model resource class inheriting from `CashierProvider\Sber\QrCode\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\CashierDriver\Sber\QrCode\Resources\Model;
use CashierProvider\Sber\QrCode\Resources\Model;

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

use Helldar\CashierDriver\Sber\QrCode\Resources\Model;
use CashierProvider\Sber\QrCode\Resources\Model;
use Illuminate\Support\Facades\Storage;

class Sber extends Model
Expand Down Expand Up @@ -210,7 +210,7 @@ class Sber 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 Provider`](https://github.com/cashier-provider/core) project.

To get a link, contact him through the cast:

Expand Down Expand Up @@ -247,23 +247,14 @@ $payment->cashier->details->toArray(): array
// ]
```

## For Enterprise
[badge_downloads]: https://img.shields.io/packagist/dt/cashier-provider/sber-qr.svg?style=flat-square

Available as part of the Tidelift Subscription.
[badge_license]: https://img.shields.io/packagist/l/cashier-provider/sber-qr.svg?style=flat-square

The maintainers of `andrey-helldar/cashier-sber-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-sber-qr?utm_source=packagist-andrey-helldar-cashier-sber&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
.

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

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

[badge_stable]: https://img.shields.io/github/v/release/andrey-helldar/cashier-sber-qr?label=stable&style=flat-square
[badge_stable]: https://img.shields.io/github/v/release/cashier-provider/sber-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-sber-qr
[link_packagist]: https://packagist.org/packages/cashier-provider/sber-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-sber-qr",
"description": "Driver for payment with QR codes via Sber (see andrey-helldar/cashier)",
"name": "cashier-provider/sber-qr",
"description": "Driver for payment with QR codes via Sber (see cashier-provider/core)",
"type": "library",
"license": "MIT",
"keywords": [
Expand All @@ -19,17 +19,17 @@
}
],
"support": {
"issues": "https://github.com/andrey-helldar/cashier-sber-qr/issues",
"source": "https://github.com/andrey-helldar/cashier-sber-qr"
"issues": "https://github.com/cashier-provider/sber-qr/issues",
"source": "https://github.com/cashier-provider/sber-qr"
},
"require": {
"php": "^7.3|^8.0",
"andrey-helldar/cashier-sber-auth": "^1.1",
"cashier-provider/core": "^1.29",
"cashier-provider/sber-auth": "^1.1",
"psr/http-message": "^1.0"
},
"require-dev": {
"ext-json": "*",
"andrey-helldar/cashier": "^1.28",
"andrey-helldar/support": "^4.1",
"illuminate/database": "^6.0|^7.0|^8.0",
"orchestra/testbench": "^4.0|^5.0|^6.0",
Expand All @@ -38,7 +38,7 @@
},
"autoload": {
"psr-4": {
"Helldar\\CashierDriver\\Sber\\QrCode\\": "src"
"CashierProvider\\Sber\\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-sber-qr" project.
* This file is part of the "cashier-provider/sber-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-sber-qr
* @see https://github.com/cashier-provider/sber-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-sber-qr" project.
~ This file is part of the "cashier-provider/sber-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-sber-qr
~ @see https://github.com/cashier-provider/sber-qr
-->

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down
6 changes: 3 additions & 3 deletions src/Constants/Body.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-sber-qr" project.
* This file is part of the "cashier-provider/sber-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,10 +12,10 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

namespace Helldar\CashierDriver\Sber\QrCode\Constants;
namespace CashierProvider\Sber\QrCode\Constants;

class Body
{
Expand Down
6 changes: 3 additions & 3 deletions src/Constants/Scopes.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-sber-qr" project.
* This file is part of the "cashier-provider/sber-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,10 +12,10 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

namespace Helldar\CashierDriver\Sber\QrCode\Constants;
namespace CashierProvider\Sber\QrCode\Constants;

class Scopes
{
Expand Down
28 changes: 14 additions & 14 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-sber-qr" project.
* This file is part of the "cashier-provider/sber-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,21 +12,21 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

namespace Helldar\CashierDriver\Sber\QrCode;

use Helldar\Cashier\Services\Driver as BaseDriver;
use Helldar\CashierDriver\Sber\QrCode\Exceptions\Manager;
use Helldar\CashierDriver\Sber\QrCode\Helpers\Statuses;
use Helldar\CashierDriver\Sber\QrCode\Requests\Cancel;
use Helldar\CashierDriver\Sber\QrCode\Requests\Create;
use Helldar\CashierDriver\Sber\QrCode\Requests\Status;
use Helldar\CashierDriver\Sber\QrCode\Resources\Details;
use Helldar\CashierDriver\Sber\QrCode\Responses\Cancel as CancelResponse;
use Helldar\CashierDriver\Sber\QrCode\Responses\QrCode;
use Helldar\CashierDriver\Sber\QrCode\Responses\Status as StatusResponse;
namespace CashierProvider\Sber\QrCode;

use CashierProvider\Core\Services\Driver as BaseDriver;
use CashierProvider\Sber\QrCode\Exceptions\Manager;
use CashierProvider\Sber\QrCode\Helpers\Statuses;
use CashierProvider\Sber\QrCode\Requests\Cancel;
use CashierProvider\Sber\QrCode\Requests\Create;
use CashierProvider\Sber\QrCode\Requests\Status;
use CashierProvider\Sber\QrCode\Resources\Details;
use CashierProvider\Sber\QrCode\Responses\Cancel as CancelResponse;
use CashierProvider\Sber\QrCode\Responses\QrCode;
use CashierProvider\Sber\QrCode\Responses\Status as StatusResponse;
use Helldar\Contracts\Cashier\Http\Response;

class Driver extends BaseDriver
Expand Down
18 changes: 9 additions & 9 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-sber-qr" project.
* This file is part of the "cashier-provider/sber-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,17 +12,17 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

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

use Helldar\Cashier\Exceptions\Http\BadRequestClientException;
use Helldar\Cashier\Exceptions\Http\BankInternalErrorException;
use Helldar\Cashier\Exceptions\Http\MethodNotFoundException;
use Helldar\Cashier\Exceptions\Http\TooManyRequestsException;
use Helldar\Cashier\Exceptions\Http\UnauthorizedException;
use Helldar\Cashier\Exceptions\Manager as ExceptionManager;
use CashierProvider\Core\Exceptions\Http\BadRequestClientException;
use CashierProvider\Core\Exceptions\Http\BankInternalErrorException;
use CashierProvider\Core\Exceptions\Http\MethodNotFoundException;
use CashierProvider\Core\Exceptions\Http\TooManyRequestsException;
use CashierProvider\Core\Exceptions\Http\UnauthorizedException;
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-sber-qr" project.
* This file is part of the "cashier-provider/sber-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-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

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

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

class Statuses extends BaseStatus
{
Expand Down
14 changes: 7 additions & 7 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-sber-qr" project.
* This file is part of the "cashier-provider/sber-qr" project.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,17 +12,17 @@
*
* @license MIT
*
* @see https://github.com/andrey-helldar/cashier-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

declare(strict_types=1);

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

use Helldar\Cashier\Facades\Config\Main;
use Helldar\Cashier\Facades\Helpers\Date;
use Helldar\Cashier\Http\Request;
use Helldar\CashierDriver\Sber\Auth\Auth;
use CashierProvider\Core\Facades\Config\Main;
use CashierProvider\Core\Facades\Helpers\Date;
use CashierProvider\Core\Http\Request;
use CashierProvider\Sber\Auth\Auth;
use Illuminate\Support\Carbon;

abstract class BaseRequest extends Request
Expand Down
10 changes: 5 additions & 5 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-sber-qr" project.
* This file is part of the "cashier-provider/sber-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-sber-qr
* @see https://github.com/cashier-provider/sber-qr
*/

declare(strict_types=1);

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

use Helldar\CashierDriver\Sber\QrCode\Constants\Body;
use Helldar\CashierDriver\Sber\QrCode\Constants\Scopes;
use CashierProvider\Sber\QrCode\Constants\Body;
use CashierProvider\Sber\QrCode\Constants\Scopes;

class Cancel extends BaseRequest
{
Expand Down
Loading

0 comments on commit 22347e8

Please sign in to comment.