RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-03-24 00:53:52 +03:00
Code Issues Projects Releases Wiki Activity

Edit order create hook, added check correct data in base class (#6)

Browse Source
This commit is contained in:
Akolzin Dmitry 2017-08-07 12:52:38 +02:00 committed by Alex Lushpai
parent 6aa9d3c1fd
commit 1e114cd22e
3 changed files with 97 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retailcrm/include/api/class-wc-retailcrm-proxy.php
View File

@ -49,6 +49,7 @@ if ( ! class_exists( 'WC_Retailcrm_Proxy' ) ) :
public function __call($method, $arguments) public function __call($method, $arguments)
{ {
if (!isset($this->retailcrm)) return;
try { try {
$response = call_user_func_array(array($this->retailcrm, $method), $arguments); $response = call_user_func_array(array($this->retailcrm, $method), $arguments);

14
retailcrm/include/class-wc-retailcrm-base.php
View File

@ -94,10 +94,10 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
/** /**
* Shipping options * Shipping options
*/ */
$shipping_option_list = array(); $shipping_option_list = array();
$retailcrm_shipping_list = $retailcrm->deliveryTypesList(); $retailcrm_shipping_list = $retailcrm->deliveryTypesList();
if ($retailcrm_shipping_list->isSuccessful()) {
foreach ($retailcrm_shipping_list['deliveryTypes'] as $retailcrm_shipping_type) { foreach ($retailcrm_shipping_list['deliveryTypes'] as $retailcrm_shipping_type) {
$shipping_option_list[$retailcrm_shipping_type['code']] = $retailcrm_shipping_type['name']; $shipping_option_list[$retailcrm_shipping_type['code']] = $retailcrm_shipping_type['name'];
} }
@ -127,14 +127,15 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
); );
} }
} }
}
/** /**
* Payment options * Payment options
*/ */
$payment_option_list = array(); $payment_option_list = array();
$retailcrm_payment_list = $retailcrm->paymentTypesList(); $retailcrm_payment_list = $retailcrm->paymentTypesList();
if ($retailcrm_payment_list->isSuccessful()) {
foreach ($retailcrm_payment_list['paymentTypes'] as $retailcrm_payment_type) { foreach ($retailcrm_payment_list['paymentTypes'] as $retailcrm_payment_type) {
$payment_option_list[$retailcrm_payment_type['code']] = $retailcrm_payment_type['name']; $payment_option_list[$retailcrm_payment_type['code']] = $retailcrm_payment_type['name'];
} }
@ -164,6 +165,7 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
); );
} }
} }
}
/** /**
* Statuses options * Statuses options
@ -171,6 +173,7 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
$statuses_option_list = array(); $statuses_option_list = array();
$retailcrm_statuses_list = $retailcrm->statusesList(); $retailcrm_statuses_list = $retailcrm->statusesList();
if ($retailcrm_statuses_list->isSuccessful()) {
foreach ($retailcrm_statuses_list['statuses'] as $retailcrm_status) { foreach ($retailcrm_statuses_list['statuses'] as $retailcrm_status) {
$statuses_option_list[$retailcrm_status['code']] = $retailcrm_status['name']; $statuses_option_list[$retailcrm_status['code']] = $retailcrm_status['name'];
} }
@ -195,7 +198,11 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
'desc_tip' => true, 'desc_tip' => true,
); );
} }
}
/**
* Inventories options
*/
$this->form_fields[] = array( $this->form_fields[] = array(
'title' => __( 'Настройки остатков', 'woocommerce' ), 'title' => __( 'Настройки остатков', 'woocommerce' ),
'type' => 'title', 'type' => 'title',
@ -211,6 +218,9 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
'description' => 'Отметьте данный пункт, если хотите выгружать остатки товаров из CRM в магазин.' 'description' => 'Отметьте данный пункт, если хотите выгружать остатки товаров из CRM в магазин.'
); );
/**
* Uploads options
*/
$options = array_filter(get_option( 'woocommerce_integration-retailcrm_settings' )); $options = array_filter(get_option( 'woocommerce_integration-retailcrm_settings' ));
if (!isset($options['uploads'])) { if (!isset($options['uploads'])) {

2
retailcrm/retailcrm.php
View File

@ -335,7 +335,7 @@ register_deactivation_hook( __FILE__, 'retailcrm_deactivation' );
if (in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option( 'active_plugins')))) { if (in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option( 'active_plugins')))) {
load_plugin_textdomain('wc_retailcrm', false, dirname(plugin_basename( __FILE__ )) . '/'); load_plugin_textdomain('wc_retailcrm', false, dirname(plugin_basename( __FILE__ )) . '/');
add_filter('cron_schedules', 'filter_cron_schedules', 10, 1); add_filter('cron_schedules', 'filter_cron_schedules', 10, 1);
add_action('woocommerce_thankyou', 'retailcrm_process_order', 10, 1); add_action('woocommerce_checkout_order_processed', 'retailcrm_process_order', 10, 1);
add_action('retailcrm_history', 'retailcrm_history_get'); add_action('retailcrm_history', 'retailcrm_history_get');
add_action('retailcrm_icml', 'generate_icml'); add_action('retailcrm_icml', 'generate_icml');
add_action('retailcrm_inventories', 'load_stocks'); add_action('retailcrm_inventories', 'load_stocks');