Skip to content

Commit

Permalink
https://github.com/thehcginstitute-com/m1/issues/572
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmitrii-fediuk
dmitrii-fediuk committed Apr 21, 2024
1 parent 237116f commit 4fb61d4
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,47 @@ final class Ebizmarts_MailChimp_Model_Api_Batches {
/**
* @var Ebizmarts_MailChimp_Helper_Date
*/
protected $_mailchimpDateHelper;
private $_mailchimpDateHelper;

/**
* @var Ebizmarts_MailChimp_Helper_Curl
*/
protected $_mailchimpCurlHelper;
private $_mailchimpCurlHelper;

/**
* @var Ebizmarts_MailChimp_Model_Api_Customers
*/
protected $_apiCustomers;
private $_apiCustomers;

/**
* @var Ebizmarts_MailChimp_Model_Api_Products
*/
protected $_apiProducts;
private $_apiProducts;

/**
* @var Ebizmarts_MailChimp_Model_Api_Carts
*/
protected $_apiCarts;
private $_apiCarts;

/**
* @var Ebizmarts_MailChimp_Model_Api_Orders
*/
protected $_apiOrders;
private $_apiOrders;

/**
* @var Ebizmarts_MailChimp_Model_Api_PromoRules
*/
protected $_apiPromoRules;
private $_apiPromoRules;

/**
* @var Ebizmarts_MailChimp_Model_Api_PromoCodes
*/
protected $_apiPromoCodes;
private $_apiPromoCodes;

/**
* @var Ebizmarts_MailChimp_Model_Api_Subscribers
*/
protected $_apiSubscribers;
private $_apiSubscribers;

function __construct()
{
Expand All @@ -70,31 +70,31 @@ function __construct()
/**
* @return Ebizmarts_MailChimp_Helper_Curl
*/
protected function getMailchimpCurlHelper()
private function getMailchimpCurlHelper()
{
return $this->_mailchimpCurlHelper;
}

/**
* @return Ebizmarts_MailChimp_Helper_Date
*/
protected function getDateHelper()
private function getDateHelper()
{
return $this->_mailchimpDateHelper;
}

/**
* @return Ebizmarts_MailChimp_Model_Api_Stores
*/
protected function getApiStores()
private function getApiStores()
{
return Mage::getModel('mailchimp/api_stores');
}

/**
* @return Ebizmarts_MailChimp_Model_Api_Customers
*/
protected function getApiCustomers()
private function getApiCustomers()
{
return $this->_apiCustomers;
}
Expand Down Expand Up @@ -142,23 +142,23 @@ function getApiPromoCodes()
/**
* @return Ebizmarts_MailChimp_Model_Api_Subscribers
*/
protected function getApiSubscribers()
private function getApiSubscribers()
{
return $this->_apiSubscribers;
}

/**
* @return Ebizmarts_MailChimp_Model_Synchbatches
*/
protected function getSyncBatchesModel()
private function getSyncBatchesModel()
{
return Mage::getModel('mailchimp/synchbatches');
}

/**
* @return array
*/
protected function getStores()
private function getStores()
{
return Mage::app()->getStores();
}
Expand Down Expand Up @@ -276,7 +276,7 @@ function _getResults($magentoStoreId, $isEcommerceData = true, $status = Ebizmar
* @param $magentoStoreId
* @throws Mage_Core_Exception
*/
protected function _saveItemStatus($item, $files, $batchId, $mailchimpStoreId, $magentoStoreId)
private function _saveItemStatus($item, $files, $batchId, $mailchimpStoreId, $magentoStoreId)
{
$helper = hcg_mc_h();

Expand Down Expand Up @@ -413,7 +413,7 @@ function _sendEcommerceBatch($magentoStoreId)
* @throws MailChimp_HttpError
*/

protected function _processBatchOperations($batchArray, $mailchimpStoreId, $magentoStoreId)
private function _processBatchOperations($batchArray, $mailchimpStoreId, $magentoStoreId)
{
$helper = hcg_mc_h();
$mailchimpApi = $helper->getApi($magentoStoreId);
Expand Down Expand Up @@ -447,7 +447,7 @@ protected function _processBatchOperations($batchArray, $mailchimpStoreId, $mage
* @throws Mage_Core_Exception
* @throws Mage_Core_Model_Store_Exception
*/
protected function _updateSyncingFlag(
private function _updateSyncingFlag(
$mailchimpStoreId,
$magentoStoreId
) {
Expand Down Expand Up @@ -475,7 +475,7 @@ protected function _updateSyncingFlag(
/**
* @param $batchId
*/
protected function deleteBatchItems($batchId)
private function deleteBatchItems($batchId)
{
$helper = hcg_mc_h();
$resource = $helper->getCoreResource();
Expand All @@ -485,7 +485,7 @@ protected function deleteBatchItems($batchId)
$connection->delete($tableName, $where);
}

protected function deleteUnsentItems()
private function deleteUnsentItems()
{
$helper = hcg_mc_h();
$resource = $helper->getCoreResource();
Expand All @@ -502,7 +502,7 @@ function ecommerceDeleteCallback($args)
$ecommerceData->delete();
}

protected function markItemsAsSent($batchResponseId, $mailchimpStoreId)
private function markItemsAsSent($batchResponseId, $mailchimpStoreId)
{
$helper = hcg_mc_h();
$dateHelper = $this->getDateHelper();
Expand Down Expand Up @@ -628,7 +628,7 @@ function getBatchResponse($batchId, $magentoStoreId):array {
* @param $baseDir
* @return array
*/
protected function _unpackBatchFile($files, $batchId, $archive, $fileName, $baseDir)
private function _unpackBatchFile($files, $batchId, $archive, $fileName, $baseDir)
{
$path = hcg_mc_batches_path($batchId);
$archive->unpack($fileName, $path);
Expand All @@ -655,7 +655,7 @@ protected function _unpackBatchFile($files, $batchId, $archive, $fileName, $base
* @param $magentoStoreId
* @throws Mage_Core_Exception
*/
protected function processEachResponseFile($files, $batchId, $mailchimpStoreId, $magentoStoreId) {
private function processEachResponseFile($files, $batchId, $mailchimpStoreId, $magentoStoreId) {
$helper = hcg_mc_h();
$helper->resetCountersDataSentToMailchimp();
$fileHelper = $this->getMailchimpFileHelper();
Expand Down Expand Up @@ -876,7 +876,7 @@ function saveSyncData(
* @param $syncedDateArray
* @return mixed
*/
protected function addSyncValueToArray($storeId, $syncedDateArray)
private function addSyncValueToArray($storeId, $syncedDateArray)
{
$helper = hcg_mc_h();
$ecomEnabled = $helper->isEcomSyncDataEnabled($storeId);
Expand Down Expand Up @@ -1004,7 +1004,7 @@ function setItemAsModified($mailchimpStoreId, $id, $type)
* @param $helper
* @return bool
*/
protected function shouldFlagAsSyncing($syncingFlag, $itemAmount, $helper)
private function shouldFlagAsSyncing($syncingFlag, $itemAmount, $helper)
{
return $syncingFlag === null && $itemAmount !== 0 || $helper->validateDate($syncingFlag);
}
Expand All @@ -1014,7 +1014,7 @@ protected function shouldFlagAsSyncing($syncingFlag, $itemAmount, $helper)
* @param $itemAmount
* @return bool
*/
protected function shouldFlagAsSynced($syncingFlag, $itemAmount)
private function shouldFlagAsSynced($syncingFlag, $itemAmount)
{
return ($syncingFlag === '1' || $syncingFlag === null) && $itemAmount === 0;
}
Expand All @@ -1025,7 +1025,7 @@ protected function shouldFlagAsSynced($syncingFlag, $itemAmount)
* @param $type
* @return Varien_Object
*/
protected function getDataProduct($mailchimpStoreId, $id, $type) {return hcg_mc_syncd_get(
private function getDataProduct($mailchimpStoreId, $id, $type) {return hcg_mc_syncd_get(
(int)$id, $type, $mailchimpStoreId
);}

Expand All @@ -1034,7 +1034,7 @@ protected function getDataProduct($mailchimpStoreId, $id, $type) {return hcg_mc_
* @param $storeId
* @throws Mage_Core_Exception
*/
protected function _showResumeEcommerce($batchId, $storeId)
private function _showResumeEcommerce($batchId, $storeId)
{
$helper = hcg_mc_h();
$countersSentPerBatch = $helper->getCountersSentPerBatch();
Expand All @@ -1052,7 +1052,7 @@ protected function _showResumeEcommerce($batchId, $storeId)
* @param $storeId
* @throws Mage_Core_Exception
*/
protected function _showResumeSubscriber($batchId, $storeId)
private function _showResumeSubscriber($batchId, $storeId)
{
$helper = hcg_mc_h();
$countersSubscribers = $helper->getCountersSubscribers();
Expand All @@ -1069,7 +1069,7 @@ protected function _showResumeSubscriber($batchId, $storeId)
* @param $storeId
* @throws Mage_Core_Exception
*/
protected function _showResumeDataSentToMailchimp($storeId)
private function _showResumeDataSentToMailchimp($storeId)
{
$helper = hcg_mc_h();
$countersDataSentToMailchimp = $helper->getCountersDataSentToMailchimp();
Expand Down Expand Up @@ -1098,7 +1098,7 @@ protected function _showResumeDataSentToMailchimp($storeId)
* @param $counter
* @return bool
*/
protected function isSetAnyCounterSubscriberOrEcommerceNotSent($counter)
private function isSetAnyCounterSubscriberOrEcommerceNotSent($counter)
{
return isset($counter['SUB']['NOT SENT'])
|| isset($counter['CUS']['NOT SENT'])
Expand All @@ -1111,7 +1111,7 @@ protected function isSetAnyCounterSubscriberOrEcommerceNotSent($counter)
* @param Varien_Object $syncDataItem
* @return bool
*/
protected function isFirstArrival(Varien_Object $syncDataItem)
private function isFirstArrival(Varien_Object $syncDataItem)
{
return (int)$syncDataItem->getMailchimpSyncedFlag() !== 1;
}
Expand All @@ -1121,7 +1121,7 @@ protected function isFirstArrival(Varien_Object $syncDataItem)
* @param Varien_Object $syncDataItem
* @return int
*/
protected function enableMergeFieldsSending($type, Varien_Object $syncDataItem)
private function enableMergeFieldsSending($type, Varien_Object $syncDataItem)
{
$syncModified = 0;

Expand All @@ -1135,7 +1135,7 @@ protected function enableMergeFieldsSending($type, Varien_Object $syncDataItem)
/**
* @return Ebizmarts_MailChimp_Helper_File
*/
protected function getMailchimpFileHelper()
private function getMailchimpFileHelper()
{
return Mage::helper('mailchimp/file');
}
Expand Down

0 comments on commit 4fb61d4

Please sign in to comment.