Merge remote-tracking branch 'upstream/master'
merge with upstream
This commit is contained in:
iyzoer
commit
23f7d426b7
3 changed files with 34 additions and 24 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
/nbproject/private/
|
||||
|
|
@ -26,7 +26,7 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
|
|||
if ( ! class_exists( 'WC_Retailcrm_Proxy' ) ) {
|
||||
include_once( __DIR__ . '/api/class-wc-retailcrm-proxy.php' );
|
||||
}
|
||||
|
||||
|
||||
$this->id = 'integration-retailcrm';
|
||||
$this->method_title = __( 'RetailCRM', 'woocommerce-integration-retailcrm' );
|
||||
$this->method_description = __( 'Интеграция с системой управления Retailcrm.', 'woocommerce-integration-retailcrm' );
|
||||
|
|
@ -141,7 +141,6 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
|
|||
}
|
||||
|
||||
$wc_payment = new WC_Payment_Gateways();
|
||||
$wc_payment_list = $wc_payment->get_available_payment_gateways();
|
||||
|
||||
$this->form_fields[] = array(
|
||||
'title' => __( 'Способы оплаты', 'woocommerce' ),
|
||||
|
|
@ -150,7 +149,7 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
|
|||
'id' => 'payment_options'
|
||||
);
|
||||
|
||||
foreach ( $wc_payment_list as $payment ) {
|
||||
foreach ( $wc_payment->payment_gateways as $payment ) {
|
||||
if ( isset( $payment->enabled ) && $payment->enabled == 'yes' ) {
|
||||
$key = $payment->id;
|
||||
$name = $key;
|
||||
|
|
@ -230,7 +229,7 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
|
|||
'description' => '',
|
||||
'id' => 'upload_options'
|
||||
);
|
||||
|
||||
|
||||
$this->form_fields['upload-button'] = array(
|
||||
'label' => 'Выгрузить',
|
||||
'title' => __( 'Выгрузка клиентов и заказов', 'woocommerce-integration-retailcrm' ),
|
||||
|
|
@ -283,12 +282,12 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
|
|||
);
|
||||
|
||||
$response = $api->deliveryTypesList();
|
||||
|
||||
|
||||
if (isset($response['errorMsg']) && $response['errorMsg'] == 'API method not found') {
|
||||
WC_Admin_Settings::add_error( esc_html__( '"Выбранная версия API недоступна"', 'woocommerce-integration-retailcrm' ) );
|
||||
} else {
|
||||
return $value;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function validate_api_url_field( $key, $value ) {
|
||||
|
|
@ -299,7 +298,7 @@ if ( ! class_exists( 'WC_Retailcrm_Base' ) ) :
|
|||
);
|
||||
|
||||
$response = $api->deliveryTypesList();
|
||||
|
||||
|
||||
if ($response == NULL) {
|
||||
WC_Admin_Settings::add_error( esc_html__( '"Введите корректный адрес CRM"', 'woocommerce-integration-retailcrm' ) );
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
$order_data['customer']['externalId'] = $search['customer']['externalId'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$res = $this->retailcrm->ordersCreate($order_data);
|
||||
}
|
||||
|
||||
|
|
@ -105,7 +105,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
|
||||
$response = $this->retailcrm->ordersEdit($address);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update order status
|
||||
*
|
||||
|
|
@ -158,7 +158,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update order payment
|
||||
*
|
||||
|
|
@ -181,7 +181,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
|
||||
$this->retailcrm->ordersPaymentsEdit($payment);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -234,7 +234,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
$shipping_cost = str_replace(',', '.', $shipping_cost);
|
||||
$order_data['delivery']['cost'] = $shipping_cost;
|
||||
}
|
||||
|
||||
|
||||
$response = $this->retailcrm->ordersEdit($order_data);
|
||||
}
|
||||
|
||||
|
|
@ -285,39 +285,49 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
|
||||
$status = $order->get_status();
|
||||
$order_data['status'] = $this->retailcrm_settings[$status];
|
||||
|
||||
|
||||
$user_data_billing = $order->get_address('billing');
|
||||
|
||||
if (!empty($user_data_billing)) {
|
||||
|
||||
if (!empty($user_data_billing['phone'])) $order_data['phone'] = $user_data_billing['phone'];
|
||||
if (!empty($user_data_billing['email'])) $order_data['email'] = $user_data_billing['email'];
|
||||
if (!empty($user_data_billing['first_name'])) $order_data['firstName'] = $user_data_billing['first_name'];
|
||||
if (!empty($user_data_billing['last_name'])) $order_data['lastName'] = $user_data_billing['last_name'];
|
||||
if (!empty($user_data_billing['postcode'])) $order_data['delivery']['address']['index'] = $user_data_billing['postcode'];
|
||||
if (!empty($user_data_billing['city'])) $order_data['delivery']['address']['city'] = $user_data_billing['city'];
|
||||
if (!empty($user_data_billing['country'])) $order_data['delivery']['address']['countryIso'] = $user_data_billing['country'];
|
||||
|
||||
}
|
||||
|
||||
$user_data = $order->get_address('shipping');
|
||||
|
||||
if (!empty($user_data)) {
|
||||
|
||||
if (!empty($user_data['phone'])) $order_data['phone'] = $user_data['phone'];
|
||||
if (!empty($user_data['email'])) $order_data['email'] = $user_data['email'];
|
||||
if (!empty($user_data['first_name'])) $order_data['firstName'] = $user_data['first_name'];
|
||||
if (!empty($user_data['last_name'])) $order_data['lastName'] = $user_data['last_name'];
|
||||
if (!empty($user_data['last_name'])) $order_data['lastName'] = $user_data['last_name'];
|
||||
if (!empty($user_data['postcode'])) $order_data['delivery']['address']['index'] = $user_data['postcode'];
|
||||
if (!empty($user_data['city'])) $order_data['delivery']['address']['city'] = $user_data['city'];
|
||||
if (!empty($user_data['country'])) $order_data['delivery']['address']['countryIso'] = $user_data['country'];
|
||||
|
||||
$order_data['delivery']['address']['text'] = sprintf(
|
||||
"%s %s %s %s",
|
||||
$user_data['postcode'],
|
||||
$user_data['city'],
|
||||
$user_data['address_1'],
|
||||
$user_data['address_2']
|
||||
);
|
||||
}
|
||||
|
||||
$order_data['delivery']['address']['text'] = sprintf(
|
||||
"%s %s %s %s",
|
||||
!empty($user_data_billing['postcode']) ? $user_data_billing['postcode'] : $user_data['postcode'],
|
||||
!empty($user_data_billing['city']) ? $user_data_billing['city'] : $user_data['city'],
|
||||
!empty($user_data_billing['address_1']) ? $user_data_billing['address_1'] : $user_data['address_1'],
|
||||
!empty($user_data_billing['address_2']) ? $user_data_billing['address_2'] : $user_data['address_2']
|
||||
);
|
||||
|
||||
$order_items = array();
|
||||
|
||||
foreach ($order->get_items() as $item) {
|
||||
$uid = ($item['variation_id'] > 0) ? $item['variation_id'] : $item['product_id'] ;
|
||||
$_product = wc_get_product($uid);
|
||||
|
||||
|
||||
if ($_product) {
|
||||
if ($this->retailcrm_settings['api_version'] != 'v3') {
|
||||
$order_item = array(
|
||||
|
|
@ -393,7 +403,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
$pay_date = $order->get_date_paid();
|
||||
$payment['paidAt'] = $pay_date->date('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
|
||||
$this->retailcrm->ordersPaymentCreate($payment);
|
||||
}
|
||||
|
||||
|
|
@ -410,4 +420,4 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
|
|||
}
|
||||
}
|
||||
}
|
||||
endif;
|
||||
endif;
|
||||
Loading…
Add table
Reference in a new issue