1
0
mirror of synced 2025-03-21 23:53:59 +03:00

Fix bug in uploader

This commit is contained in:
Dima Uryvskiy 2021-08-04 15:41:48 +03:00 committed by GitHub
parent eb95f3e375
commit 6a77e02e89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 15 deletions

View File

@ -1,3 +1,7 @@
## 2021-08-04 4.3.7
* Исправили ошибку с неправильной выгрузкой архивных клиентов.
* Удалил опцию "Роли клиентов" с настроек модуля.
## 2021-07-27 4.3.6
* Обновили отображение настроек модуля
* Исправлен баг с добавлением вариативных товаров в каталог как обычных

View File

@ -1 +1 @@
4.3.6
4.3.7

View File

@ -30,8 +30,8 @@ jQuery(function () {
dataType: "json"
})
.done(function (response) {
_this.ordersCount = response.count_orders;
_this.customersCount = response.count_users;
_this.ordersCount = Number(response.count_orders);
_this.customersCount = Number(response.count_users);
jQuery(_this.submitButton).removeClass('retail-hidden');
_this.displayCountUploadData();
@ -71,12 +71,12 @@ jQuery(function () {
let data = {};
if (this.customersStep * this.customersStepSize < this.customersCount) {
data.RETAILCRM_EXPORT_CUSTOMERS_STEP = this.customersStep;
data.Step = this.customersStep;
data.Entity = 'customer';
this.customersStep++;
} else {
if (this.ordersStep * this.ordersStepSize < this.ordersCount) {
data.RETAILCRM_EXPORT_ORDERS_STEP = this.ordersStep;
data.Step = this.ordersStep;
data.Entity = 'order';
this.ordersStep++;
} else {

View File

@ -258,7 +258,7 @@ if (!class_exists('WC_Retailcrm_Base')) {
*/
public function upload_to_crm()
{
$page = filter_input(INPUT_POST, 'RETAILCRM_EXPORT_ORDERS_STEP');
$page = filter_input(INPUT_POST, 'Step');
$entity = filter_input(INPUT_POST, 'Entity');
if ($entity === 'customer') {
@ -472,10 +472,10 @@ if (!class_exists('WC_Retailcrm_Base')) {
{
$path = plugins_url() . '/woo-retailcrm/assets/js/';
wp_register_script('retailcrm-export', $path . 'retailcrm-export.js');
wp_register_script('retailcrm-export', $path . 'retailcrm-export.js', false, '0.1');
wp_enqueue_script('retailcrm-export', $path . 'retailcrm-export.js', '', '', true);
wp_register_script('retailcrm-cron-info', $path . 'retailcrm-cron-info.js');
wp_register_script('retailcrm-cron-info', $path . 'retailcrm-cron-info.js', false, '0.1');
wp_enqueue_script('retailcrm-cron-info', $path . 'retailcrm-export.js', '', '', true);
}
@ -564,10 +564,10 @@ if (!class_exists('WC_Retailcrm_Base')) {
/**
* Get retailcrm api client
*
* @return bool|WC_Retailcrm_Proxy|\WC_Retailcrm_Client_V4|\WC_Retailcrm_Client_V5
*/
* Get retailcrm api client
*
* @return bool|WC_Retailcrm_Proxy|\WC_Retailcrm_Client_V4|\WC_Retailcrm_Client_V5
*/
public function getApiClient()
{
if ($this->get_option('api_url') && $this->get_option('api_key')) {

View File

@ -5,7 +5,7 @@ Tags: Интеграция, Simla.com, simla
Requires PHP: 5.3
Requires at least: 5.3
Tested up to: 5.8
Stable tag: 4.3.6
Stable tag: 4.3.7
License: GPLv1 or later
License URI: http://www.gnu.org/licenses/gpl-1.0.html
@ -83,6 +83,10 @@ Asegúrate de tener una clave API específica para cada tienda. Las siguientes i
== Changelog ==
= 4.3.7 =
* Исправили ошибку с неправильной выгрузкой архивных клиентов.
* Удалил опцию "Роли клиентов" с настроек модуля.
= 4.3.6 =
* Обновили отображение настроек модуля
* Исправлен баг с добавлением вариативных товаров в каталог как обычных

View File

@ -5,7 +5,7 @@
* Description: Integration plugin for WooCommerce & Simla.com
* Author: RetailDriver LLC
* Author URI: http://retailcrm.pro/
* Version: 4.3.6
* Version: 4.3.7
* Tested up to: 5.8
* WC requires at least: 3.0
* WC tested up to: 5.4

View File

@ -16,7 +16,7 @@
*
* @link https://wordpress.org/plugins/woo-retailcrm/
*
* @version 4.3.6
* @version 4.3.7
*
* @package RetailCRM
*/