merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into default-address

This commit is contained in:
devansh bawari 2021-05-18 14:41:02 +05:30
parent ec9214c2bb 90c52be42f
commit e162e744f1
5 changed files with 306 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -39,7 +39,7 @@ SHOP_MAIL_FROM=
ADMIN_MAIL_TO= ADMIN_MAIL_TO=
MAIL_FROM_NAME= MAIL_FROM_NAME=
fixer_api_key= FIXER_API_KEY=
PUSHER_APP_ID= PUSHER_APP_ID=
PUSHER_APP_KEY= PUSHER_APP_KEY=

4
composer.json
View File

@ -15,7 +15,7 @@
"babenkoivan/elastic-scout-driver": "^1.1", "babenkoivan/elastic-scout-driver": "^1.1",
"bagistobrasil/bagisto-product-social-share": "^0.1.2", "bagistobrasil/bagisto-product-social-share": "^0.1.2",
"barryvdh/laravel-debugbar": "^3.1", "barryvdh/laravel-debugbar": "^3.1",
"barryvdh/laravel-dompdf": "^0.8", "barryvdh/laravel-dompdf": "^0.8.5|^0.9.0",
"doctrine/dbal": "^2.9", "doctrine/dbal": "^2.9",
"enshrined/svg-sanitize": "^0.14.0", "enshrined/svg-sanitize": "^0.14.0",
"facade/ignition": "^2.3.6", "facade/ignition": "^2.3.6",
@ -37,7 +37,7 @@
"maatwebsite/excel": "^3.1.26", "maatwebsite/excel": "^3.1.26",
"paypal/paypal-checkout-sdk": "1.0.1", "paypal/paypal-checkout-sdk": "1.0.1",
"prettus/l5-repository": "^2.6", "prettus/l5-repository": "^2.6",
"tymon/jwt-auth": "^1.0.0" "tymon/jwt-auth": "1.0.x-dev"
}, },
"require-dev": { "require-dev": {
"codeception/codeception": "^4.1", "codeception/codeception": "^4.1",

603
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/services.php
View File

@ -33,7 +33,7 @@ return [
'default' => 'exchange_rates', 'default' => 'exchange_rates',
'fixer' => [ 'fixer' => [
'key' => env('fixer_api_key'), 'key' => env('FIXER_API_KEY'),
'class' => 'Webkul\Core\Helpers\Exchange\FixerExchange' 'class' => 'Webkul\Core\Helpers\Exchange\FixerExchange'
], ],

19
tests/functional/Admin/Settings/ExchangeRatesCest.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace Tests\Functional\Admin\Settings;
use FunctionalTester;
class ExchangeRatesCest
{
public function testIndex(FunctionalTester $I): void
{
$I->loginAsAdmin();
$I->amOnAdminRoute('admin.dashboard.index');
$I->click(__('admin::app.layouts.settings'), '//*[contains(@class, "navbar-left")]');
$I->click(__('admin::app.layouts.exchange-rates'), '//*[contains(@class, "aside-nav")]');
$I->seeCurrentRouteIs('admin.exchange_rates.index');
}
}