From 0c44ec3aede96b0017d241d046e8155ac6808d86 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 17:33:20 +0500 Subject: [PATCH 01/18] Update README.md --- README.md | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 38f4438..02eb95d 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,17 @@ **Featured** ------ -- [Payme](http://payme.uz) - Merchant Payme -- [Click](http://click.uz) - Merchant Click +- [Payme](http://payme.uz) - Merchant +- [Click](http://click.uz) - Merchant +- [Oson](http://click.uz) - Merchant +- [Uzcard](http://uzcard.uz) - Merchant +- Paynet **Planned** ------ -- Paynet - Upay -- Oson - Visa -- [Uzcard](http://uzcard.uz) - Merchant UZCARD + ## Installation @@ -43,9 +44,22 @@ php artisan db:seed --class="Goodoneuz\PayUz\database\seeds\PayUzSeeder" ## Usage ------ -- Request handle: `PayUz::driver('payme')->redirect($model, $amount, $currency)` -- Redirect user: `PayUz::driver('payme')->handle()` +Placing routes for service in web.php +```php + +//here comes requests from payment system +Route::any('/handle/{paysys}',function($paysys){ + PayUz::driver($paysys)->handle(); +}); + +//here user redirects to payment system +Route::any('/redirect/{paysys}/{user_id}/{amount}',function($paysys, $user_id, $amount){ + $user = App\User::find($user); + $url = 'https://payment.uz'; + PayUz::driver($paysys)->redirect($user, $amount, 860, $url); +}); +``` **Exception:** ------ From d02ea2be37b4801afe5867902176b5240baa0653 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 17:34:26 +0500 Subject: [PATCH 02/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02eb95d..86a6b4e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ - [Click](http://click.uz) - Merchant - [Oson](http://click.uz) - Merchant - [Uzcard](http://uzcard.uz) - Merchant -- Paynet +- [Paynet](http://paynet.uz) - Merchant **Planned** ------ From d5c52c1d147147ec7164c905824cacef303aac54 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:07:33 +0500 Subject: [PATCH 03/18] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 929cf95..61cc125 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1", - "goodoneuz/pay-uz": "^1.5", + "goodoneuz/pay-uz": "1.6.6", "illuminate/support": "5.7.*|5.8.*" }, "require-dev": { From 3d35cef65c8edb2a0698d651328fad1939c75b44 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:21:38 +0500 Subject: [PATCH 04/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24c2d6c..d4f9358 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: before_script: - travis_retry composer self-update - - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source + - travis_retry composer install ${COMPOSER_FLAGS} --no-interaction script: - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover From e2995381dded40e6098916d0bc32866ea26e8801 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:24:45 +0500 Subject: [PATCH 05/18] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d4f9358..34bca6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ php: env: matrix: - - COMPOSER_FLAGS="--prefer-lowest" - COMPOSER_FLAGS="" before_script: From 8b6c1dc98ab2aaa216105e4bd547de2b79ce58cc Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:31:45 +0500 Subject: [PATCH 06/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34bca6c..2f23edf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_script: - travis_retry composer self-update - - travis_retry composer install ${COMPOSER_FLAGS} --no-interaction + - travis_retry composer install ${COMPOSER_FLAGS} --no-interaction --no-update script: - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover From 70e6914bed0b209bb7d15cfd09f30fdfbb147f3a Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:39:44 +0500 Subject: [PATCH 07/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f23edf..f98eaae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_script: - travis_retry composer self-update - - travis_retry composer install ${COMPOSER_FLAGS} --no-interaction --no-update + - travis_retry composer install script: - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover From 81628d1eb59c3939ea3e28719ce26e83f2101076 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 19:49:34 +0500 Subject: [PATCH 08/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f98eaae..84d6269 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_script: - travis_retry composer self-update - - travis_retry composer install + - travis_retry composer update --prefer-dist --no-interaction --prefer-lowest script: - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover From c0445d94254bae1942a1a7285fc6f48ae77f586d Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 20:19:11 +0500 Subject: [PATCH 09/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84d6269..c1df562 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_script: - travis_retry composer self-update - - travis_retry composer update --prefer-dist --no-interaction --prefer-lowest + - travis_retry composer install --prefer-dist --no-interaction --prefer-lowest script: - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover From 3d681b0720ba5b1067f38952678377c77bf13912 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 20:20:41 +0500 Subject: [PATCH 10/18] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1df562..dcf73fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_script: - travis_retry composer self-update - - travis_retry composer install --prefer-dist --no-interaction --prefer-lowest + - travis_retry composer install --prefer-dist --no-interaction script: - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover From 0d43cdaeb347eb4e3608e5d74e9a742481c94ac9 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 20:30:24 +0500 Subject: [PATCH 11/18] Update .travis.yml --- .travis.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcf73fa..431c1a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: php +sudo: false + php: - 7.1 - 7.2 @@ -7,14 +9,22 @@ php: env: matrix: - - COMPOSER_FLAGS="" + - LARAVEL=5.7.* + - LARAVEL=5.8.* + - LARAVEL=dev-master + +matrix: + fast_finish: true + exclude: + - php: 7.1 + env: LARAVEL=dev-master + allow_failures: + - env: LARAVEL=dev-master -before_script: - - travis_retry composer self-update - - travis_retry composer install --prefer-dist --no-interaction +before_install: + - phpenv config-rm xdebug.ini || true -script: - - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover +install: + - travis_retry composer install --dev --prefer-dist --no-interaction --no-suggest -after_script: - - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover +script: vendor/bin/phpunit --verbose From 3c18ecc0c4315913e6d1168f68a883ccb869b687 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 20:48:01 +0500 Subject: [PATCH 12/18] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 61cc125..c978f7d 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1", - "goodoneuz/pay-uz": "1.6.6", + "goodoneuz/pay-uz": "dev-master", "illuminate/support": "5.7.*|5.8.*" }, "require-dev": { From 0170815a864d8cc7bbe866659abb06c8b00a09ff Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 21:08:19 +0500 Subject: [PATCH 13/18] Update .travis.yml --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 431c1a0..dc60255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,7 @@ matrix: - env: LARAVEL=dev-master before_install: - - phpenv config-rm xdebug.ini || true - -install: - - travis_retry composer install --dev --prefer-dist --no-interaction --no-suggest + - composer self-update || true + - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader script: vendor/bin/phpunit --verbose From 31db451e40a18c526af160c2bdb96fdb97058551 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 21:10:09 +0500 Subject: [PATCH 14/18] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c978f7d..61cc125 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1", - "goodoneuz/pay-uz": "dev-master", + "goodoneuz/pay-uz": "1.6.6", "illuminate/support": "5.7.*|5.8.*" }, "require-dev": { From f1c2433895e8661066a0965c94e1b4ff8ac3eaf6 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 21:14:41 +0500 Subject: [PATCH 15/18] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 61cc125..bf0564a 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1", - "goodoneuz/pay-uz": "1.6.6", + "goodoneuz/pay-uz": "1.6.5", "illuminate/support": "5.7.*|5.8.*" }, "require-dev": { From c414e892c21570545324844220ee49f6d6c800a2 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 21:25:42 +0500 Subject: [PATCH 16/18] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bf0564a..e0e3ee6 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1", - "goodoneuz/pay-uz": "1.6.5", + "goodoneuz/pay-uz": "~1.6.6", "illuminate/support": "5.7.*|5.8.*" }, "require-dev": { From 02bd57803f89168baa36c53be19f8dfeecb5b8df Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 21:27:52 +0500 Subject: [PATCH 17/18] Update composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index e0e3ee6..4e5a730 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ ], "require": { "php": "^7.1", - "goodoneuz/pay-uz": "~1.6.6", "illuminate/support": "5.7.*|5.8.*" }, "require-dev": { From a80693f34977d902f4309ddd1d2d860f88677601 Mon Sep 17 00:00:00 2001 From: goodoneuz <47610909+goodoneuz@users.noreply.github.com> Date: Wed, 10 Apr 2019 21:37:18 +0500 Subject: [PATCH 18/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 86a6b4e..53e261f 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Route::any('/handle/{paysys}',function($paysys){ //here user redirects to payment system Route::any('/redirect/{paysys}/{user_id}/{amount}',function($paysys, $user_id, $amount){ - $user = App\User::find($user); + $user = App\User::find($user_id); $url = 'https://payment.uz'; PayUz::driver($paysys)->redirect($user, $amount, 860, $url); });