Skip to content

Commit 47c7254

Browse files
authored
Connection not deleted for store (#181)
1 parent a1ac1e7 commit 47c7254

File tree

3 files changed

+33
-13
lines changed

3 files changed

+33
-13
lines changed

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbdeleteasset.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
class Fbdeleteasset extends AbstractAjax
2525
{
26-
const DELETE_SUCCESS_MESSAGE = "You have successfully deleted Meta Business Extension.
26+
public const DELETE_SUCCESS_MESSAGE = "You have successfully deleted Meta Business Extension.
2727
The pixel installed on your website is now deleted.";
2828

29-
const DELETE_FAILURE_MESSAGE = "There was a problem deleting the connection.
29+
private const DELETE_FAILURE_MESSAGE = "There was a problem deleting the connection.
3030
Please try again.";
3131

3232
/**
@@ -51,12 +51,21 @@ public function __construct(
5151
}
5252

5353
/**
54+
* Execute for json
55+
*
5456
* @return array
5557
*/
5658
public function executeForJson()
5759
{
60+
$storeId = $this->getRequest()->getParam('storeId');
61+
if ($storeId === null) {
62+
return [
63+
'success' => false,
64+
'error_message' => __(self::DELETE_FAILURE_MESSAGE)
65+
];
66+
}
5867
try {
59-
$this->fbeHelper->deleteConfigKeys();
68+
$this->fbeHelper->deleteConfigKeys($storeId);
6069
$response = [
6170
'success' => true,
6271
'message' => __(self::DELETE_SUCCESS_MESSAGE),

app/code/Meta/BusinessExtension/Helper/FBEHelper.php

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -423,18 +423,27 @@ public function logPixelEvent($pixelId, $pixelEvent)
423423
/**
424424
* Delete config keys
425425
*
426+
* @param string $storeId
426427
* @return FBEHelper
427428
*/
428-
public function deleteConfigKeys()
429+
public function deleteConfigKeys($storeId)
429430
{
430-
$this->systemConfig->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_EXTERNAL_BUSINESS_ID)
431-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_ID)
432-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_AAM_SETTINGS)
433-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES)
434-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_CATALOG_ID)
435-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_FEED_ID)
436-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_API_VERSION)
437-
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_API_VERSION_LAST_UPDATE);
431+
$this->systemConfig->deleteConfig(
432+
SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_EXTERNAL_BUSINESS_ID,
433+
$storeId
434+
)
435+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_INSTALLED, $storeId)
436+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ACCESS_TOKEN, $storeId)
437+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ID, $storeId)
438+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ACCESS_TOKEN, $storeId)
439+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_COMMERCE_ACCOUNT_ID, $storeId)
440+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_ID, $storeId)
441+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_AAM_SETTINGS, $storeId)
442+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES, $storeId)
443+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_CATALOG_ID, $storeId)
444+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_FEED_ID, $storeId)
445+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_API_VERSION, $storeId)
446+
->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_API_VERSION_LAST_UPDATE, $storeId);
438447

439448
return $this;
440449
}

app/code/Meta/BusinessExtension/Test/Unit/Controller/Adminhtml/Ajax/FbdeleteassetTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ public function setUp(): void
6969
*/
7070
public function testExecuteForJson()
7171
{
72+
$storeId = 2;
73+
$this->request->method('getParam')->willReturn($storeId);
7274
$this->fbeHelper->expects($this->once())
73-
->method('deleteConfigKeys');
75+
->method('deleteConfigKeys')->with($storeId)->willReturnSelf();
7476

7577
$result = $this->fbdeleteasset->executeForJson();
7678
$this->assertNotNull($result);

0 commit comments

Comments
 (0)