RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-29 00:26:06 +03:00
Code Issues Projects Releases Wiki Activity

update: admin/controller/extension/module/retailcrm.php

Browse Source 
update:      admin/view/template/extension/module/retailcrm.tpl
	update:      catalog/controller/api/retailcrm.php
	update:      system/cron/export.php
This commit is contained in:
Dmitry Akolzin 2017-04-12 15:04:24 +03:00
parent d308996fed
commit 6a9b2a7e59
4 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/controller/extension/module/retailcrm.php
View File

@ -369,6 +369,7 @@ class ControllerExtensionModuleRetailcrm extends Controller
$this->load->model('extension/retailcrm/order'); $this->load->model('extension/retailcrm/order');
$this->model_extension_retailcrm_order->uploadToCrm($fullOrders); $this->model_extension_retailcrm_order->uploadToCrm($fullOrders);
$file = fopen(DIR_SYSTEM . '/cron/export_done.txt', "x");
} }
/** /**

29
admin/view/template/extension/module/retailcrm.tpl
View File

@ -63,30 +63,6 @@
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</div> </div>
<h3><?php echo $retailcrm_upload_order; ?></h3>
<div class="retailcrm_unit">
<label><?php echo $text_button_export_order; ?> № </label><input type="text" name="order_id">
<button type="button" id="export_order" data-toggle="tooltip" title="<?php echo $text_button_export_order; ?>" class="btn btn-success"><i class="fa fa-download"></i></button>
</div>
<h3><?php echo $retailcrm_countries_settings; ?></h3>
<div class="retailcrm_unit">
<div class="well well-sm" style="height: 150px; overflow: auto; width: 30%;">
<?php foreach($countries as $country) : ?>
<div class="checkbox">
<label>
<input type="checkbox" name="<?php echo 'retailcrm_country[]'; ?>" value="<?php echo $country['country_id']; ?>" <?php if(isset($saved_settings['retailcrm_country']) && in_array($country['country_id'], $saved_settings['retailcrm_country'])): echo 'checked'; endif;?>>
<?php echo $country['name']; ?>
</label>
</div>
<?php endforeach; ?>
</div>
</div>
<h3><?php echo $retailcrm_upload_order; ?></h3>
<div class="retailcrm_unit">
<label><?php echo $text_button_export_order; ?> № </label><input type="text" name="order_id">
<button type="button" id="export_order" data-toggle="tooltip" title="<?php echo $text_button_export_order; ?>" class="btn btn-success"><i class="fa fa-download"></i></button>
</div>
<?php if (isset($saved_settings['retailcrm_apikey']) && $saved_settings['retailcrm_apikey'] != '' && isset($saved_settings['retailcrm_url']) && $saved_settings['retailcrm_url'] != ''): ?> <?php if (isset($saved_settings['retailcrm_apikey']) && $saved_settings['retailcrm_apikey'] != '' && isset($saved_settings['retailcrm_url']) && $saved_settings['retailcrm_url'] != ''): ?>
@ -95,6 +71,11 @@
<div class="warning"><?php echo $retailcrm_error ?></div> <div class="warning"><?php echo $retailcrm_error ?></div>
<?php endforeach; ?> <?php endforeach; ?>
<?php else: ?> <?php else: ?>
<h3><?php echo $retailcrm_upload_order; ?></h3>
<div class="retailcrm_unit">
<label><?php echo $text_button_export_order; ?> № </label><input type="text" name="order_id">
<button type="button" id="export_order" data-toggle="tooltip" title="<?php echo $text_button_export_order; ?>" class="btn btn-success"><i class="fa fa-download"></i></button>
</div>
<h3><?php echo $retailcrm_dict_settings; ?></h3> <h3><?php echo $retailcrm_dict_settings; ?></h3>
<h4><?php echo $retailcrm_dict_delivery; ?></h4> <h4><?php echo $retailcrm_dict_delivery; ?></h4>

4
catalog/controller/api/retailcrm.php
View File

@ -59,14 +59,14 @@ class ControllerApiRetailcrm extends Controller
$this->load->language('extension/shipping/' . $shippingModule['code']); $this->load->language('extension/shipping/' . $shippingModule['code']);
$quote_data[] = array( $quote_data[] = array(
'code' => $shippingModule['code'], 'code' => $shippingModule['code'],
'title' => $this->language->get('text_description') 'title' => $this->language->get('text_title')
); );
} }
} else { } else {
$this->load->language('extension/shipping/' . $shippingModule['code']); $this->load->language('extension/shipping/' . $shippingModule['code']);
$quote_data[] = array( $quote_data[] = array(
'code' => $shippingModule['code'], 'code' => $shippingModule['code'],
'title' => $this->language->get('text_description') 'title' => $this->language->get('text_title')
); );
} }
} }

1
system/cron/export.php
View File

@ -1,4 +1,3 @@
<?php <?php
$cli_action = 'extension/module/retailcrm/export'; $cli_action = 'extension/module/retailcrm/export';
require_once('dispatch.php'); require_once('dispatch.php');
$file = fopen(DIR_SYSTEM . '/cron/export_done.txt', "x");