Skip to content

Commit f0b2e74

Browse files
committed
Merged in develop (pull request #13)
APITOCART-13774 fix with SMTP
2 parents 46f4f09 + 2b86f64 commit f0b2e74

File tree

7 files changed

+105
-99
lines changed

7 files changed

+105
-99
lines changed

src/.env.example

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ REDIS_PASSWORD=null
3030
REDIS_PORT=6379
3131

3232
MAIL_DRIVER=smtp
33-
MAIL_HOST=in-v3.mailjet.com
34-
MAIL_PORT=587
35-
MAIL_USERNAME=106ef44005d13abe92aae4b1bcb0feea
36-
MAIL_PASSWORD=898829b2473341502566058dd44b7017
37-
MAIL_FROM_ADDRESS=pm.api2cart@magneticone.com
33+
MAIL_HOST=mail.api2cart.com
34+
MAIL_PORT=465
35+
MAIL_USERNAME="[email protected]"
36+
MAIL_PASSWORD="fuowaip)oy8leiDo"
37+
MAIL_FROM_ADDRESS=demo@api2cart.com
3838
MAIL_FROM_NAME=Example
39-
MAIL_ENCRYPTION=
39+
MAIL_ENCRYPTION=ssl
4040

4141
AWS_ACCESS_KEY_ID=
4242
AWS_SECRET_ACCESS_KEY=

src/.env.travis

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ REDIS_PASSWORD=null
3030
REDIS_PORT=6379
3131

3232
MAIL_DRIVER=smtp
33-
MAIL_HOST=in-v3.mailjet.com
34-
MAIL_PORT=587
35-
MAIL_USERNAME=106ef44005d13abe92aae4b1bcb0feea
36-
MAIL_PASSWORD=898829b2473341502566058dd44b7017
37-
MAIL_FROM_ADDRESS=pm.api2cart@magneticone.com
33+
MAIL_HOST=mail.api2cart.com
34+
MAIL_PORT=465
35+
MAIL_USERNAME="[email protected]"
36+
MAIL_PASSWORD="fuowaip)oy8leiDo"
37+
MAIL_FROM_ADDRESS=demo@api2cart.com
3838
MAIL_FROM_NAME=Example
39-
MAIL_ENCRYPTION=
39+
MAIL_ENCRYPTION=ssl
4040

4141
AWS_ACCESS_KEY_ID=
4242
AWS_SECRET_ACCESS_KEY=

src/.phpstorm.meta.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/**
77
* PhpStorm Meta file, to provide autocomplete information for PhpStorm
8-
* Generated on 2020-06-12 11:01:40.
8+
* Generated on 2020-06-19 07:28:47.
99
*
1010
* @author Barry vd. Heuvel <[email protected]>
1111
* @see https://github.com/barryvdh/laravel-ide-helper

src/_ide_helper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/**
55
* A helper file for Laravel, to provide autocomplete information to your IDE
6-
* Generated for Laravel 7.15.0 on 2020-06-12 11:01:40.
6+
* Generated for Laravel 7.16.1 on 2020-06-19 07:28:46.
77
*
88
* This file should not be included in your code, only analyzed by your IDE!
99
*
@@ -18194,7 +18194,7 @@ public static function chunkById($count, $callback, $column = null, $alias = nul
1819418194
}
1819518195

1819618196
/**
18197-
* Execute a callback over each item while chunking by id.
18197+
* Execute a callback over each item while chunking by ID.
1819818198
*
1819918199
* @param callable $callback
1820018200
* @param int $count

src/app/Http/Controllers/StoresController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ public function fields(Request $request, $id=null)
6666
{
6767
$store = collect($this->api2cart->getCartsList())->where('cart_id',$id)->first();
6868

69-
return view('stores.store_fields', compact('store'));
69+
Log::debug( print_r($store,1) );
70+
71+
return '';
72+
73+
// return view('stores.store_fields', compact('store'));
7074

7175
}
7276

src/app/Services/Api2Cart.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function getCartsList()
189189
// $result = $this->cart->cartList();
190190
$result = $this->account->accountSupportedPlatforms();
191191

192-
$this->logApiCall( 'cart.list.json', $result->getReturnCode(), $this->cart->getConfig(), null, null, null, $result->getReturnMessage() );
192+
$this->logApiCall( 'account.supported_platforms.json', $result->getReturnCode(), $this->cart->getConfig(), null, null, null, $result->getReturnMessage() );
193193

194194
if ( $result->getReturnCode() == 0 ){
195195
return $this->mapToArray( $result->getResult()->getSupportedPlatforms() );
@@ -202,7 +202,7 @@ public function getCartsList()
202202
} catch (\Exception $e){
203203

204204
// Log::debug( $e->getMessage() );
205-
$this->logApiCall( 'cart.list.json', $e->getCode(), $this->account->getConfig(), null, null, null, $e->getMessage() );
205+
$this->logApiCall( 'account.supported_platforms.json', $e->getCode(), $this->account->getConfig(), null, null, null, $e->getMessage() );
206206
return false;
207207
}
208208
}

0 commit comments

Comments
 (0)