GX-Bug #58731 » GoogleShoppingExportFix.patch
| src/system/classes/csv/CSVControl.inc.php (date 1535734438000) | ||
|---|---|---|
| 17 | 17 |
static protected $coo_instance = null; |
| 18 | 18 |
static protected $get_instance_called = false; |
| 19 | 19 |
protected $v_coo_csv_source = null; |
| 20 |
protected $v_coo_google_configuration_storage = null; |
|
| 20 | 21 |
protected $v_export_file_handle = false; |
| 21 | 22 |
protected $coo_properties_data_agent = null; |
| 22 | 23 |
protected $v_timeout = 1; |
| ... | ... | |
| 49 | 50 |
protected function init() |
| 50 | 51 |
{
|
| 51 | 52 |
$this->v_coo_csv_source = MainFactory::create_object('CSVSource', array(), true);
|
| 53 |
|
|
| 54 |
$db = StaticGXCoreLoader::getDatabaseQueryBuilder(); |
|
| 55 |
$this->v_coo_google_configuration_storage = new GoogleConfigurationStorage($db,'general'); |
|
| 56 |
|
|
| 52 | 57 |
$this->coo_properties_data_agent = MainFactory::create_object('PropertiesDataAgent', array());
|
| 53 | 58 |
} |
| 54 | 59 |
|
| ... | ... | |
| 375 | 380 |
} |
| 376 | 381 |
|
| 377 | 382 |
$scheme = $this->v_coo_csv_source->get_scheme($t_scheme_id); |
| 378 |
if((int)$scheme->v_data_array['type_id'] === self::GOOGLE_SHOPPING_TYPE_ID && gm_get_conf('GOOGLE_ADWORDS_CONNECTION_STATUS') !== 'true')
|
|
| 383 |
if((int)$scheme->v_data_array['type_id'] === self::GOOGLE_SHOPPING_TYPE_ID && $this->v_coo_google_configuration_storage->get('connection-status') !== 'true')
|
|
| 379 | 384 |
{
|
| 380 | 385 |
$t_run_export = false; |
| 381 | 386 |
$t_export_unfinished = false; |