Skip to content

Commit

Permalink
Merge pull request #42 from vrajroham/5.3.x
Browse files Browse the repository at this point in the history
Fixed issues, updated deps & corrected typos
  • Loading branch information
alexstewartja authored Jun 20, 2022
2 parents 4cd83a3 + d6f2c60 commit 84232c7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
LaravelBitPay enables you and your business to transact in Bitcoin, Bitcoin Cash and 10+ other BitPay-supported
cryptocurrencies within your Laravel application.

> Requires PHP ^7.3
> Requires PHP 7.3+
## :warning: Migration From v4 :warning:

Expand Down Expand Up @@ -122,7 +122,7 @@ Add the following keys to your `.env` file and update the values to match your
preferences ([read more about configuration](https://support.bitpay.com/hc/en-us/articles/115003001063-How-do-I-configure-the-PHP-BitPay-Client-Library-)):

```dotenv
BITPAY_PRIVATE_KEY_PATH=/tmp/laravel-bitpay.pk
BITPAY_PRIVATE_KEY_PATH=
BITPAY_NETWORK=testnet
BITPAY_KEY_STORAGE_PASSWORD=RandomPasswordForEncryption
BITPAY_ENABLE_MERCHANT=true
Expand Down Expand Up @@ -506,7 +506,7 @@ AM, respectively:
```php
// Initialize Subscription
$subscriptionData = LaravelBitpay::Subscription();
$subscriptionData->setSchedule(LaravelBitpay::SUBSCRIPTION_SCHEDULE_MONTHLY);
$subscriptionData->setSchedule(BitPayConstants::SUBSCRIPTION_SCHEDULE_MONTHLY);

// Optional recurring bill data
$billData = [
Expand Down Expand Up @@ -921,7 +921,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.

## Security

If you discover any security related issues, please email [email protected] instead of using the issue tracker.
If you discover any security related issues, please email [email protected] or [email protected] instead of using the issue tracker.

## Credits

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
],
"require": {
"php": ">=7.3 || ^8.0",
"php": "^7.3 || ^8.0",
"ext-json": "*",
"bitpay/sdk": "~6.0.2"
},
Expand Down
10 changes: 6 additions & 4 deletions config/laravel-bitpay.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?php

$pkPath = 'app' . DIRECTORY_SEPARATOR . 'private' . DIRECTORY_SEPARATOR . 'bitpay' . DIRECTORY_SEPARATOR . 'laravel-bitpay.pk';

return [
/*
* This is the full path and name for the private key.
* The default value is /tmp/laravel-bitpay.pk
* The default value is `storage/app/private/bitpay/laravel-bitpay.pk`
*/
'private_key' => env('BITPAY_PRIVATE_KEY_PATH', '/tmp/laravel-bitpay.pk'),
'private_key' => env('BITPAY_PRIVATE_KEY_PATH') ?: storage_path($pkPath),

/*
* Specifies using the Live Bitcoin network or
Expand Down Expand Up @@ -46,7 +48,7 @@
*
* Default: null
*/
'merchant_token' => env('BITPAY_MERCHANT_TOKEN'),
'merchant_token' => env('BITPAY_MERCHANT_TOKEN'),

/*
* BitPay Payout Token
Expand All @@ -66,7 +68,7 @@
*
* Uncomment an entry to enable its auto-population.
*/
'auto_populate_webhook' => [
'auto_populate_webhook' => [
// \Vrajroham\LaravelBitpay\Constants\WebhookAutoPopulate::For_Invoices,
// \Vrajroham\LaravelBitpay\Constants\WebhookAutoPopulate::For_Recipients,
// \Vrajroham\LaravelBitpay\Constants\WebhookAutoPopulate::For_Payouts,
Expand Down
2 changes: 1 addition & 1 deletion src/LaravelBitpayFacade.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ class LaravelBitpayFacade extends Facade
*/
protected static function getFacadeAccessor()
{
return 'laravel-bitpay';
return LaravelBitpay::class;
}
}

0 comments on commit 84232c7

Please sign in to comment.