Новые изменения в модуле - отображение статуса фискализации. Весь базовый функционал должен работать. Важные изменения в README + LICENSE
This commit is contained in:
+164
@@ -0,0 +1,164 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<modification>
|
||||
<name>Dreamkas 3.x</name>
|
||||
<code>Dreamkas 3.x</code>
|
||||
<version>1.02</version>
|
||||
<author>Anthony Axenov, Alexey Kopylov (based on code by alt-team.ru)</author>
|
||||
<link>https://github.com/anthonyaxenov/dreamkas-opencart-3</link>
|
||||
<!--
|
||||
<file path="catalog/controller/checkout/success.php">
|
||||
<operation>
|
||||
<search><![CDATA[public function index() {]]></search>
|
||||
<add position="after">
|
||||
<![CDATA[if (isset($this->session->data['order_id'])) {
|
||||
$this->load->controller('extension/module/dreamkas/fiscalize',$this->session->data['order_id']);
|
||||
}
|
||||
]]></add>
|
||||
</operation>
|
||||
</file>
|
||||
-->
|
||||
<file path="admin/view/template/catalog/product_form.twig">
|
||||
<operation>
|
||||
<search><![CDATA[<label class="col-sm-2 control-label" for="input-price">{{ entry_price }}</label>]]></search>
|
||||
<add position="after" offset="4"><![CDATA[
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label" for="input-width">НДС товара при фискализации</label>
|
||||
<div class="col-sm-10">
|
||||
<select name="dk_tax_type" id="input-dk_tax_type" class="form-control">
|
||||
<option value="0" {% if dk_tax_type is empty %} selected="selected" {% endif %}>Выберите НДС</option>
|
||||
<option value="NDS_NO_TAX" {% if dk_tax_type=='NDS_NO_TAX' %} selected="selected" {% endif %}>Без НДС</option>
|
||||
<option value="NDS_0" {% if dk_tax_type=='NDS_0' %} selected="selected" {% endif %}>НДС 0</option>
|
||||
<option value="NDS_10" {% if dk_tax_type=='NDS_10' %} selected="selected" {% endif %}>НДС 10</option>
|
||||
<option value="NDS_18" {% if dk_tax_type=='NDS_18' %} selected="selected" {% endif %}>НДС 18</option>
|
||||
<option value="NDS_10_CALCULATED" {% if dk_tax_type=='NDS_10_CALCULATED' %} selected="selected" {% endif %}>НДС 10/110</option>
|
||||
<option value="NDS_18_CALCULATED" {% if dk_tax_type=='NDS_18_CALCULATED' %} selected="selected" {% endif %}>НДС 18/118</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
]]>
|
||||
</add>
|
||||
</operation>
|
||||
</file>
|
||||
<file path="admin/model/catalog/product.php">
|
||||
<operation>
|
||||
<search><![CDATA[$this->db->query("DELETE FROM " . DB_PREFIX . "product_description WHERE product_id = '" . (int)$product_id . "'");]]></search>
|
||||
<add position="before"><![CDATA[
|
||||
if (isset($data['dk_tax_type'])) {
|
||||
$this->db->query("UPDATE " . DB_PREFIX . "product SET dk_tax_type = '" . $this->db->escape($data['dk_tax_type']) . "' WHERE product_id = '" . (int)$product_id . "'");
|
||||
}
|
||||
]]>
|
||||
</add>
|
||||
</operation>
|
||||
</file>
|
||||
<file path="admin/controller/catalog/product.php">
|
||||
<operation>
|
||||
<search><![CDATA[$this->load->model('catalog/recurring');]]></search>
|
||||
<add position="before"><![CDATA[
|
||||
if (isset($this->request->post['dk_tax_type'])) {
|
||||
$data['dk_tax_type'] = $this->request->post['dk_tax_type'];
|
||||
} elseif (!empty($product_info['dk_tax_type'])) {
|
||||
$data['dk_tax_type'] = $product_info['dk_tax_type'];
|
||||
} else {
|
||||
$data['dk_tax_type'] = '';
|
||||
}
|
||||
]]>
|
||||
</add>
|
||||
</operation>
|
||||
</file>
|
||||
<file path="admin/view/template/sale/order_list.twig">
|
||||
<operation>
|
||||
<search><![CDATA[<td class="text-right">{{ column_action }}</td>]]></search>
|
||||
<add position="before"><![CDATA[<td class="text-left">Статус фискализации</td>]]></add>
|
||||
</operation>
|
||||
<operation>
|
||||
<search><![CDATA[<td class="text-left">{{ order.date_modified }}</td>]]></search>
|
||||
<add position="after"><![CDATA[<td class="text-left">{{order.dk_status}}</td>]]></add>
|
||||
</operation>
|
||||
</file>
|
||||
<file path="admin/view/template/sale/order_info.twig">
|
||||
<operation>
|
||||
<search><![CDATA[
|
||||
<td>{{ text_affiliate }}
|
||||
]]>
|
||||
</search>
|
||||
<add position="before"><![CDATA[
|
||||
<td>{{ entry_dk_status }}</td>
|
||||
<td class="text-right">{% if dk_status %} {{dk_status }} {%endif%} </td>
|
||||
<td class="text-center"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
]]>
|
||||
</add>
|
||||
</operation>
|
||||
</file>
|
||||
<file path="admin/controller/sale/order.php">
|
||||
<operation>
|
||||
<search><![CDATA[
|
||||
$results = $this->model_sale_order->getOrders($filter_data);
|
||||
]]>
|
||||
</search>
|
||||
<add position="after" offset="2"><![CDATA[
|
||||
$dkquery = $this->db->query("SELECT dk_status FROM " . DB_PREFIX . "dreamkas WHERE order_id = '" . (int)$result['order_id']. "'");
|
||||
]]>
|
||||
</add>
|
||||
</operation>
|
||||
<operation>
|
||||
<search><![CDATA['shipping_code' => $result['shipping_code'],]]></search>
|
||||
<add position="before"><![CDATA[
|
||||
'dk_status' => !empty($dkquery->row['dk_status'])?$dkquery->row['dk_status']:'',
|
||||
]]> </add>
|
||||
</operation>
|
||||
<operation>
|
||||
<search><![CDATA[$data['date_added'] = date($this->language->get('date_format_short'), strtotime($order_info['date_added']));]]></search>
|
||||
<add position="before"><![CDATA[
|
||||
$query = $this->db->query("SELECT order_status_id FROM `" . DB_PREFIX . "order` o WHERE o.order_id = '" . (int)$order_id . "'");
|
||||
$status = $query->row['order_status_id'];
|
||||
|
||||
$query = $this->db->query("SELECT payment_code FROM `" . DB_PREFIX . "order` o WHERE o.order_id = '" . (int)$order_id . "'");
|
||||
$payment_code = $query->row['payment_code'];
|
||||
|
||||
if ($status == $this->config->get('dreamkas_paid_order') && in_array($payment_code, $this->config->get('dreamkas_payments_ids'))) {
|
||||
|
||||
$query = $this->db->query("SELECT dk_id FROM " . DB_PREFIX . "dreamkas WHERE order_id = '" . (int)$order_id. "'");
|
||||
if(!empty($query->row['dk_id'])) {
|
||||
$dk_id = $query->row['dk_id'];
|
||||
$ch = curl_init();
|
||||
$access_token = $this->config->get('dreamkas_access_token');
|
||||
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, array(
|
||||
"Content-Type: application/json",
|
||||
"Authorization: Bearer $access_token"
|
||||
));
|
||||
|
||||
curl_setopt($ch, CURLOPT_URL, "https://kabinet.dreamkas.ru/api/operations/".$dk_id);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
|
||||
curl_setopt($ch, CURLOPT_HEADER, FALSE);
|
||||
$response = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
|
||||
$response = json_decode($response, true);
|
||||
|
||||
if((substr($response['status'], 0, 1)==4)) {
|
||||
$this->log->write('Dreamkas debug: ' . json_encode($response));
|
||||
} elseif(!empty($response['data']['error'])) {
|
||||
$this->log->write('Dreamkas debug: ' . json_encode($response['data']['error']));
|
||||
} else {
|
||||
$dk_date = empty($response['createdAt'])?$response['completedAt']:$response['createdAt'];
|
||||
$this->db->query("UPDATE `" . DB_PREFIX . "dreamkas` SET `order_id` = '" . (int)$order_id . "', `dk_id` = '".$response['id']."', `dk_date` ='".$dk_date."', `dk_status` = '" .$response['status']. "' WHERE order_id = '" . (int)$order_id. "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$query = $this->db->query("SELECT dk_status FROM " . DB_PREFIX . "dreamkas WHERE order_id = '" . (int)$order_id. "'");
|
||||
if(!empty($query->row['dk_status'])) {
|
||||
$data['dk_status'] = $query->row['dk_status'];
|
||||
} else {
|
||||
$data['dk_status'] = '';
|
||||
}
|
||||
$this->load->language('extension/module/dreamkas');
|
||||
$data['entry_dk_status'] = $this->language->get('entry_dk_status');
|
||||
]]>
|
||||
</add>
|
||||
</operation>
|
||||
</file>
|
||||
</modification>
|
||||
@@ -0,0 +1,235 @@
|
||||
<?php
|
||||
class ControllerExtensionModuleDreamkas extends Controller
|
||||
{
|
||||
private $error = array();
|
||||
|
||||
public function index()
|
||||
{
|
||||
$this->load->language('extension/module/dreamkas');
|
||||
$this->document->setTitle($this->language->get('heading_title'));
|
||||
$this->load->model('setting/setting');
|
||||
|
||||
if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
|
||||
$this->model_setting_setting->editSetting('dreamkas', $this->request->post);
|
||||
$this->session->data['success'] = $this->language->get('text_success');
|
||||
//$this->response->redirect($this->url->link('extension/extension', 'token=' . $this->session->data['token'], 'SSL'));
|
||||
$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=module', true));
|
||||
}
|
||||
/*
|
||||
if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
|
||||
if (!isset($this->request->get['module_id'])) {
|
||||
$this->model_extension_module->addModule('dreamkas', $this->request->post);
|
||||
} else {
|
||||
$this->model_extension_module->editModule($this->request->get['module_id'], $this->request->post);
|
||||
}
|
||||
//$this->cache->delete('product');
|
||||
$this->session->data['success'] = $this->language->get('text_success');
|
||||
$this->response->redirect($this->url->link('extension/extension', 'token=' . $this->session->data['token'] . '&type=module', true));
|
||||
}
|
||||
*/
|
||||
$data['heading_title'] = $this->language->get('heading_title');
|
||||
$data['text_edit'] = $this->language->get('text_edit');
|
||||
$data['text_enabled'] = $this->language->get('text_enabled');
|
||||
$data['text_disabled'] = $this->language->get('text_disabled');
|
||||
$data['entry_status'] = $this->language->get('entry_status');
|
||||
$data['entry_access_token'] = $this->language->get('entry_access_token');
|
||||
$data['entry_device_id'] = $this->language->get('entry_device_id');
|
||||
$data['entry_tax_mode'] = $this->language->get('entry_tax_mode');
|
||||
$data['entry_tax_type'] = $this->language->get('entry_tax_type');
|
||||
$data['entry_payments_ids'] = $this->language->get('entry_payments_ids');
|
||||
$data['entry_paid_order'] = $this->language->get('entry_paid_order');
|
||||
$data['text_tax_default'] = $this->language->get('text_tax_default');
|
||||
$data['text_tax_simple'] = $this->language->get('text_tax_simple');
|
||||
$data['text_tax_simple_wo'] = $this->language->get('text_tax_simple_wo');
|
||||
$data['text_tax_envd'] = $this->language->get('text_tax_envd');
|
||||
$data['text_tax_agricult'] = $this->language->get('text_tax_agricult');
|
||||
$data['text_tax_patent'] = $this->language->get('text_tax_patent');
|
||||
$data['text_tax_nds_no_tax'] = $this->language->get('text_tax_nds_no_tax');
|
||||
$data['text_tax_nds_0'] = $this->language->get('text_tax_nds_0');
|
||||
$data['text_tax_nds_10'] = $this->language->get('text_tax_nds_10');
|
||||
$data['text_tax_nds_18'] = $this->language->get('text_tax_nds_18');
|
||||
$data['text_tax_nds_10_calculated'] = $this->language->get('text_tax_nds_10_calculated');
|
||||
$data['text_tax_nds_18_calculated'] = $this->language->get('text_tax_nds_18_calculated');
|
||||
/*
|
||||
fnr($this);
|
||||
$data['entry_name'] = $this->language->get('entry_name');
|
||||
$data['entry_limit'] = $this->language->get('entry_limit');
|
||||
$data['entry_image'] = $this->language->get('entry_image');
|
||||
$data['entry_width'] = $this->language->get('entry_width');
|
||||
$data['entry_height'] = $this->language->get('entry_height');
|
||||
$data['entry_status'] = $this->language->get('entry_status');
|
||||
*/
|
||||
$data['button_save'] = $this->language->get('button_save');
|
||||
$data['button_cancel'] = $this->language->get('button_cancel');
|
||||
|
||||
if (isset($this->error['warning'])) {
|
||||
$data['error_warning'] = $this->error['warning'];
|
||||
} else {
|
||||
$data['error_warning'] = '';
|
||||
}
|
||||
|
||||
if (isset($this->error['access_token'])) {
|
||||
$data['error_access_token'] = $this->error['access_token'];
|
||||
} else {
|
||||
$data['error_access_token'] = '';
|
||||
}
|
||||
|
||||
if (isset($this->error['device_id'])) {
|
||||
$data['error_device_id'] = $this->error['device_id'];
|
||||
} else {
|
||||
$data['error_device_id'] = '';
|
||||
}
|
||||
|
||||
$data['breadcrumbs'] = array();
|
||||
$data['breadcrumbs'][] = array(
|
||||
'text' => $this->language->get('text_home'),
|
||||
'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
|
||||
);
|
||||
$data['breadcrumbs'][] = array(
|
||||
'text' => $this->language->get('text_extension'),
|
||||
'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=module', true)
|
||||
);
|
||||
$data['breadcrumbs'][] = array(
|
||||
'text' => $this->language->get('heading_title'),
|
||||
'href' => $this->url->link('extension/module/dreamkas', 'user_token=' . $this->session->data['user_token'], true)
|
||||
);
|
||||
$data['action'] = $this->url->link('extension/module/dreamkas', 'user_token=' . $this->session->data['user_token'], true);
|
||||
$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=module', true);
|
||||
|
||||
if (isset($this->request->get['module_id']) && ($this->request->server['REQUEST_METHOD'] != 'POST')) {
|
||||
$module_info = $this->model_extension_module->getModule($this->request->get['module_id']);
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_access_token'])) {
|
||||
$data['access_token'] = $this->request->post['dreamkas_access_token'];
|
||||
} else {
|
||||
$data['access_token'] = $this->config->get('dreamkas_access_token');
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_device_id'])) {
|
||||
$data['device_id'] = $this->request->post['dreamkas_device_id'];
|
||||
} else {
|
||||
$data['device_id'] = $this->config->get('dreamkas_device_id');
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_tax_mode'])) {
|
||||
$data['tax_mode'] = $this->request->post['dreamkas_tax_mode'];
|
||||
} else {
|
||||
$data['tax_mode'] = $this->config->get('dreamkas_tax_mode');
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_tax_type'])) {
|
||||
$data['tax_type'] = $this->request->post['dreamkas_tax_type'];
|
||||
} else {
|
||||
$data['tax_type'] = $this->config->get('dreamkas_tax_type');
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_payments_ids'])) {
|
||||
$data['payments_ids'] = $this->request->post['dreamkas_payments_ids'];
|
||||
} else {
|
||||
$data['payments_ids'] = $this->config->get('dreamkas_payments_ids');
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_paid_order'])) {
|
||||
$data['paid_order'] = $this->request->post['dreamkas_paid_order'];
|
||||
} else {
|
||||
$data['paid_order'] = $this->config->get('dreamkas_paid_order');
|
||||
}
|
||||
|
||||
if (!isset($data['payments_ids'])) {
|
||||
$data['payments_ids'] = array();
|
||||
}
|
||||
|
||||
$this->load->model('localisation/order_status');
|
||||
$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
|
||||
|
||||
//Get payments
|
||||
$this->load->model('setting/extension');
|
||||
$extensions = $this->model_setting_extension->getInstalled('payment');
|
||||
foreach ($extensions as $key => $value) {
|
||||
if (!is_file(DIR_APPLICATION . 'controller/extension/payment/' . $value . '.php') && !is_file(DIR_APPLICATION . 'controller/payment/' . $value . '.php')) {
|
||||
$this->model_extension_extension->uninstall('payment', $value);
|
||||
unset($extensions[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
$data['extensions'] = array();
|
||||
|
||||
// Compatibility code for old extension folders
|
||||
$files = glob(DIR_APPLICATION . 'controller/{extension/payment,payment}/*.php', GLOB_BRACE);
|
||||
if ($files) {
|
||||
foreach ($files as $file) {
|
||||
$extension = basename($file, '.php');
|
||||
$this->load->language('extension/payment/' . $extension);
|
||||
$text_link = $this->language->get('text_' . $extension);
|
||||
if ($text_link != 'text_' . $extension) {
|
||||
$link = $this->language->get('text_' . $extension);
|
||||
} else {
|
||||
$link = '';
|
||||
}
|
||||
$data['extensions'][] = array(
|
||||
'name' => $this->language->get('heading_title'),
|
||||
'code' => $extension,
|
||||
'link' => $link,
|
||||
'status' => $this->config->get($extension . '_status') ? $this->language->get('text_enabled') : $this->language->get('text_disabled'),
|
||||
'sort_order' => $this->config->get($extension . '_sort_order'),
|
||||
'install' => $this->url->link('extension/extension/payment/install', 'user_token=' . $this->session->data['user_token'] . '&extension=' . $extension, true),
|
||||
'uninstall' => $this->url->link('extension/extension/payment/uninstall', 'user_token=' . $this->session->data['user_token'] . '&extension=' . $extension, true),
|
||||
'installed' => in_array($extension, $extensions),
|
||||
'edit' => $this->url->link('extension/payment/' . $extension, 'user_token=' . $this->session->data['user_token'], true)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($this->request->post['dreamkas_status'])) {
|
||||
$data['status'] = $this->request->post['dreamkas_status'];
|
||||
} else {
|
||||
$data['status'] = $this->config->get('dreamkas_status');
|
||||
}
|
||||
$data['header'] = $this->load->controller('common/header');
|
||||
$data['column_left'] = $this->load->controller('common/column_left');
|
||||
$data['footer'] = $this->load->controller('common/footer');
|
||||
$this->response->setOutput($this->load->view('extension/module/dreamkas', $data));
|
||||
}
|
||||
|
||||
protected function validate()
|
||||
{
|
||||
if (!$this->user->hasPermission('modify', 'extension/module/dreamkas')) {
|
||||
$this->error['warning'] = $this->language->get('error_permission');
|
||||
}
|
||||
if (!$this->request->post['dreamkas_access_token']) {
|
||||
$this->error['error_access_token'] = $this->language->get('error_access_token');
|
||||
}
|
||||
if (!$this->request->post['dreamkas_device_id']) {
|
||||
$this->error['error_device_id'] = $this->language->get('error_device_id');
|
||||
}
|
||||
if (!isset($this->request->post['dreamkas_payments_ids'])) {
|
||||
//$this->error['error_payments_ids'] = $this->language->get('error_payments_ids');
|
||||
}
|
||||
return !$this->error;
|
||||
}
|
||||
|
||||
public function install()
|
||||
{
|
||||
$this->load->model('setting/event');
|
||||
$this->model_setting_event->addEvent('dreamkas', 'catalog/model/checkout/order/addOrderHistory/after', 'extension/module/dreamkas');
|
||||
$this->db->query("
|
||||
CREATE TABLE IF NOT EXISTS `" . DB_PREFIX . "dreamkas` (
|
||||
`order_id` int(11) NOT NULL,
|
||||
`dk_id` VARCHAR(30) NOT NULL,
|
||||
`dk_date` VARCHAR(30) NOT NULL,
|
||||
`dk_status` VARCHAR(30) NOT NULL,
|
||||
PRIMARY KEY (`order_id`)
|
||||
) ENGINE=MyISAM DEFAULT COLLATE=utf8_general_ci
|
||||
");
|
||||
$this->db->query("
|
||||
ALTER TABLE `" . DB_PREFIX . "product` ADD `dk_tax_type` VARCHAR(50) NOT NULL DEFAULT ''
|
||||
");
|
||||
}
|
||||
|
||||
public function uninstall()
|
||||
{
|
||||
$this->load->model('setting/event');
|
||||
$this->model_setting_event->deleteEvent('dreamkas');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
// Heading
|
||||
$_['heading_title'] = 'Дримкас';
|
||||
|
||||
// Text
|
||||
$_['text_extension'] = 'Расширения';
|
||||
$_['text_success'] = 'Настройки успешно изменены!';
|
||||
$_['text_edit'] = 'Настройки модуля';
|
||||
|
||||
// Entry
|
||||
$_['entry_dk_status'] = 'Дримкас статус';
|
||||
$_['entry_status'] = 'Статус';
|
||||
$_['entry_access_token'] = 'Токен доступа';
|
||||
$_['entry_device_id'] = 'Идентификатор устройства, которое будет использовано для фискализации';
|
||||
$_['entry_tax_mode'] = 'Система налогообложения (если устройство зарегистрировано для работы с несколькими СНО)';
|
||||
$_['entry_tax_type'] = 'Тип НДС (если не указан, то будет взят из настроек устройства)';
|
||||
$_['entry_payments_ids'] = 'Список способов оплаты, обработка платежей которых, будет передаваться для фискализации';
|
||||
$_['entry_paid_order'] = 'Статус оплаченного ордера';
|
||||
|
||||
$_['text_tax_default'] = 'Общая';
|
||||
$_['text_tax_simple'] = 'Упрощенная доход';
|
||||
$_['text_tax_simple_wo'] = 'Упрощенная доход минус расход';
|
||||
$_['text_tax_envd'] = 'Единый налог на вмененный доход';
|
||||
$_['text_tax_agricult'] = 'Единый сельскохозяйственный налог';
|
||||
$_['text_tax_patent'] = 'Патентная система налогообложения';
|
||||
|
||||
$_['text_tax_nds_no_tax'] = 'Без НДС';
|
||||
$_['text_tax_nds_0'] = 'НДС 0';
|
||||
$_['text_tax_nds_10'] = 'НДС 10';
|
||||
$_['text_tax_nds_18'] = 'НДС 18';
|
||||
$_['text_tax_nds_10_calculated'] = 'НДС 10/110';
|
||||
$_['text_tax_nds_18_calculated'] = 'НДС 18/118';
|
||||
|
||||
// Error
|
||||
$_['error_device_id'] = 'Введите ID кассы.';
|
||||
$_['error_access_token'] = 'Необходим токен доступа.';
|
||||
$_['error_permission'] = 'У Вас нет прав для управления данным модулем!';
|
||||
$_['error_code'] = 'Необходим код';
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
// Heading
|
||||
$_['heading_title'] = 'Дримкас';
|
||||
|
||||
// Text
|
||||
$_['text_extension'] = 'Расширения';
|
||||
$_['text_module'] = 'Модули';
|
||||
$_['text_success'] = 'Настройки успешно изменены!';
|
||||
$_['text_edit'] = 'Настройки модуля';
|
||||
|
||||
// Entry
|
||||
$_['entry_dk_status'] = 'Дримкас статус';
|
||||
$_['entry_status'] = 'Статус';
|
||||
$_['entry_access_token'] = 'Токен доступа';
|
||||
$_['entry_device_id'] = 'Идентификатор устройства, которое будет использовано для фискализации';
|
||||
$_['entry_tax_mode'] = 'Система налогообложения (если устройство зарегистрировано для работы с несколькими СНО)';
|
||||
$_['entry_tax_type'] = 'Тип НДС (если не указан, то будет взят из настроек устройства)';
|
||||
$_['entry_payments_ids'] = 'Список способов оплаты, обработка платежей которых, будет передаваться для фискализации';
|
||||
$_['entry_paid_order'] = 'Статус оплаченного ордера';
|
||||
|
||||
$_['text_tax_default'] = 'Общая';
|
||||
$_['text_tax_simple'] = 'Упрощенная доход';
|
||||
$_['text_tax_simple_wo'] = 'Упрощенная доход минус расход';
|
||||
$_['text_tax_envd'] = 'Единый налог на вмененный доход';
|
||||
$_['text_tax_agricult'] = 'Единый сельскохозяйственный налог';
|
||||
$_['text_tax_patent'] = 'Патентная система налогообложения';
|
||||
|
||||
$_['text_tax_nds_no_tax'] = 'Без НДС';
|
||||
$_['text_tax_nds_0'] = 'НДС 0';
|
||||
$_['text_tax_nds_10'] = 'НДС 10';
|
||||
$_['text_tax_nds_18'] = 'НДС 18';
|
||||
$_['text_tax_nds_10_calculated'] = 'НДС 10/110';
|
||||
$_['text_tax_nds_18_calculated'] = 'НДС 18/118';
|
||||
|
||||
// Error
|
||||
$_['error_device_id'] = 'Введите ID кассы.';
|
||||
$_['error_access_token'] = 'Необходим токен доступа.';
|
||||
$_['error_permission'] = 'У Вас нет прав для управления данным модулем!';
|
||||
$_['error_code'] = 'Необходим код';
|
||||
@@ -0,0 +1,127 @@
|
||||
{{ header }}
|
||||
{{ column_left }}
|
||||
<div id="content">
|
||||
<div class="page-header">
|
||||
<div class="container-fluid">
|
||||
<div class="pull-right">
|
||||
<button type="submit" form="form-special" data-toggle="tooltip" title="{{button_save}}" class="btn btn-primary">
|
||||
<i class="fa fa-save"></i>
|
||||
</button>
|
||||
<a href="{{cancel}}" data-toggle="tooltip" title="{{button_cancel}}" class="btn btn-default"><i class="fa fa-reply"></i></a>
|
||||
</div>
|
||||
<h1>{{heading_title}}</h1>
|
||||
<ul class="breadcrumb">
|
||||
{% for breadcrumb in breadcrumbs %}
|
||||
<li><a href="{{ breadcrumb.href }}">{{ breadcrumb.text }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
{% if error_warning %}
|
||||
<div class="alert alert-danger">
|
||||
<i class="fa fa-exclamation-circle"></i>{{ error_warning }}
|
||||
<button type="button" class="close" data-dismiss="alert">×</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">
|
||||
<i class="fa fa-pencil"></i>{{text_edit}}
|
||||
</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form action="{{action}}" method="post" enctype="multipart/form-data" id="form-special" class="form-horizontal">
|
||||
|
||||
<div class="form-group required">
|
||||
<label class="col-sm-2 control-label" for="input-name">{{entry_access_token}}</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" name="dreamkas_access_token" value="{{access_token}}" placeholder="{{entry_access_token}}" id="input-name" class="form-control" />
|
||||
{% if error_access_token %}
|
||||
<div class="text-danger">{{error_access_token}}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group required">
|
||||
<label class="col-sm-2 control-label" for="input-limit">{{entry_device_id}}</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" name="dreamkas_device_id" value="{{device_id}}" placeholder="{{entry_device_id}}" id="input-device_id" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group required">
|
||||
<label class="col-sm-2 control-label" for="input-width">{{entry_tax_mode}}</label>
|
||||
<div class="col-sm-10">
|
||||
<select name="dreamkas_tax_mode" id="input-tax_mode" class="form-control">
|
||||
<option value="DEFAULT" {% if tax_mode == 'DEFAULT' %} selected="selected"{% endif %}>{{text_tax_default}}</option>
|
||||
<option value="SIMPLE" {% if tax_mode == 'SIMPLE' %} selected="selected" {% endif %}>{{text_tax_simple}}</option>
|
||||
<option value="SIMPLE_WO" {% if tax_mode == 'SIMPLE_WO' %} selected="selected" {% endif %}>{{text_tax_simple_wo}}</option>
|
||||
<option value="ENVD" {% if tax_mode == 'ENVD' %} selected="selected" {% endif %}>{{text_tax_envd}}</option>
|
||||
<option value="AGRICULT" {% if tax_mode == 'AGRICULT' %} selected="selected" {% endif %}>{{text_tax_agricult}}</option>
|
||||
<option value="PATENT" {% if tax_mode == 'PATENT' %} selected="selected" {% endif %}>{{text_tax_patent}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group required">
|
||||
<label class="col-sm-2 control-label" for="input-width">{{entry_tax_type}}</label>
|
||||
<div class="col-sm-10">
|
||||
<select name="dreamkas_tax_type" id="input-tax_type" class="form-control">
|
||||
<option value="NDS_NO_TAX" {% if tax_type == 'NDS_NO_TAX' %} selected="selected" {% endif %}>{{text_tax_nds_no_tax}}</option>
|
||||
<option value="NDS_0" {% if tax_type == 'NDS_0' %} selected="selected" {% endif %}>{{text_tax_nds_0}}</option>
|
||||
<option value="NDS_10" {% if tax_type == 'NDS_10' %} selected="selected" {% endif %}>{{text_tax_nds_10}}</option>
|
||||
<option value="NDS_18" {% if tax_type == 'NDS_18' %} selected="selected" {% endif %}>{{text_tax_nds_18}}</option>
|
||||
<option value="NDS_10_CALCULATED" {% if tax_type == 'NDS_10_CALCULATED' %} selected="selected" {% endif %}>{{text_tax_nds_10_calculated}}</option>
|
||||
<option value="NDS_18_CALCULATED" {% if tax_type=='NDS_18_CALCULATED' %} selected="selected" {% endif %}>{{text_tax_nds_18_calculated}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group required">
|
||||
<label class="col-sm-2 control-label" for="input-paid_order">{{entry_paid_order}}</label>
|
||||
<div class="col-sm-10">
|
||||
<select name="dreamkas_paid_order" id="input-paid_order" class="form-control">
|
||||
{% for value in order_statuses %}
|
||||
<option value="{{value.order_status_id}}" {% if paid_order == value.order_status_id %} selected="selected" {% endif %}>{{ value.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label" for="input-process-status">{{entry_payments_ids}}</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="well well-sm" style="height: 150px; overflow: auto;">
|
||||
{% for type in extensions %}
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" name="dreamkas_payments_ids[]" value="{{ type.code }}" {% if type.code in payments_ids %} checked="checked" {% endif %}/>{{ type.name }} ({{ type.code }})
|
||||
</label>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label" for="input-status">{{entry_status}}</label>
|
||||
<div class="col-sm-10">
|
||||
<select name="dreamkas_status" id="input-status" class="form-control">
|
||||
{% if status %}
|
||||
<option value="1" selected="selected">{{text_enabled}}</option>
|
||||
<option value="0">{{text_disabled}}</option>
|
||||
{% else %}
|
||||
<option value="1">{{text_enabled}}</option>
|
||||
<option value="0" selected="selected">{{text_disabled}}</option>
|
||||
{% endif %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{ footer }}
|
||||
@@ -0,0 +1,123 @@
|
||||
<?php
|
||||
class ControllerExtensionModuleDreamkas extends Controller
|
||||
{
|
||||
|
||||
public function check($data)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public function index($route, $data)
|
||||
{
|
||||
// fn_write_r($this->session->data, $route, $data);
|
||||
if (!empty($data[0])) {
|
||||
$this->load->language('extension/module/dreamkas');
|
||||
$order_id = $data[0];
|
||||
$query = $this->db->query("SELECT order_status_id FROM `" . DB_PREFIX . "order` o WHERE o.order_id = '" . (int) $order_id . "'");
|
||||
$status = $query->row['order_status_id'];
|
||||
$query = $this->db->query("SELECT payment_code FROM `" . DB_PREFIX . "order` o WHERE o.order_id = '" . (int) $order_id . "'");
|
||||
$payment_code = $query->row['payment_code'];
|
||||
// fn_write_r($data, $status, $this->config->get('dreamkas_paid_order'), $payment_code, $this->config->get('dreamkas_payments_ids'));
|
||||
// if (in_array($status, $this->config->get('sms_alert_processing_status'))) {
|
||||
if ($status == $this->config->get('dreamkas_paid_order') && in_array($payment_code, $this->config->get('dreamkas_payments_ids'))) {
|
||||
$this->load->model('checkout/order');
|
||||
$order_info = $this->model_checkout_order->getOrder($order_id);
|
||||
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "order_product WHERE order_id = '" . (int) $order_id . "'");
|
||||
$products = $query->rows;
|
||||
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int) $order_id . "' AND code = 'shipping' ORDER BY sort_order");
|
||||
$shipping = $query->rows;
|
||||
$tax_type = $this->config->get('dreamkas_tax_type');
|
||||
$tax_sum = 0;
|
||||
$items = array();
|
||||
foreach ($products as $product) {
|
||||
$query = $this->db->query("SELECT dk_tax_type FROM " . DB_PREFIX . "product WHERE product_id = '" . (int) $product['product_id'] . "'");
|
||||
$dk_tax_type = $query->row;
|
||||
$product_tax_type = empty($dk_tax_type['dk_tax_type']) ? $tax_type : $dk_tax_type['dk_tax_type'];
|
||||
$items[] = array(
|
||||
"name" => $product['name'],
|
||||
"type" => "COUNTABLE",
|
||||
"quantity" => $product['quantity'],
|
||||
"price" => ($product['price'] + $product['tax']) * 100,
|
||||
"priceSum" => ($product['total'] + $product['tax'] * $product['quantity']) * 100,
|
||||
"tax" => "$product_tax_type",
|
||||
"taxSum" => 0 // $product['tax'] * 100 * $product['quantity']
|
||||
);
|
||||
$tax_sum += $product['tax'] * $product['quantity'];
|
||||
}
|
||||
if (!empty($shipping)) {
|
||||
$query = $this->db->query("SELECT * FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int) $order_id . "' AND code = 'tax' ORDER BY sort_order");
|
||||
$tax_total = reset($query->rows);
|
||||
if (!empty($tax_total['value'])) {
|
||||
$shipping_tax = $tax_total['value'] - $tax_sum;
|
||||
} else {
|
||||
$shipping_tax = 0;
|
||||
}
|
||||
foreach ($shipping as $_shipping) {
|
||||
if ($_shipping['value'] > 0) {
|
||||
$items[] = array(
|
||||
"name" => 'Доставка',
|
||||
"type" => "COUNTABLE",
|
||||
"quantity" => 1,
|
||||
"price" => ($_shipping['value'] + $shipping_tax) * 100,
|
||||
"priceSum" => ($_shipping['value'] + $shipping_tax) * 100,
|
||||
"tax" => "$tax_type",
|
||||
"taxSum" => 0 // $shipping_tax * 100
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
// fn_write_die($order_id, $tax_sum, $query, $items, $shipping);
|
||||
$request = array(
|
||||
"deviceId" => $this->config->get('dreamkas_device_id'),
|
||||
"type" => "SALE",
|
||||
"timeout" => 180,
|
||||
"taxMode" => $this->config->get('dreamkas_tax_mode'),
|
||||
"positions" => $items,
|
||||
"payments" => array(
|
||||
array(
|
||||
"sum" => $order_info['total'] * 100,
|
||||
"type" => "CASHLESS"
|
||||
)
|
||||
),
|
||||
"attributes" => array(
|
||||
"email" => $order_info['email'],
|
||||
"phone" => $order_info['telephone'] // "+71239994499"
|
||||
),
|
||||
"total" => array(
|
||||
"priceSum" => $order_info['total'] * 100
|
||||
)
|
||||
);
|
||||
// fn_write_die($request, $products, $shipping, $order_info);
|
||||
$ch = curl_init();
|
||||
$access_token = $this->config->get('dreamkas_access_token');
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, array(
|
||||
"Content-Type: application/json",
|
||||
"Authorization: Bearer " . $access_token
|
||||
));
|
||||
curl_setopt($ch, CURLOPT_URL, "https://kabinet.dreamkas.ru/api/receipts");
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
|
||||
curl_setopt($ch, CURLOPT_HEADER, FALSE);
|
||||
curl_setopt($ch, CURLOPT_POST, TRUE);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($request));
|
||||
$response = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
if (!empty($response)) {
|
||||
$response = json_decode($response, true);
|
||||
// $response = json_decode('{"id": "5956889136fdd7733f19cfe6","createdAt": "2017-06-20 12:01:47.990Z","status": "PENDING"}', true);
|
||||
if ((substr($response['status'], 0, 1) == 4)) {
|
||||
$this->log->write('Dreamkas debug: ' . json_encode($response));
|
||||
} else {
|
||||
$dk_date = empty($response['createdAt']) ? $response['completedAt'] : $response['createdAt'];
|
||||
$query = $this->db->query("SELECT order_id FROM " . DB_PREFIX . "dreamkas WHERE order_id = '" . (int) $order_id . "'");
|
||||
$exist_order_id = $query->rows;
|
||||
if (empty($exist_order_id)) {
|
||||
$this->db->query("INSERT INTO `" . DB_PREFIX . "dreamkas` SET `order_id` = '" . (int) $order_id . "', `dk_id` = '" . $response['id'] . "', `dk_date` ='" . $dk_date . "', `dk_status` = '" . $response['status'] . "'");
|
||||
} else {
|
||||
$this->db->query("UPDATE `" . DB_PREFIX . "dreamkas` SET `order_id` = '" . (int) $order_id . "', `dk_id` = '" . $response['id'] . "', `dk_date` ='" . $dk_date . "', `dk_status` = '" . $response['status'] . "' WHERE order_id = '" . (int) $order_id . "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user