';
-
- // This was a callback request from service, get the token
- try {
- //var_dump($_GET['code']);
- //var_dump($state);
- //var_dump($apiService); // OAuth\OAuth2\Service\WordPress
-
- $token = $apiService->requestAccessToken($_GET['code'], $state);
- $storage->storeAccessToken('ECommerce_'.$siteId, $token);
-
-// $token = $apiService->refreshAccessToken($token);
-
- setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
- } catch (Exception $e) {
- setEventMessage($e->getMessage(), 'errors');
- }
-
- header('Location: ' . $backtourl);
- exit();
-}
-else // If entry on page with no parameter, we arrive here
-{
- $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
-
- // This may create record into oauth_state before the header redirect.
- // Creation of record with state in this tables depend on the Provider used (see its constructor).
- if (GETPOST('state'))
- {
- $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
- }
- else
- {
- $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
- }
-
- // we go on oauth provider authorization page
- header('Location: ' . $url);
- exit();
-}
-
-
-/*
- * View
- */
-
-// No view at all, just actions
-
-$db->close();
-
diff --git a/core/triggers/interface_90_modECommerceng_ECommerceng.class.php b/core/triggers/interface_90_modECommerceng_ECommerceng.class.php
index ee937c1..2a5aee3 100644
--- a/core/triggers/interface_90_modECommerceng_ECommerceng.class.php
+++ b/core/triggers/interface_90_modECommerceng_ECommerceng.class.php
@@ -437,6 +437,7 @@ function runTrigger($action,$object,$user,$langs,$conf)
if (!$error) {
//eCommerce update link
$eCommerceProduct->last_update = dol_print_date($now, '%Y-%m-%d %H:%M:%S');
+ if ($site->stock_sync_direction == 'dolibarr2ecommerce') $eCommerceProduct->last_update_stock = $eCommerceProduct->last_update;
if ($eCommerceProduct->update($user) < 0) {
$error++;
$error_msg = $langs->trans('ECommerceUpdateRemoteProductLink', $object->id, $site->name, $eCommerceProduct->error);
@@ -485,6 +486,7 @@ function runTrigger($action,$object,$user,$langs,$conf)
if (!$error) {
// Create remote link
$eCommerceProduct->last_update = dol_print_date($now, '%Y-%m-%d %H:%M:%S');
+ if ($site->stock_sync_direction == 'dolibarr2ecommerce') $eCommerceProduct->last_update_stock = $eCommerceProduct->last_update;
$eCommerceProduct->fk_product = $object->id;
$eCommerceProduct->fk_site = $site->id;
$eCommerceProduct->remote_id = $remote_id;
@@ -1012,114 +1014,6 @@ function runTrigger($action,$object,$user,$langs,$conf)
}
}
-
- // Stock Movement
- if ($action == 'STOCK_MOVEMENT') {
- if ($object->element != 'stockmouvement') {
- $error_msg = "Trigger : Object element (" . $object->element . ") is not a stockmouvement for the action " . $action;
- dol_syslog($error_msg, LOG_ERR);
- $this->errors[] = $error_msg;
- return -1;
- }
- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
-
- $this->db->begin();
-
- $save_entity = $conf->entity;
- $stopwatch_id = eCommerceUtils::startAndLogStopwatch(__METHOD__ . " - Action {$action} (ID: {$object->id})");
-
- $eCommerceSite = new eCommerceSite($this->db);
- $sites = $eCommerceSite->listSites('object');
- $entities = explode(',', getEntity('stock'));
-
- foreach ($sites as $site) {
- if ($object->context['fromsyncofecommerceid'] && $object->context['fromsyncofecommerceid'] == $site->id) {
- dol_syslog("Triggers was ran from a create/update to sync from ecommerce to dolibarr, so we won't run code to sync from dolibarr to ecommerce");
- continue;
- }
-
- if (!in_array($site->entity, $entities)) {
- dol_syslog("Site '{$site->name}' not in the shared entities");
- continue;
- }
-
- try {
- $supported_warehouses = is_array($site->parameters['fk_warehouse_to_ecommerce']) ? $site->parameters['fk_warehouse_to_ecommerce'] : array();
-
- // Do we sync the stock ?
- if (!$error && $site->stock_sync_direction == 'dolibarr2ecommerce' && in_array($object->entrepot_id, $supported_warehouses)) {
- $site->setEntityValues($site->entity);
-
- $eCommerceProduct = new eCommerceProduct($this->db);
- $eCommerceProduct->fetchByProductId($object->product_id, $site->id);
-
- // Get new qty. We read stock_reel of product. Trigger is called after creating movement and updating table product, so we get total after move.
- $dbProduct = new Product($this->db);
- $dbProduct->fetch($object->product_id);
- $dbProduct->load_stock();
-
- $object->qty_after = 0;
- foreach ($supported_warehouses as $warehouse_id) {
- $object->qty_after += isset($dbProduct->stock_warehouse[$warehouse_id]->real) ? $dbProduct->stock_warehouse[$warehouse_id]->real : 0;
- }
-
- if ($eCommerceProduct->remote_id > 0) {
- // Connect to magento
- $eCommerceSynchro = new eCommerceSynchro($this->db, $site);
- dol_syslog("Trigger " . $action . " try to connect to eCommerce site " . $site->name);
- $eCommerceSynchro->connect();
- if (count($eCommerceSynchro->errors)) {
- $error++;
- $object->errors[] = $eCommerceSynchro->errorsToString();
- setEventMessages($eCommerceSynchro->error, $eCommerceSynchro->errors, 'errors');
- }
-
- if (!$error) {
- $result = $eCommerceSynchro->eCommerceRemoteAccess->updateRemoteStockProduct($eCommerceProduct->remote_id, $object, $dbProduct);
- $now = dol_now();
- if (!$result) {
- $error++;
- $this->errors[] = $eCommerceSynchro->eCommerceRemoteAccess->error;
- $object->errors = array_merge($this->errors, $eCommerceSynchro->eCommerceRemoteAccess->errors);
- }
- }
-
- if (!$error) {
- //eCommerce update link
- $eCommerceProduct->last_update = dol_print_date($now, '%Y-%m-%d %H:%M:%S');
- if ($eCommerceProduct->update($user) < 0) {
- $error++;
- $error_msg = $langs->trans('ECommerceUpdateRemoteProductLink', $object->id, $site->name, $eCommerceProduct->error);
- $this->errors[] = $error_msg;
- $object->errors = array_merge($this->errors, $eCommerceProduct->errors);
- dol_syslog(__METHOD__ . ': Error:' . $error_msg, LOG_WARNING);
- }
- }
- } else {
- dol_syslog("Product with id " . $object->id . " is not linked to an ecommerce record and does not has category flag to push on eCommerce.");
- }
- }
- } catch (Exception $e) {
- $error++;
- $object->errors[] = 'Trigger exception : ' . $e->getMessage();
- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id . " " . 'Trigger exception : ' . $e->getMessage());
- break;
- }
- }
-
- eCommerceUtils::stopAndLogStopwatch($stopwatch_id);
- if (isset($site)) $site->setEntityValues($save_entity);
-
- if ($error) {
- $this->errors[] = 'Product ID: ' . $object->product_id;
- $this->db->rollback();
- return -1;
- } else {
- $this->db->commit();
- return 1;
- }
- }
-
return 0;
}
}
diff --git a/includes/CurlClientEx.php b/includes/CurlClientEx.php
deleted file mode 100644
index a216fc7..0000000
--- a/includes/CurlClientEx.php
+++ /dev/null
@@ -1,157 +0,0 @@
- value` pairs) to be passed to `curl_setopt`
- *
- * @var array
- */
- private $parameters = array();
-
- /**
- * Additional `curl_setopt` parameters
- *
- * @param array $parameters
- */
- public function setCurlParameters(array $parameters)
- {
- $this->parameters = $parameters;
- }
-
- /**
- * @param bool $buildHttpQuery
- */
- public function setHttpPostBuildQuery($buildHttpQuery)
- {
- $this->httpPostBuildQuery = $buildHttpQuery;
- }
-
- /**
- * @param bool $force
- *
- * @return CurlClientEx
- */
- public function setForceSSL3($force)
- {
- $this->forceSSL3 = $force;
-
- return $this;
- }
-
- /**
- * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
- * They should return, in string form, the response body and throw an exception on error.
- *
- * @param UriInterface $endpoint
- * @param mixed $requestBody
- * @param array $extraHeaders
- * @param string $method
- *
- * @return string
- *
- * @throws TokenResponseException
- * @throws \InvalidArgumentException
- */
- public function retrieveResponse(
- UriInterface $endpoint,
- $requestBody,
- array $extraHeaders = array(),
- $method = 'POST'
- ) {
- // Normalize method name
- $method = strtoupper($method);
-
- $this->normalizeHeaders($extraHeaders);
-
- if ($method === 'GET' && !empty($requestBody)) {
- throw new \InvalidArgumentException('No body expected for "GET" request.');
- }
-
- if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
- $extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
- }
-
- $extraHeaders['Host'] = 'Host: '.$endpoint->getHost();
- $extraHeaders['Connection'] = 'Connection: close';
-
- $ch = curl_init();
-
- curl_setopt($ch, CURLOPT_URL, $endpoint->getAbsoluteUri());
-
- if ($method === 'POST' || $method === 'PUT') {
- if ($requestBody && is_array($requestBody) && $this->httpPostBuildQuery) {
- $requestBody = http_build_query($requestBody, '', '&');
- }
-
- if ($method === 'PUT') {
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
- } else {
- curl_setopt($ch, CURLOPT_POST, true);
- }
-
- curl_setopt($ch, CURLOPT_POSTFIELDS, $requestBody);
- } else {
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
- }
-
- if ($this->maxRedirects > 0) {
- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
- curl_setopt($ch, CURLOPT_MAXREDIRS, $this->maxRedirects);
- }
-
- curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_HEADER, false);
- curl_setopt($ch, CURLOPT_HTTPHEADER, $extraHeaders);
- curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
-
- foreach ($this->parameters as $key => $value) {
- curl_setopt($ch, $key, $value);
- }
-
- if ($this->forceSSL3) {
- curl_setopt($ch, CURLOPT_SSLVERSION, 3);
- }
-
- $response = curl_exec($ch);
- $responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
- if (false === $response) {
- $errNo = curl_errno($ch);
- $errStr = curl_error($ch);
- curl_close($ch);
- if (empty($errStr)) {
- throw new TokenResponseException('Failed to request resource.', $responseCode);
- }
- throw new TokenResponseException('cURL Error # '.$errNo.': '.$errStr, $responseCode);
- }
-
- curl_close($ch);
-
- return $response;
- }
-}
diff --git a/includes/WooCommerce/Client.php b/includes/WooCommerce/Client.php
deleted file mode 100644
index cc5a249..0000000
--- a/includes/WooCommerce/Client.php
+++ /dev/null
@@ -1,109 +0,0 @@
-http = new HttpClient($url, $consumerKey, $consumerSecret, $options);
- }
-
- /**
- * POST method.
- *
- * @param string $endpoint API endpoint.
- * @param array $data Request data.
- *
- * @return array
- */
- public function post($endpoint, $data)
- {
- return $this->http->request($endpoint, 'POST', $data);
- }
-
- /**
- * PUT method.
- *
- * @param string $endpoint API endpoint.
- * @param array $data Request data.
- *
- * @return array
- */
- public function put($endpoint, $data)
- {
- return $this->http->request($endpoint, 'PUT', $data);
- }
-
- /**
- * GET method.
- *
- * @param string $endpoint API endpoint.
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- public function get($endpoint, $parameters = [])
- {
- return $this->http->request($endpoint, 'GET', [], $parameters);
- }
-
- /**
- * DELETE method.
- *
- * @param string $endpoint API endpoint.
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- public function delete($endpoint, $parameters = [])
- {
- return $this->http->request($endpoint, 'DELETE', [], $parameters);
- }
-
- /**
- * OPTIONS method.
- *
- * @param string $endpoint API endpoint.
- *
- * @return array
- */
- public function options($endpoint)
- {
- return $this->http->request($endpoint, 'OPTIONS', [], []);
- }
-}
diff --git a/includes/WooCommerce/HttpClient/BasicAuth.php b/includes/WooCommerce/HttpClient/BasicAuth.php
deleted file mode 100644
index f831cd6..0000000
--- a/includes/WooCommerce/HttpClient/BasicAuth.php
+++ /dev/null
@@ -1,95 +0,0 @@
-ch = $ch;
- $this->consumerKey = $consumerKey;
- $this->consumerSecret = $consumerSecret;
- $this->doQueryString = $doQueryString;
- $this->parameters = $parameters;
-
- $this->processAuth();
- }
-
- /**
- * Process auth.
- */
- protected function processAuth()
- {
- if ($this->doQueryString) {
- $this->parameters['consumer_key'] = $this->consumerKey;
- $this->parameters['consumer_secret'] = $this->consumerSecret;
- } else {
- \curl_setopt($this->ch, CURLOPT_USERPWD, $this->consumerKey . ':' . $this->consumerSecret);
- }
- }
-
- /**
- * Get parameters.
- *
- * @return array
- */
- public function getParameters()
- {
- return $this->parameters;
- }
-}
diff --git a/includes/WooCommerce/HttpClient/HttpClient.php b/includes/WooCommerce/HttpClient/HttpClient.php
deleted file mode 100644
index c1f90ad..0000000
--- a/includes/WooCommerce/HttpClient/HttpClient.php
+++ /dev/null
@@ -1,444 +0,0 @@
-options = new Options($options);
- $this->url = $this->buildApiUrl($url);
- $this->consumerKey = $consumerKey;
- $this->consumerSecret = $consumerSecret;
- }
-
- /**
- * Check if is under SSL.
- *
- * @return bool
- */
- protected function isSsl()
- {
- return 'https://' === \substr($this->url, 0, 8);
- }
-
- /**
- * Build API URL.
- *
- * @param string $url Store URL.
- *
- * @return string
- */
- protected function buildApiUrl($url)
- {
- $api = $this->options->isWPAPI() ? $this->options->apiPrefix() : '/wc-api/';
-
- return \rtrim($url, '/') . $api . $this->options->getVersion() . '/';
- }
-
- /**
- * Build URL.
- *
- * @param string $url URL.
- * @param array $parameters Query string parameters.
- *
- * @return string
- */
- protected function buildUrlQuery($url, $parameters = [])
- {
- if (!empty($parameters)) {
- $url .= '?' . \http_build_query($parameters);
- }
-
- return $url;
- }
-
- /**
- * Authenticate.
- *
- * @param string $url Request URL.
- * @param string $method Request method.
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- protected function authenticate($url, $method, $parameters = [])
- {
- // Setup authentication.
- if ($this->isSsl()) {
- $basicAuth = new BasicAuth(
- $this->ch,
- $this->consumerKey,
- $this->consumerSecret,
- $this->options->isQueryStringAuth(),
- $parameters
- );
- $parameters = $basicAuth->getParameters();
- } else {
- $oAuth = new OAuth(
- $url,
- $this->consumerKey,
- $this->consumerSecret,
- $this->options->getVersion(),
- $method,
- $parameters,
- $this->options->oauthTimestamp()
- );
- $parameters = $oAuth->getParameters();
- }
-
- return $parameters;
- }
-
- /**
- * Setup method.
- *
- * @param string $method Request method.
- */
- protected function setupMethod($method)
- {
- if ('POST' == $method) {
- \curl_setopt($this->ch, CURLOPT_POST, true);
- } elseif (\in_array($method, ['PUT', 'DELETE', 'OPTIONS'])) {
- \curl_setopt($this->ch, CURLOPT_CUSTOMREQUEST, $method);
- }
- }
-
- /**
- * Get request headers.
- *
- * @param bool $sendData If request send data or not.
- *
- * @return array
- */
- protected function getRequestHeaders($sendData = false)
- {
- $headers = [
- 'Accept' => 'application/json',
- 'User-Agent' => $this->options->userAgent() . '/' . Client::VERSION,
- ];
-
- if ($sendData) {
- $headers['Content-Type'] = 'application/json;charset=utf-8';
- }
-
- return $headers;
- }
-
- /**
- * Create request.
- *
- * @param string $endpoint Request endpoint.
- * @param string $method Request method.
- * @param array $data Request data.
- * @param array $parameters Request parameters.
- *
- * @return Request
- */
- protected function createRequest($endpoint, $method, $data = [], $parameters = [])
- {
- $body = '';
- $url = $this->url . $endpoint;
- $hasData = !empty($data);
-
- // Setup authentication.
- $parameters = $this->authenticate($url, $method, $parameters);
-
- // Setup method.
- $this->setupMethod($method);
-
- // Include post fields.
- if ($hasData) {
- $body = \json_encode($data);
- \curl_setopt($this->ch, CURLOPT_POSTFIELDS, $body);
- }
-
- $this->request = new Request(
- $this->buildUrlQuery($url, $parameters),
- $method,
- $parameters,
- $this->getRequestHeaders($hasData),
- $body
- );
-
- return $this->getRequest();
- }
-
- /**
- * Get response headers.
- *
- * @return array
- */
- protected function getResponseHeaders()
- {
- $headers = [];
- $lines = \explode("\n", $this->responseHeaders);
- $lines = \array_filter($lines, 'trim');
-
- foreach ($lines as $index => $line) {
- // Remove HTTP/xxx params.
- if (strpos($line, ': ') === false) {
- continue;
- }
-
- list($key, $value) = \explode(': ', $line);
-
- $headers[$key] = isset($headers[$key]) ? $headers[$key] . ', ' . trim($value) : trim($value);
- }
-
- return $headers;
- }
-
- /**
- * Create response.
- *
- * @return Response
- */
- protected function createResponse()
- {
-
- // Set response headers.
- $this->responseHeaders = '';
- \curl_setopt($this->ch, CURLOPT_HEADERFUNCTION, function ($_, $headers) {
- $this->responseHeaders .= $headers;
- return \strlen($headers);
- });
-
- // Get response data.
- $body = \curl_exec($this->ch);
- $code = \curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
- $headers = $this->getResponseHeaders();
-
- // Register response.
- $this->response = new Response($code, $headers, $body);
-
- return $this->getResponse();
- }
-
- /**
- * Set default cURL settings.
- */
- protected function setDefaultCurlSettings()
- {
- $verifySsl = $this->options->verifySsl();
- $timeout = $this->options->getTimeout();
- $followRedirects = $this->options->getFollowRedirects();
-
- \curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, $verifySsl);
- if (!$verifySsl) {
- \curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, $verifySsl);
- }
- if ($followRedirects) {
- \curl_setopt($this->ch, CURLOPT_FOLLOWLOCATION, true);
- }
- \curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, $timeout);
- \curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
- \curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
- \curl_setopt($this->ch, CURLOPT_HTTPHEADER, $this->request->getRawHeaders());
- \curl_setopt($this->ch, CURLOPT_URL, $this->request->getUrl());
- }
-
- /**
- * Look for errors in the request.
- *
- * @param array $parsedResponse Parsed body response.
- */
- protected function lookForErrors($parsedResponse)
- {
- // Any non-200/201/202 response code indicates an error.
- if (!\in_array($this->response->getCode(), ['200', '201', '202'])) {
- $errors = isset($parsedResponse->errors) ? $parsedResponse->errors : $parsedResponse;
- $errorMessage = '';
- $errorCode = '';
-
- if (is_array($errors)) {
- $errorMessage = $errors[0]->message;
- $errorCode = $errors[0]->code;
- } elseif (isset($errors->message, $errors->code)) {
- $errorMessage = $errors->message;
- $errorCode = $errors->code;
- }
-
- throw new HttpClientException(
- \sprintf('Error: %s [%s]', $errorMessage, $errorCode),
- $this->response->getCode(),
- $this->request,
- $this->response
- );
- }
- }
-
- /**
- * Process response.
- *
- * @return array
- */
- protected function processResponse()
- {
- $body = $this->response->getBody();
-
- // Look for UTF-8 BOM and remove.
- if (0 === strpos(bin2hex(substr($body, 0, 4)), 'efbbbf')) {
- $body = substr($body, 3);
- }
-
- $parsedResponse = \json_decode($body);
-
- // Test if return a valid JSON.
- if (JSON_ERROR_NONE !== json_last_error()) {
- $message = function_exists('json_last_error_msg') ? json_last_error_msg() : 'Invalid JSON returned';
- throw new HttpClientException(
- sprintf('JSON ERROR: %s', $message),
- $this->response->getCode(),
- $this->request,
- $this->response
- );
- }
-
- $this->lookForErrors($parsedResponse);
-
- return $parsedResponse;
- }
-
- /**
- * Make requests.
- *
- * @param string $endpoint Request endpoint.
- * @param string $method Request method.
- * @param array $data Request data.
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- public function request($endpoint, $method, $data = [], $parameters = [])
- {
- // Initialize cURL.
- $this->ch = \curl_init();
-
- // Set request args.
- $request = $this->createRequest($endpoint, $method, $data, $parameters);
-
- // Default cURL settings.
- $this->setDefaultCurlSettings();
-
- // Get response.
- $response = $this->createResponse();
-
- // Check for cURL errors.
- if (\curl_errno($this->ch)) {
- throw new HttpClientException('cURL Error: ' . \curl_error($this->ch), 0, $request, $response);
- }
-
- \curl_close($this->ch);
-
- return $this->processResponse();
- }
-
- /**
- * Get request data.
- *
- * @return Request
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- /**
- * Get response data.
- *
- * @return Response
- */
- public function getResponse()
- {
- return $this->response;
- }
-}
diff --git a/includes/WooCommerce/HttpClient/HttpClientException.php b/includes/WooCommerce/HttpClient/HttpClientException.php
deleted file mode 100644
index ef11a6b..0000000
--- a/includes/WooCommerce/HttpClient/HttpClientException.php
+++ /dev/null
@@ -1,70 +0,0 @@
-request = $request;
- $this->response = $response;
- }
-
- /**
- * Get request data.
- *
- * @return Request
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- /**
- * Get response data.
- *
- * @return Response
- */
- public function getResponse()
- {
- return $this->response;
- }
-}
diff --git a/includes/WooCommerce/HttpClient/OAuth.php b/includes/WooCommerce/HttpClient/OAuth.php
deleted file mode 100644
index b3c67a9..0000000
--- a/includes/WooCommerce/HttpClient/OAuth.php
+++ /dev/null
@@ -1,268 +0,0 @@
-url = $url;
- $this->consumerKey = $consumerKey;
- $this->consumerSecret = $consumerSecret;
- $this->apiVersion = $apiVersion;
- $this->method = $method;
- $this->parameters = $parameters;
- $this->timestamp = $timestamp;
- }
-
- /**
- * Encode according to RFC 3986.
- *
- * @param string|array $value Value to be normalized.
- *
- * @return string
- */
- protected function encode($value)
- {
- if (is_array($value)) {
- return array_map([$this, 'encode'], $value);
- } else {
- return str_replace(['+', '%7E'], [' ', '~'], rawurlencode($value));
- }
- }
-
- /**
- * Normalize parameters.
- *
- * @param array $parameters Parameters to normalize.
- *
- * @return array
- */
- protected function normalizeParameters($parameters)
- {
- $normalized = [];
-
- foreach ($parameters as $key => $value) {
- // Percent symbols (%) must be double-encoded.
- $key = $this->encode($key);
- $value = $this->encode($value);
-
- $normalized[$key] = $value;
- }
-
- return $normalized;
- }
-
- /**
- * Process filters.
- *
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- protected function processFilters($parameters)
- {
- if (isset($parameters['filter'])) {
- $filters = $parameters['filter'];
- unset($parameters['filter']);
- foreach ($filters as $filter => $value) {
- $parameters['filter[' . $filter . ']'] = $value;
- }
- }
-
- return $parameters;
- }
-
- /**
- * Get secret.
- *
- * @return string
- */
- protected function getSecret()
- {
- $secret = $this->consumerSecret;
-
- // Fix secret for v3 or later.
- if (!\in_array($this->apiVersion, ['v1', 'v2'])) {
- $secret .= '&';
- }
-
- return $secret;
- }
-
- /**
- * Generate oAuth1.0 signature.
- *
- * @param array $parameters Request parameters including oauth.
- *
- * @return string
- */
- protected function generateOauthSignature($parameters)
- {
- $baseRequestUri = \rawurlencode($this->url);
-
- // Extract filters.
- $parameters = $this->processFilters($parameters);
-
- // Normalize parameter key/values and sort them.
- $parameters = $this->normalizeParameters($parameters);
- \uksort($parameters, 'strcmp');
-
- // Set query string.
- $queryString = \implode('%26', $this->joinWithEqualsSign($parameters)); // Join with ampersand.
- $stringToSign = $this->method . '&' . $baseRequestUri . '&' . $queryString;
- $secret = $this->getSecret();
-
- return \base64_encode(\hash_hmac(self::HASH_ALGORITHM, $stringToSign, $secret, true));
- }
-
- /**
- * Creates an array of urlencoded strings out of each array key/value pairs.
- *
- * @param array $params Array of parameters to convert.
- * @param array $queryParams Array to extend.
- * @param string $key Optional Array key to append
- * @return string Array of urlencoded strings
- */
- protected function joinWithEqualsSign($params, $queryParams = [], $key = '')
- {
- foreach ($params as $paramKey => $paramValue) {
- if ($key) {
- $paramKey = $key . '%5B' . $paramKey . '%5D'; // Handle multi-dimensional array.
- }
-
- if (is_array($paramValue)) {
- $queryParams = $this->joinWithEqualsSign($paramValue, $queryParams, $paramKey);
- } else {
- $string = $paramKey . '=' . $paramValue; // Join with equals sign.
- $queryParams[] = $this->encode($string);
- }
- }
-
- return $queryParams;
- }
-
- /**
- * Sort parameters.
- *
- * @param array $parameters Parameters to sort in byte-order.
- *
- * @return array
- */
- protected function getSortedParameters($parameters)
- {
- \uksort($parameters, 'strcmp');
-
- foreach ($parameters as $key => $value) {
- if (\is_array($value)) {
- \uksort($parameters[$key], 'strcmp');
- }
- }
-
- return $parameters;
- }
-
- /**
- * Get oAuth1.0 parameters.
- *
- * @return string
- */
- public function getParameters()
- {
- $parameters = \array_merge($this->parameters, [
- 'oauth_consumer_key' => $this->consumerKey,
- 'oauth_timestamp' => $this->timestamp,
- 'oauth_nonce' => \sha1(\microtime()),
- 'oauth_signature_method' => 'HMAC-' . self::HASH_ALGORITHM,
- ]);
-
- // The parameters above must be included in the signature generation.
- $parameters['oauth_signature'] = $this->generateOauthSignature($parameters);
-
- return $this->getSortedParameters($parameters);
- }
-}
diff --git a/includes/WooCommerce/HttpClient/Options.php b/includes/WooCommerce/HttpClient/Options.php
deleted file mode 100644
index faf86dd..0000000
--- a/includes/WooCommerce/HttpClient/Options.php
+++ /dev/null
@@ -1,148 +0,0 @@
-options = $options;
- }
-
- /**
- * Get API version.
- *
- * @return string
- */
- public function getVersion()
- {
- return isset($this->options['version']) ? $this->options['version'] : self::VERSION;
- }
-
- /**
- * Check if need to verify SSL.
- *
- * @return bool
- */
- public function verifySsl()
- {
- return isset($this->options['verify_ssl']) ? (bool) $this->options['verify_ssl'] : true;
- }
-
- /**
- * Get timeout.
- *
- * @return int
- */
- public function getTimeout()
- {
- return isset($this->options['timeout']) ? (int) $this->options['timeout'] : self::TIMEOUT;
- }
-
- /**
- * Basic Authentication as query string.
- * Some old servers are not able to use CURLOPT_USERPWD.
- *
- * @return bool
- */
- public function isQueryStringAuth()
- {
- return isset($this->options['query_string_auth']) ? (bool) $this->options['query_string_auth'] : false;
- }
-
- /**
- * Check if is WP REST API.
- *
- * @return bool
- */
- public function isWPAPI()
- {
- return isset($this->options['wp_api']) ? (bool) $this->options['wp_api'] : true;
- }
-
- /**
- * Custom API Prefix for WP API.
- *
- * @return string
- */
- public function apiPrefix()
- {
- return isset($this->options['wp_api_prefix']) ? $this->options['wp_api_prefix'] : self::WP_API_PREFIX;
- }
-
- /**
- * oAuth timestamp.
- *
- * @return string
- */
- public function oauthTimestamp()
- {
- return isset($this->options['oauth_timestamp']) ? $this->options['oauth_timestamp'] : \time();
- }
-
- /**
- * Custom user agent.
- *
- * @return string
- */
- public function userAgent()
- {
- return isset($this->options['user_agent']) ? $this->options['user_agent'] : self::USER_AGENT;
- }
-
- /**
- * Get follow redirects
- *
- * @return bool
- */
- public function getFollowRedirects()
- {
- return isset($this->options['follow_redirects']) ? (bool) $this->options['follow_redirects'] : false;
- }
-}
diff --git a/includes/WooCommerce/HttpClient/Request.php b/includes/WooCommerce/HttpClient/Request.php
deleted file mode 100644
index 9c22fc5..0000000
--- a/includes/WooCommerce/HttpClient/Request.php
+++ /dev/null
@@ -1,187 +0,0 @@
-url = $url;
- $this->method = $method;
- $this->parameters = $parameters;
- $this->headers = $headers;
- $this->body = $body;
- }
-
- /**
- * Set url.
- *
- * @param string $url Request url.
- */
- public function setUrl($url)
- {
- $this->url = $url;
- }
-
- /**
- * Set method.
- *
- * @param string $method Request method.
- */
- public function setMethod($method)
- {
- $this->method = $method;
- }
-
- /**
- * Set parameters.
- *
- * @param array $parameters Request paramenters.
- */
- public function setParameters($parameters)
- {
- $this->parameters = $parameters;
- }
-
- /**
- * Set headers.
- *
- * @param array $headers Request headers.
- */
- public function setHeaders($headers)
- {
- $this->headers = $headers;
- }
-
- /**
- * Set body.
- *
- * @param string $body Request body.
- */
- public function setBody($body)
- {
- $this->body = $body;
- }
-
- /**
- * Get url.
- *
- * @return string
- */
- public function getUrl()
- {
- return $this->url;
- }
-
- /**
- * Get method.
- *
- * @return string
- */
- public function getMethod()
- {
- return $this->method;
- }
-
- /**
- * Get parameters.
- *
- * @return array
- */
- public function getParameters()
- {
- return $this->parameters;
- }
-
- /**
- * Get headers.
- *
- * @return array
- */
- public function getHeaders()
- {
- return $this->headers;
- }
-
- /**
- * Get raw headers.
- *
- * @return array
- */
- public function getRawHeaders()
- {
- $headers = [];
-
- foreach ($this->headers as $key => $value) {
- $headers[] = $key . ': ' . $value;
- }
-
- return $headers;
- }
-
- /**
- * Get body.
- *
- * @return string
- */
- public function getBody()
- {
- return $this->body;
- }
-}
diff --git a/includes/WooCommerce/HttpClient/Response.php b/includes/WooCommerce/HttpClient/Response.php
deleted file mode 100644
index 15f7f41..0000000
--- a/includes/WooCommerce/HttpClient/Response.php
+++ /dev/null
@@ -1,113 +0,0 @@
-code = $code;
- $this->headers = $headers;
- $this->body = $body;
- }
-
- /**
- * Set code.
- *
- * @param int $code Response code.
- */
- public function setCode($code)
- {
- $this->code = (int) $code;
- }
-
- /**
- * Set headers.
- *
- * @param array $headers Response headers.
- */
- public function setHeaders($headers)
- {
- $this->headers = $headers;
- }
-
- /**
- * Set body.
- *
- * @param string $body Response body.
- */
- public function setBody($body)
- {
- $this->body = $body;
- }
-
- /**
- * Get code.
- *
- * @return int
- */
- public function getCode()
- {
- return $this->code;
- }
-
- /**
- * Get headers.
- *
- * @return array $headers Response headers.
- */
- public function getHeaders()
- {
- return $this->headers;
- }
-
- /**
- * Get body.
- *
- * @return string $body Response body.
- */
- public function getBody()
- {
- return $this->body;
- }
-}
diff --git a/includes/WordPressClient.php b/includes/WordPressClient.php
deleted file mode 100644
index 212a703..0000000
--- a/includes/WordPressClient.php
+++ /dev/null
@@ -1,251 +0,0 @@
-errors = array();
-
- // Token storage
- $this->storage = new DoliStorage($db, $conf);
-
- // Setup the credentials for the requests
- $this->credentials = new Credentials(
- $oauth_id,
- $oauth_secret,
- $callbackUrl
- );
-
- // Setup the api service
- $this->baseApiUri = $baseApiUri.(substr($baseApiUri, -1, 1)!='/'?'/':'').'wp-json/wp/v2';
- $serviceFactory = new \OAuth\ServiceFactory();
- $this->httpClient = new CurlClientEx();
- $serviceFactory->setHttpClient($this->httpClient);
- $this->apiService = $serviceFactory->createService(self::OAUTH_SERVICENAME_WORDPRESS, $this->credentials, $this->storage, array(), new Uri($baseApiUri));
- }
-
- /**
- * POST method.
- *
- * @param string $endpoint API endpoint.
- * @param array $data Request data.
- *
- * @return array
- */
- public function post($endpoint, $data)
- {
- $this->errors = array();
- return $this->request($endpoint, 'POST', $data);
- }
-
- /**
- * POST media method.
- *
- * @param string $endpoint API endpoint.
- * @param string $filepath File path.
- * @param array $data Request data.
- *
- * @return array
- */
- public function postmedia($endpoint, $filepath, $data)
- {
- $responseData = null;
- $this->errors = array();
-
- // Set File
- if (file_exists($filepath)) {
- if (function_exists('curl_file_create')) { // php 5.5+
- $cFile = curl_file_create($filepath);
- } else {
- $cFile = '@' . realpath($filepath);
- }
- $data['file'] = $cFile;
- } else {
- $this->errors[] = array('File not found ("'.$filepath.'").');
- return $responseData;
- }
-
- $extraHeaders = array("Content-Type" => "multipart/form-data");
-
- return $this->request($endpoint, 'POST', $data, $extraHeaders);
- }
-
- /**
- * PUT method.
- *
- * @param string $endpoint API endpoint.
- * @param array $data Request data.
- *
- * @return array
- */
- public function put($endpoint, $data)
- {
- $this->errors = array();
- return $this->request($endpoint, 'PUT', $data);
- }
-
- /**
- * GET method.
- *
- * @param string $endpoint API endpoint.
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- public function get($endpoint, $parameters = [])
- {
- $this->errors = array();
- return $this->request($endpoint, 'GET', $parameters);
- }
-
- /**
- * DELETE method.
- *
- * @param string $endpoint API endpoint.
- * @param array $parameters Request parameters.
- *
- * @return array
- */
- public function delete($endpoint, $parameters = [])
- {
- $this->errors = array();
- return $this->request($endpoint, 'DELETE', $parameters);
- }
-
- /**
- * OPTIONS method.
- *
- * @param string $endpoint API endpoint.
- *
- * @return array
- */
- public function options($endpoint)
- {
- $this->errors = array();
- return $this->request($endpoint, 'OPTIONS');
- }
-
- /**
- * Request.
- *
- * @param string $endpoint API endpoint.
- * @param string $method HTTP method
- * @param array $body Request body if applicable (an associative array will
- * automatically be converted into a urlencoded body)
- * @param array $extraHeaders Extra headers if applicable. These will override service-specific
- * any defaults.
- * @return array
- */
- public function request($endpoint, $method, $body = [], $extraHeaders = [])
- {
- $responseData = null;
-
- // Check if we have auth token
- try {
- $token = $this->storage->retrieveAccessToken(self::OAUTH_SERVICENAME_WORDPRESS);
- } catch (Exception $e) {
- $this->errors[] = $e->getMessage();
- return $responseData;
- }
-
- // Is token expired or will token expire in the next 30 seconds
- $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-
- // Token expired so we refresh it
- if ($expire) {
- try {
- $this->httpClient->setHttpPostBuildQuery(true);
- $token = $this->apiService->refreshAccessToken($token);
- } catch (Exception $e) {
- $this->errors[] = $e->getMessage();
- return $responseData;
- }
- }
-
- // Send a request with api
- try {
- $this->httpClient->setHttpPostBuildQuery(false);
- $response = $this->apiService->request($this->baseApiUri.(substr($this->baseApiUri, -1, 1)!='/'?'/':'').$endpoint, $method, $body, $extraHeaders);
- $responseData = json_decode($response, true);
- } catch (Exception $e) {
- $this->errors[] = $e->getMessage();
- }
-
- return $responseData;
- }
-}
diff --git a/includes/oauth-subscriber-woocommerce b/includes/oauth-subscriber-woocommerce
new file mode 160000
index 0000000..fd04b27
--- /dev/null
+++ b/includes/oauth-subscriber-woocommerce
@@ -0,0 +1 @@
+Subproject commit fd04b277ad9ab6a9cc4d937d6b479bab5a95a8bf
diff --git a/js/form.js b/js/form.js
index 3d8c613..6b75f80 100644
--- a/js/form.js
+++ b/js/form.js
@@ -1,57 +1,34 @@
-function eCommerceSubmitForm(id_form)
-{
- document.getElementById(id_form).submit();
-}
-
-function eCommerceConfirmDelete(id_form, confirmation)
-{
- if (confirm(confirmation))
- {
- document.getElementById(id_form+'_action').value = 'delete';
- eCommerceSubmitForm(id_form);
- }
-}
-
-function eCommerceConfirmWoocommerceUpdateAttributes(id_form, confirmation)
-{
- if (confirm(confirmation))
- {
- document.getElementById(id_form+'_action').value = 'update_woocommerce_attribute';
- eCommerceSubmitForm(id_form);
- }
-}
-
-function eCommerceConfirmWoocommerceUpdateDictTaxClass(id_form, confirmation)
-{
- if (confirm(confirmation))
- {
- document.getElementById(id_form+'_action').value = 'update_woocommerce_tax_class';
- eCommerceSubmitForm(id_form);
- }
-}
-
-function eCommerceConfirmUpdatePaymentGateways(id_form, confirmation)
-{
- if (confirm(confirmation))
- {
- document.getElementById(id_form+'_action').value = 'update_payment_gateways';
- eCommerceSubmitForm(id_form);
- }
-}
+jQuery(document).ready(function (){
+ var ef_crp_all = $('.ef_crp_all');
-function eCommerceConfirmUpdatePriceLevel(id_form, confirmation, price_level)
-{
- jQuery('#'+id_form).on('submit', function(e) {
- var current_price_level = jQuery('#'+id_form+' select[name="ecommerce_price_level"]').val();
+ $.map(ef_crp_all, function (item) {
+ var table = $(item).closest('table');
- if (current_price_level != price_level && !confirm(confirmation)) {
- e.preventDefault();
- }
+ act_ef_crp_update_all_checkbox(table);
});
-}
-jQuery(document).ready(function (){
- jQuery('#form_reset_data').submit(function() {
- return confirm(jQuery('#confirm').val());
+ $('.ef_crp_state').click(function () {
+ var _this = $(this);
+ var state = _this.is(':checked');
+ var table = _this.closest('table');
+ var tr_line = _this.closest('tr');
+
+ tr_line.find('.ef_crp_value').prop('disabled', !state);
+ act_ef_crp_update_all_checkbox(table);
});
+
+ ef_crp_all.click(function () {
+ var _this = $(this);
+ var table = _this.closest('table');
+ var state = _this.is(':checked');
+
+ table.find('.ef_crp_state').prop('checked', state);
+ table.find('.ef_crp_value').prop('disabled', !state);
+ });
+
+ function act_ef_crp_update_all_checkbox(table) {
+ var all_checkbox_checked = table.find('.ef_crp_state').length == table.find('.ef_crp_state:checked').length;
+
+ table.find('.ef_crp_all').prop('checked', all_checkbox_checked);
+ }
});
\ No newline at end of file
diff --git a/langs/en_US/ecommerce.lang b/langs/en_US/ecommerce.lang
index a8c46c7..4bac38f 100755
--- a/langs/en_US/ecommerce.lang
+++ b/langs/en_US/ecommerce.lang
@@ -17,6 +17,7 @@ ECommerceMenuSites=ECommerce Sync
ECommerceMenuSetup=Setup ECommerce sites
##SETUP##
+ECommerceNgSelectSite=Selection du site
ECommercePriceType=Imported prices' types
ECommercePriceTypeHT=Tax excluded
ECommercePriceTypeTTC=Tax included
@@ -35,6 +36,11 @@ ECommerceFilterLabel=Filter label
ECommerceFilterValue=Filter value
ECommerceSiteType=Ecommerce type
ECommerceSiteAddress=URL for Magento SOAP services
+ECommercAuthenticationType =Type d'authentification
+ECommercAuthenticationTypeDescription =Choissiez le type de connexion à WooCommerce
+ECommercAuthenticationTypeOauth =Oauth 1 (Les informations de connection sont passées dans l'entête de la requête)
+ECommercAuthenticationTypeBasic =Basic (Les informations de connection sont passées dans l'entête de la requête)
+ECommercAuthenticationTypeQuery =Url (Les informations de connection sont passées en clair dans l'url de la requête)
ECommerceUserName=Username (for SOAP services)
ECommerceUserPassword=API key (for SOAP services)
ECommerceUserPasswordRetype=Retype API key
@@ -157,8 +163,12 @@ SoapCacheIsOff=Your PHP WSDL cache is off.
SetupOfWarehouseNotDefinedForThisSite=A new or modified product were found on eCommerce shop with a different stock level than into Dolibarr. To be able to create/update them in Dolibarr, you must setup the warehouse to initialize.
ECommerceStockSyncDirection=Stock synchronisation direction
ECommerceStockSyncDirectionDescription=Define if you want to see stock decrease in Dolibarr when stock decrease on Magento (rare), or overwrite Magento stock when stock in Dolibarr is modified (common choice)
-ECommerceValidOrderWarehouse =Validation d'une commande/facture
-ECommerceValidOrderWarehouseDescription =Entrepot utilisé lors de la validation d'une commande ou facture pendant une synchronisation du Site vers Dolibarr
+ECommerceValidOrderWarehouse =Validation d'une commande
+ECommerceValidOrderWarehouseDescription =Entrepot utilisé lors de la validation d'une commande pendant une synchronisation de E-Commerce vers Dolibarr
+ECommerceValidInvoiceWarehouse =Validation d'une facture
+ECommerceValidInvoiceWarehouseDescription =Entrepot utilisé lors de la validation d'une facture pendant une synchronisation de E-Commerce vers Dolibarr
+ECommerceValidSupplierInvoiceWarehouse =Validation d'une facture fournisseur
+ECommerceValidSupplierInvoiceWarehouseDescription =Entrepot utilisé lors de la validation d'une facture fournisseur pendant une synchronisation de E-Commerce vers Dolibarr
MainSyncSetup=Main synchronization setup
StockSyncSetup=Stock synchronization setup
ErrorModuleSoapRequired=Error: PHP module SOAP is required to have this module working.
@@ -173,6 +183,7 @@ ShowDebugTools=Show init/purge/debug tools
ECommerceShipping=Shipping
ECommercePriceLevel=Price level
ECommercePriceLevelDescription=Only this price level are synchronized between Dolibarr and eCommerce
+ECommerceUpdateLevelPrice =Mise à jour du niveau de prix
ECommerceConfirmUpdatePriceLevel=You have changed the price level and the products on the eCommerce will be updated.\nThis may take a long time, please confirm.
SeeECommerceConfFileIfKo=See content of file %s, on your eCommerce server, if this URL does not work.
RestrictNbInSync=Restrict number of record of same object to synchronize in same request
@@ -182,14 +193,15 @@ ECommerceDontUpdateDolibarrCompany
ECommerceDontUpdateDolibarrCompanyDescription =Ne pas mettre à jour le tiers sur Dolibarr lorsqu'il existe déja dans dolibarr
## OAuth Setup ##
-ECommerceOAuthWordpressSetup=OAuth2 connection on WordPress ( Go to this page , then "Add a new customer" to create the OAuth2 credentials)
-ECommerceSiteOAuthRedirectUri=Redirection Url
-ECommerceSiteOAuthRedirectUriDescription=Use the following redirection URL as redirection URI (Callback) when you create a new application (or a new customer)
-ECommerceSiteOAuthId=OAuth ID
-ECommerceSiteOAuthIdDescription=OAuth service connection ID
-ECommerceSiteOAuthSecret=OAuth secret
-ECommerceSiteOAuthSecretDescription=OAuth service connection secret
-ECommerceOAuthCheckToken=Go to this page to verify/delete the authorizations saved by the OAuth2 provider.
+ECommerceWordpressAuthenticationSetup =Connexion sur WordPress (Allez sur cette page , puis configurer la connexion)
+ECommerceWordpressAuthenticationType =Type d'authentification
+ECommerceWordpressAuthenticationTypeDescription =Choissiez entre la connexion interne Wordpress avec un mot de passe d'application situé sur un utilisateur Ou une authentification JWT grâçe à l'extension "WordPress REST API Authentication" de miniOrange
+ECommerceWordpressAuthenticationTypeWordpressApplication =Mot de passe d'application (Wordpress)
+ECommerceWordpressAuthenticationTypeJWTAuthentication =Authentification JWT
+ECommerceWordpressAuthenticationLogin =Identifiant
+ECommerceWordpressAuthenticationLoginDescription =Identifiant de connexion
+ECommerceWordpressAuthenticationPassword =Mot de passe
+ECommerceWordpressAuthenticationPasswordDescription =Mot de passe de connexion
ECommerceOrderStatusSetup=Order status synchronization
ECommerceOrderStatusSetupDescription=Choose the corresponding status when synchronizing.
@@ -235,12 +247,14 @@ ECommerceCreateRemoteProductLink=Error updating the product link 'id:%s' on the
ECommerceUpdateRemoteOrderLink=Error updating the order link 'id:%s' on the site '%s': %s
ECommerceUpdateRemoteInvoiceLink=Error updating the bill link 'id:%s' on the site '%s': %s
-ECommerceRealTimeSynchroDolibarrToECommerceSetup = Real time synchronization from Dolibarr to Ecommerce
-ECommerceThirdParty = Third parties
-ECommerceContact = Contacts
-ECommerceProduct = Products
-ECommerceOrder = Orders
-ECommerceRealTimeSynchroDolibarrToECommerceSetupDescription = Synchronization of the element in the ECommerce site at the modification of the one linked in Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceThirdParty =Synchronisation du tiers en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceThirdPartyDescription =Synchronisation du tiers dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceContact =Synchronisation du contact en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceContactDescription =Synchronisation du contact dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceProduct =Synchronisation du produit en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceProductDescription =Synchronisation du produit dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceOrder =Synchronisation de la commande en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceOrderDescription =Synchronisation de la commande dans le site E-Commerce à la modification de celui lié dans Dolibarr
ECommercePaymentCondition = Payment conditions
ECommercePaymentConditionDescription = Default payment conditions when retrieving the order from the ECommerce site
@@ -295,14 +309,21 @@ ECommerceOnlyNew = Only the new ones
ECommerceUpdateRemoteCompanyLinkWhenMergeCompany = Error updating tje links of the company 'id:%s' during the merger with the company 'id:%s': %s
ECommerceSynchronizeStockToECommerce=Synchronization of the product stock on the site %s.
-ECommerceCreateOrderInvoiceWhenSyncOrder = Actions when retrieving WooCommerce orders
ECommerceCreateOrder = Create the order
+ECommerceCreateOrderDescription = Activer la création de la commande a la synchronisation de la commande
ECommerceCreateInvoice = Create the bill
+ECommerceCreateInvoiceDescription =Activer la création de la facture a la synchronisation de la commande
+ECommerceCreateInvoiceType =Type la facture
+ECommerceCreateInvoiceTypeDescription =Type la facture créée a la synchronisation de la commande
ECommerceCreateSupplierInvoiceFromFee = Create the supplier bill from the charges
+ECommerceCreateSupplierInvoiceFromFeeDescription =Créer la facture fournisseur à partir des frais lors de la creation de la facture
ECommerceFeeLineAsItemLine = The fee line is as the service line
+ECommerceFeeLineAsItemLineDescription =Considérer les lignes de frais comme des lignes de services lors de la création de la commande/facture
ECommerceSendInvoiceByMail = Send the bill by email
+ECommerceSendInvoiceByMailDescription =Envoyer la facture par courriel après la création avec succes de la facture
ECommerceCreateOrderDescription = Related actions when retrieving WooCommerce orders (Enter the payment methods associated with WooCommerce)
ECommerceCreateInvoiceIfAmount0 =Créer la facture même si le montant est égale à 0
+ECommerceCreateInvoiceIfAmount0Description =Créer la facture même si le montant est nul lors de la synchronisation de la commande
ECommercePaymentGatewaysCorrespondence = Correspondence of the payment methods with the site
ECommercePaymentGatewayLabel = Payment method on the site
diff --git a/langs/en_US/woocommerce.lang b/langs/en_US/woocommerce.lang
index 9cb1da2..582954f 100644
--- a/langs/en_US/woocommerce.lang
+++ b/langs/en_US/woocommerce.lang
@@ -2,39 +2,40 @@
CHARSET=UTF-8
ECommerceWoocommerceConnect=Error connecting to site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrCommande=Error retrieving orders on the site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProduct=Error retrieving products on the site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProductVariations=Error retrieving variations of remote product 'id:%s' on the site '%s': %s
-ECommerceWoocommerceCheckRemoteProductExist =Erreur lors de la verification de l'existance du produit %s sur le site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSociete=Erreor retrieving companies on the site '%s': %s
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrCommande=Error retrieving orders on the site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProduct=Error retrieving products on the site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProductVariations=Error retrieving variations of remote product 'id:%s' on the site '%s':
+ECommerceWoocommerceCheckRemoteProductExist =Erreur lors de la verification de l'existance du produit %s sur le site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSociete=Erreor retrieving companies on the site '%s':
ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSocpeople=Error retrieving companies (for contact/adresses) on the site '%s': %s
-ECommerceWoocommerceCreateRemoteProduct=Error creating the product 'id:%s' on the site '%s': %s
+ECommerceWoocommerceCreateRemoteProduct=Error creating the product 'id:%s' on the site '%s':
ECommerceWoocommerceCreateRemoteProductLink=Error creating the link for the product 'id:%s' on the site '%s': %s
-ECommerceWoocommerceGetCategoryData=Error retrieving data from the remote category 'id:%s' on the site '%s': %s
-ECommerceWoocommerceGetCommandeToUpdate=Error retrieving the list of orders to be updated on the site '%s': %s
-ECommerceWoocommerceGetProductToUpdate=Error retrieving the list of products to be updated on the site '%s': %s
-ECommerceWoocommerceGetRemoteCategoryTree=Error retrieving the list of categories to be updated on the site '%s': %s
-ECommerceWoocommerceGetSocieteToUpdate=Error retrieving the list of companies to be updated on the site '%s': %s
-ECommerceWoocommerceSendFileForCommande=Error linking the file with the remote order 'id:%s' on the site '%s': %s
+ECommerceWoocommerceGetCategoryData=Error retrieving data from the remote category 'id:%s' on the site '%s':
+ECommerceWoocommerceGetCommandeToUpdate=Error retrieving the list of orders to be updated on the site '%s':
+ECommerceWoocommerceGetProductToUpdate=Error retrieving the list of products to be updated on the site '%s':
+ECommerceWoocommerceGetRemoteCategoryTree=Error retrieving the list of categories to be updated on the site '%s':
+ECommerceWoocommerceGetSocieteToUpdate=Error retrieving the list of companies to be updated on the site '%s':
+ECommerceWoocommerceSendFileForCommande=Error linking the file with the remote order 'id:%s' on the site '%s':
ECommerceWoocommerceSendFileForCommandeInWordpress=Error sending the file for the remote order 'id:%s' in the Wordpress media on the site '%s': %s
-ECommerceWoocommerceUpdateRemoteCommande=Error updating the remote order 'id:%s' on the site '%s': %s
-ECommerceWoocommerceUpdateRemoteProduct=Error updating the remote product 'id:%s' on the site '%s': %s
-ECommerceWoocommerceUpdateRemoteTranslatedProduct=Error updating the translation 'id:%s' of the remote product 'id:%s' on the site '%s': %s
-ECommerceWoocommerceUpdateRemoteProductGetRemoteProduct=Error retrieving the remote product 'id:%s' on the site '%s': %s
+ECommerceWoocommerceUpdateRemoteCommande=Error updating the remote order 'id:%s' on the site '%s':
+ECommerceWoocommerceUpdateRemoteProduct=Error updating the remote product 'id:%s' on the site '%s':
+ECommerceWoocommerceUpdateRemoteTranslatedProduct=Error updating the translation 'id:%s' of the remote product 'id:%s' on the site '%s':
+ECommerceWoocommerceUpdateRemoteProductGetRemoteProduct=Error retrieving the remote product 'id:%s' on the site '%s':
ECommerceWoocommerceUpdateRemoteProductSendImage=Error sending an image for the product 'id:%s' in the Wordpress media on the site '%s': %s
-ECommerceWoocommerceUpdateRemoteProductVariation=Error updating the variant 'id:%s' of the remote product 'id:%s' on the site '%s': %s
+ECommerceWoocommerceUpdateRemoteProductVariation=Error updating the variant 'id:%s' of the remote product 'id:%s' on the site '%s':
ECommerceWoocommerceUpdateRemoteTranslatedProductVariation=Error updating the translation 'id:%s' of the variant 'id:%s' of the remote product 'id:%s' on the site '%s'
-ECommerceWoocommerceUpdateRemoteSociete=Error updating the remote company 'id:%s' on the site '%s': %s
-ECommerceWoocommerceUpdateRemoteSocpeople=Error updating contacts/adresses of the remote company 'id:%s' on the site '%s': %s
+ECommerceWoocommerceUpdateRemoteSociete=Error updating the remote company 'id:%s' on the site '%s':
+ECommerceWoocommerceUpdateRemoteSocpeople=Error updating contacts/adresses of the remote company 'id:%s' on the site '%s':
ECommerceWoocommerceUpdateRemoteStockProduct=Error updating inventory (%s) of the remote product 'id:%s' on the site '%s':
ECommerceWoocommerceUpdateRemoteStockTranslatedProduct=Error updating inventory (%s) of the translation 'id:%s' of the remote product 'id:%s' on the site '%s':
ECommerceWoocommerceUpdateRemoteStockProductVariation=Error updating inventory (%s) of the variant 'id:%s' of the remote product 'id:%s' on the site '%s':
ECommerceWoocommerceUpdateRemoteStockTranslatedProductVariation=Error updating inventory (%s) of the translation 'id:%s' of the variant 'id:%s' of the remote product 'id:%s' on the site
-ECommerceWoocommerceGetAllWoocommerceAttributes =Erreur de récupération des données des attributs sur le site '%s': %s
-ECommerceWoocommerceGetAllWoocommerceTaxClass=Error retrieving tax class data from the site '%s': %s
-ECommerceWoocommerceGetWoocommerceTaxes=Erreur retrieving tax data from the site '%s': %s
+ECommerceWoocommerceGetAllWoocommerceAttributes =Erreur de récupération des données des attributs sur le site '%s':
+ECommerceWoocommerceGetAllWoocommerceAttributeTerms =Erreur de récupération des données de l'attribut '%s' sur le site '%s':
+ECommerceWoocommerceGetAllWoocommerceTaxClass=Error retrieving tax class data from the site '%s':
+ECommerceWoocommerceGetWoocommerceTaxes=Erreur retrieving tax data from the site '%s':
ECommerceWoocommerceCreateRemoteProductSendImage=Error sending an image for the prodcut 'ref:%s' in the Wordpress media on the site '%s': %s
-ECommerceWoocommerceGetAllWoocommercePaymentGateways=Error retrieving tax class data from the site '%s': %s
+ECommerceWoocommerceGetAllWoocommercePaymentGateways=Error retrieving payment gateways data from the site '%s':
ECommerceWoocommerceGetTranslatedProductVariation=Error retrieving the translation 'id:%s' of the variant 'id:%s' of the remote product 'id:%s' on the site '%s':
ECommercengWoocommerceStatus=Site status [%s]
@@ -95,13 +96,14 @@ ECommercengWoocommerceProductExtrafieldsCorrespondenceAttributeSetupDescription
ECommerceWoocommerceCreateRemoteCategoryParentNotCreated = Erreur pour le site '%s' lors de la recherche de l'ID parent da la catégorie '%s' (slug: '%s')
ECommercengWoocommerceExtrafieldsCorrespondence = Match of additional attributes with Woocommerce metadata
+ECommercengWoocommerceExtrafieldsCorrespondenceOf = Correspondance des attributs supplémentaires des "%s" avec les méta-données de Woocommerce
ECommercengWoocommerceExtrafieldsCorrespondenceSetupDescription = Enter the name of the metadata corresponding to this additional attribute: %s
ECommerceWoocommerceCreateRemoteCategoryParentNotCreated = Error for the site '%s' when searching for the parent ID of the category '%s' (slug: '%s')
-ECommerceWoocommerceCreateRemoteBatchCategories = Error creating categories by batch on the site '%s': %s
+ECommerceWoocommerceCreateRemoteBatchCategories = Error creating categories by batch on the site '%s':
ECommerceWoocommerceCreateRemoteBatchProducts = Error creating products by batch on the site '%s': %s
-ECommerceWoocommerceCreateRemoteBatchCategory = Error crating the category (slug : %s) on the site '%s': %s
+ECommerceWoocommerceCreateRemoteBatchCategory = Error crating the category (slug : %s) on the site '%s':
ECommerceWoocommerceCreateRemoteBatchProduct = Error creating the product (sku : %s) on the site '%s': %s
ECommerceWoocommerceUpdateRemoteBatchProduct = Error updating the product (sku : %s) on the site '%s': %s
@@ -149,5 +151,5 @@ ECommerceWoocommerceErrorUpdateDictTaxRate = Erreur updating the tax ra
ECommerceWoocommerceErrorAddDictTaxRate = Erreur adding the tax rate line (ID: %s): %s
ECommerceWooCommerceErrorTaxNotFound = Error the tax was not found in the synchronized one (ID: %s)
ECommerceWooCommerceErrorDontSupportMultiTaxes = The module does not currently support multi-taxation.
-ECommerceWoocommerceErrorGetWoocommerceWebHooks = Error retrieving webhooks from the site '%s': %s
+ECommerceWoocommerceErrorGetWoocommerceWebHooks = Error retrieving webhooks from the site '%s':
ECommerceWoocommerceErrorTaxClassNotFoundFromTaxRate = La taxe '%s' n'est pas trouver dans le dictionnaire de taxe du module WooSync pour le site '%s' pour le produit '%s'
diff --git a/langs/fr_FR/ecommerce.lang b/langs/fr_FR/ecommerce.lang
index ded8ddc..557401b 100644
--- a/langs/fr_FR/ecommerce.lang
+++ b/langs/fr_FR/ecommerce.lang
@@ -18,6 +18,7 @@ ECommerceMenuSites
ECommerceMenuSetup =Configuration des sites
##SETUP##
+ECommerceNgSelectSite =Selection du site
magento =Magento
woocommerce =WooCommerce
ECommerceToDolibarr =De E-Commerce vers Dolibarr
@@ -41,9 +42,19 @@ ECommerceFilterLabel
ECommerceFilterValue =Valeur du filtre
ECommerceSiteType =Type de site
ECommerceSiteAddress =Adresse du site
+ECommerceAuthenticationType =Type d'authentification
+ECommerceAuthenticationTypeDescription =Choissiez le type de connexion à WooCommerce - Oauth 1 (Entête) (Les informations de connection sont passées dans l'entête de la requête) - Oauth 1 (Url) (Les informations de connection sont passées en clair dans l'url de la requête) - Basic (Les informations de connection sont passées dans l'entête de la requête) - Url (Les informations de connection sont passées en clair dans l'url de la requête)
+ECommerceAuthenticationTypeOauth1Header =Oauth 1 (Entête)
+ECommerceAuthenticationTypeOauth1Query =Oauth 1 (Url)
+ECommerceAuthenticationTypeBasic =Basic
+ECommerceAuthenticationTypeQuery =Url
ECommerceUserName =Clé client API WooCommerce
ECommerceUserPassword =Clé secret API WooCommerce
ECommerceUserPasswordRetype =Clé secret API WooCommerce - confirmation
+ECommerceTimeout =Timeout des accès à l'API de WooCommerce
+ECommerceTimeoutDescription =Timeout des accès à l'API de WooCommerce, en secondes (30 secondes si vide)
+ECommerceDebug =Debug
+ECommerceDebugDescription =Activer le debug détaillé lors d'une connection à l'API de WooCommerce
ECommerceConfirmDelete =Êtes vous sûre de vouloir supprimer ce site ?
ECommerceConfirmReset =Êtes vous sûre de vouloir purger les données synchronisées liées à ce site ? (Attention : cette action est irréversible, toute les données synchronisées seront perdues)
ECommerceSetupSaved =La configuration a bien été enregistrée.
@@ -123,11 +134,7 @@ ECommerceSynchCommandeSuccess
ECommerceSynchFactureSuccess =factures ont bien été synchronisées.
ECommerceSynchSocieteFailed =%s erreurs se sont produites lors de la synchronisation.
ECommerceSynchECommerceSocpeopleCreateError =Une erreur est survenue lors de l'enregistrement du contact (Tiers ID : %s; prénom: %s; nom: %s).
-ECommerceTimeout =Timeout des accès aux APIs
ECommerceClickUrlToTestUrl =Cliquez ici pour tester l'URL (un fichier XML ou JSON doit s'afficher)
-ECommerceTimeoutDescription =Timeout des accès aux APIs, en secondes
-ECommerceSetupTimeoutEmpty =Durée de connexion vide
-ECommerceSetupTimeoutMustBeInt =La durée de connexion doit-être un entier
ECommerceCategoriesProducts =Catégories de produits
SyncCategFirst =Synchroniser d'abord les catégories
ECommerceSynchCommandeError =Erreur durant la synchronisation des commandes
@@ -156,8 +163,12 @@ SoapCacheIsOff
SetupOfWarehouseNotDefinedForThisSite =Un nouveau produit ou un produit modifié a été trouvé sur la boutique E-Commerce avec un niveau de stock différent de celui de Dolibarr. Afin de pouvoir les créer/mettre à jour dans Dolibarr, vous devez mettre en place l'entrepôt à initialiser.
ECommerceStockSyncDirection =Synchronisation des stocks
ECommerceStockSyncDirectionDescription =Ce paramètre détermine : - Si le stock doit être décrémenté dans Dolibarr suite à une décrémentation du stock E-Commerce (rare) ou - Si le stock E-Commerce doit être remplacé par le stock Dolibarr suite à sa modification (choix commun)
-ECommerceValidOrderWarehouse =Validation d'une commande/facture
-ECommerceValidOrderWarehouseDescription =Entrepot utilisé lors de la validation d'une commande ou facture pendant une synchronisation de E-Commerce vers Dolibarr
+ECommerceValidOrderWarehouse =Validation d'une commande
+ECommerceValidOrderWarehouseDescription =Entrepot utilisé lors de la validation d'une commande pendant une synchronisation de E-Commerce vers Dolibarr
+ECommerceValidInvoiceWarehouse =Validation d'une facture
+ECommerceValidInvoiceWarehouseDescription =Entrepot utilisé lors de la validation d'une facture pendant une synchronisation de E-Commerce vers Dolibarr
+ECommerceValidSupplierInvoiceWarehouse =Validation d'une facture fournisseur
+ECommerceValidSupplierInvoiceWarehouseDescription =Entrepot utilisé lors de la validation d'une facture fournisseur pendant une synchronisation de E-Commerce vers Dolibarr
MainSyncSetup =Synchronisation générale
StockSyncSetup =Synchronisation des stocks
ErrorModuleSoapRequired =Erreur: le module PHP SOAP est requis pour le bon fonctionnement du module.
@@ -167,21 +178,28 @@ ShowDebugTools
ECommerceShipping =Frais de port
ECommercePriceLevel =Niveau de prix
ECommercePriceLevelDescription =Seul ce niveau de prix sera synchronisé entre Dolibarr et E-Commerce
+ECommerceUpdateLevelPrice =Mise à jour du niveau de prix
ECommerceConfirmUpdatePriceLevel =Vous avez modifié le niveau de prix. Les produits sur le site E-Commerce vont être mis à jour.\nCette opération peut être longue, merci de confirmer.
ThirdPartyForNonLoggedUsers =Tiers générique de recueil des clients sans compte créé
SynchUnkownCustomersOnThirdParty =Tiers générique auquel seront rattachées les commandes de clients sans compte
ECommerceDontUpdateDolibarrCompany =Mise à jour du tiers
ECommerceDontUpdateDolibarrCompanyDescription =Ne pas mettre à jour le tiers de Dolibarr lorsqu'il existe déja dans dolibarr
-## OAuth Setup ##
-ECommerceOAuthWordpressSetup =Connexion OAuth2 sur WordPress (Allez sur cette page , puis "Ajouter un nouveau client" pour créer les informations d'identification OAuth2)
-ECommerceSiteOAuthRedirectUri =URL de redirection
-ECommerceSiteOAuthRedirectUriDescription =Utilisez l'URL suivante comme URI de redirection (Callback) quand vous créez une nouvelle application (ou un nouveau client)
-ECommerceSiteOAuthId =OAuth ID
-ECommerceSiteOAuthIdDescription =Id de connexion au service OAuth
-ECommerceSiteOAuthSecret =OAuth secret
-ECommerceSiteOAuthSecretDescription =Secret de connexion au service OAuth
-ECommerceOAuthCheckToken =Allez sur cette page pour vérifier/effacer les autorisations sauvées par le fournisseur OAuth2.
+## Wordpress Setup ##
+ECommerceWordpressAuthenticationOptions =Paramètres de connexion à WordPress
+ECommerceWordpressAuthenticationSetup =(Allez sur cette page , puis configurer la connexion)
+ECommerceWordpressAuthenticationType =Type d'authentification
+ECommerceWordpressAuthenticationTypeDescription =Choissiez entre la connexion interne Wordpress avec un mot de passe d'application situé sur un utilisateur Ou une authentification JWT grâçe à l'extension "WordPress REST API Authentication" de miniOrange
+ECommerceWordpressAuthenticationTypeWordpressApplication =Mot de passe d'application (Wordpress)
+ECommerceWordpressAuthenticationTypeJWTAuthentication =Authentification JWT
+ECommerceWordpressAuthenticationLogin =Identifiant
+ECommerceWordpressAuthenticationLoginDescription =Identifiant de connexion
+ECommerceWordpressAuthenticationPassword =Mot de passe
+ECommerceWordpressAuthenticationPasswordDescription =Mot de passe de connexion
+ECommerceWordpressTimeout =Timeout des accès à l'API de Wordpress
+ECommerceWordpressTimeoutDescription =Timeout des accès à l'API de Wordpress, en secondes (30 secondes si vide)
+ECommerceWordpressDebug =Debug
+ECommerceWordpressDebugDescription =Activer le debug détaillé lors d'une connection à l'API de Wordpress
ECommerceOrderStatusSetup =Synchronisation des statuts des commandes
ECommerceOrderStatusSetupDescription =Choisissez le statut correspondant lors de la synchronisation.
@@ -227,12 +245,14 @@ ECommerceCreateRemoteProductLink
ECommerceUpdateRemoteOrderLink =Erreur de mise à jour du lien de la commande 'id:%s' sur le site '%s': %s
ECommerceUpdateRemoteInvoiceLink =Erreur de mise à jour du lien de la facture 'id:%s' sur le site '%s': %s
-ECommerceRealTimeSynchroDolibarrToECommerceSetup =Synchronisation en temps réel de Dolibarr vers E-Commerce
-ECommerceThirdParty =Tiers
-ECommerceContact =Contacts
-ECommerceProduct =Produits
-ECommerceOrder =Commandes
-ECommerceRealTimeSynchroDolibarrToECommerceSetupDescription =Synchronisation de l'élément dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceThirdParty =Synchronisation du tiers en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceThirdPartyDescription =Synchronisation du tiers dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceContact =Synchronisation du contact en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceContactDescription =Synchronisation du contact dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceProduct =Synchronisation du produit en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceProductDescription =Synchronisation du produit dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceOrder =Synchronisation de la commande en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceOrderDescription =Synchronisation de la commande dans le site E-Commerce à la modification de celui lié dans Dolibarr
ECommercePaymentCondition =Conditions de règlement
ECommercePaymentConditionDescription =Conditions de règlement par défaut lors de la récupération de la commande depuis le site E-Commerce
@@ -287,14 +307,29 @@ ECommerceOnlyNew
ECommerceUpdateRemoteCompanyLinkWhenMergeCompany =Erreur de mise à jour des lien de la société 'id:%s' lors de la fusion avec la société 'id:%s': %s
ECommerceSynchronizeStockToECommerce =Synchronisation du stock du produit sur le site %s.
-ECommerceCreateOrderInvoiceWhenSyncOrder =Actions lors de la récupération des commandes WooCommerce
ECommerceCreateOrder =Créer la commande
+ECommerceCreateOrderDescription =Activer la création de la commande a la synchronisation de la commande
ECommerceCreateInvoice =Créer la facture
+ECommerceCreateInvoiceDescription =Activer la création de la facture a la synchronisation de la commande
+ECommerceCreateInvoiceType =Type la facture
+ECommerceCreateInvoiceTypeDescription =Type la facture créée a la synchronisation de la commande
ECommerceCreateSupplierInvoiceFromFee =Créer la facture fournisseur à partir des frais
+ECommerceCreateSupplierInvoiceFromFeeDescription =Créer la facture fournisseur à partir des frais lors de la creation de la facture
ECommerceFeeLineAsItemLine =Considérer les lignes de frais comme des lignes de services
+ECommerceFeeLineAsItemLineDescription =Considérer les lignes de frais comme des lignes de services lors de la création de la commande/facture
ECommerceSendInvoiceByMail =Envoyer la facture par courriel
+ECommerceSendInvoiceByMailDescription =Envoyer la facture par courriel après la création avec succes de la facture
ECommerceCreateOrderDescription =Actions associées lors de la récupération des commandes WooCommerce (renseigner les modes de paiements associés à WooCommerce)
ECommerceCreateInvoiceIfAmount0 =Créer la facture même si le montant est nul
+ECommerceCreateInvoiceIfAmount0Description =Créer la facture même si le montant est nul lors de la synchronisation de la commande
+
+ECommerceRemoteWarehousesCorrespondence =Correspondance des entrpôts avec le site
+ECommerceWarehouseSetToZeroEvenIfEmptyStock =Definie le stock même si la quantité est à zero
+ECommerceWarehouseOldEntry =Ancien entrepôt
+ECommerceUpdateRemoteWarehouses =Mise à jour des entrepôts distants
+ECommerceConfirmUpdateRemoteWarehouses =Confirmer la mise à jour des entrepôts distants pour ce site ?
+ECommerceRemoteWarehousesUpdated =Les entrepôts distants depuis le site ont été mise à jour.
+ECommerceRemoteID =ID distant
ECommercePaymentGatewaysCorrespondence =Correspondance des modes de paiements avec le site
ECommercePaymentGatewayLabel =Mode de paiement sur le site
@@ -425,6 +460,24 @@ ECommerceSendEmailErrorCheckWebHooksVolumetry
ECommerceSendEmailErrorCheckWebHooksVolumetryErrorSubject =[WooSync] Erreur lors de la vérification de la volumétrie des crochets Web (WebHooks)
ECommerceCheckWebHooksVolumetrySuccess =La vérification de la volumétrie des crochets Web (WebHooks) s'est terminée avec succès
+#######################################################################
+# API
+#######################################################################
+ECommerceRequestData = Données de la requête
+ECommerceRequestProtocolVersion = Version du protocole
+ECommerceRequestUri = Url
+ECommerceRequestMethod = Méthode
+ECommerceRequestTarget = Cible
+ECommerceRequestHeaders = En-têtes
+ECommerceRequestBody = Corps
+ECommerceResponseData = Données de la réponse
+ECommerceResponseProtocolVersion = Version du protocole
+ECommerceResponseCode = Code
+ECommerceResponseReasonPhrase = Raison
+ECommerceResponseHeaders = En-têtes
+ECommerceResponseBody = Corps
+ECommerceErrorBadConvertResult = Mauvais format de la réponse d'une requête sur l'API
+
############################################################################################
# Errors
############################################################################################
@@ -555,6 +608,7 @@ ECommerceErrorUpdateProductComponent
ECommerceErrorDelProductComponent =Erreur lors de la suppression du composant (ID: %s) constituant le produit (ID: %s)
ECommerceErrorSetOrderCorrectAmount =Erreur lors du forçage du prix TTC de la commande
ECommerceErrorSetInvoiceCorrectAmount =Erreur lors du forçage du prix TTC de la facture
+ECommerceErrorConnectAPI =Erreur de connexion au site '%s'
############################################################################################
# Warnings
diff --git a/langs/fr_FR/woocommerce.lang b/langs/fr_FR/woocommerce.lang
index 676f703..7575c2f 100644
--- a/langs/fr_FR/woocommerce.lang
+++ b/langs/fr_FR/woocommerce.lang
@@ -2,39 +2,41 @@
CHARSET=UTF-8
ECommerceWoocommerceConnect =Erreur de connexion au site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrCommande =Erreur de récupération des commandes sur le site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProduct =Erreur de récupération des produits sur le site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProductVariations =Erreur de récupération des variations du produit distant 'id:%s' sur le site '%s': %s
-ECommerceWoocommerceCheckRemoteProductExist =Erreur lors de la verification de l'existance du produit %s sur le site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSociete =Erreur de récupération des sociétés sur le site '%s': %s
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrCommande =Erreur de récupération des commandes sur le site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProduct =Erreur de récupération des produits sur le site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProductVariations =Erreur de récupération des variations du produit distant 'id:%s' sur le site '%s':
+ECommerceWoocommerceCheckRemoteProductExist =Erreur lors de la verification de l'existance du produit %s sur le site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSociete =Erreur de récupération des sociétés sur le site '%s':
ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSocpeople =Erreur de récupération des sociétés (pour les contacts/adresses) sur le site '%s': %s
-ECommerceWoocommerceCreateRemoteProduct =Erreur de création du produit 'id:%s' sur le site '%s': %s
+ECommerceWoocommerceCreateRemoteProduct =Erreur de création du produit 'id:%s' sur le site '%s':
ECommerceWoocommerceCreateRemoteProductLink =Erreur de création du lien pour le produit 'id:%s' pour le site '%s': %s
-ECommerceWoocommerceGetCategoryData =Erreur de récupération des données de la catégorie distante 'id:%s' sur le site '%s': %s
-ECommerceWoocommerceGetCommandeToUpdate =Erreur de récupération de la liste des commandes à mettre à jour sur le site '%s': %s
-ECommerceWoocommerceGetProductToUpdate =Erreur de récupération de la liste des produits à mettre à jour sur le site '%s': %s
-ECommerceWoocommerceGetRemoteCategoryTree =Erreur de récupération de la liste des catégories à mettre à jour sur le site '%s': %s
-ECommerceWoocommerceGetSocieteToUpdate =Erreur de récupération de la liste des sociétés à mettre à jour sur le site '%s': %s
-ECommerceWoocommerceSendFileForCommande =Erreur pour lier le fichier avec la commande distante 'id:%s' sur le site '%s': %s
+ECommerceWoocommerceGetCategoryData =Erreur de récupération des données de la catégorie distante 'id:%s' sur le site '%s':
+ECommerceWoocommerceGetCommandeToUpdate =Erreur de récupération de la liste des commandes à mettre à jour sur le site '%s':
+ECommerceWoocommerceGetProductToUpdate =Erreur de récupération de la liste des produits à mettre à jour sur le site '%s':
+ECommerceWoocommerceGetRemoteCategoryTree =Erreur de récupération de la liste des catégories à mettre à jour sur le site '%s':
+ECommerceWoocommerceGetSocieteToUpdate =Erreur de récupération de la liste des sociétés à mettre à jour sur le site '%s':
+ECommerceWoocommerceSendFileForCommande =Erreur pour lier le fichier avec la commande distante 'id:%s' sur le site '%s':
ECommerceWoocommerceSendFileForCommandeInWordpress =Erreur de l'envoi du fichier pour la commande distante 'id:%s' dans les médias de Wordpress sur le site '%s': %s
-ECommerceWoocommerceUpdateRemoteCommande =Erreur de mise à jour de la commande distante 'id:%s' sur le site '%s': %s
-ECommerceWoocommerceUpdateRemoteProduct =Erreur de mise à jour du produit distant 'id:%s' sur le site '%s': %s
-ECommerceWoocommerceUpdateRemoteTranslatedProduct =Erreur de mise à jour de la traduction 'id:%s' du produit distant 'id:%s' sur le site '%s': %s
-ECommerceWoocommerceUpdateRemoteProductGetRemoteProduct =Erreur de récupération du produit distant 'id:%s' sur le site '%s': %s
+ECommerceWoocommerceUpdateRemoteCommande =Erreur de mise à jour de la commande distante 'id:%s' sur le site '%s':
+ECommerceWoocommerceUpdateRemoteProduct =Erreur de mise à jour du produit distant 'id:%s' sur le site '%s':
+ECommerceWoocommerceUpdateRemoteTranslatedProduct =Erreur de mise à jour de la traduction 'id:%s' du produit distant 'id:%s' sur le site '%s':
+ECommerceWoocommerceUpdateRemoteProductGetRemoteProduct =Erreur de récupération du produit distant 'id:%s' sur le site '%s':
ECommerceWoocommerceUpdateRemoteProductSendImage =Erreur de l'envoi d'une image pour le produit distante 'id:%s' dans les médias de Wordpress sur le site '%s': %s
-ECommerceWoocommerceUpdateRemoteProductVariation =Erreur de mise à jour de la variation 'id:%s' du produit distant 'id:%s' sur le site '%s': %s
+ECommerceWoocommerceUpdateRemoteProductVariation =Erreur de mise à jour de la variation 'id:%s' du produit distant 'id:%s' sur le site '%s':
ECommerceWoocommerceUpdateRemoteTranslatedProductVariation =Erreur de mise à jour de la traduction 'id:%s' de la variation 'id:%s' du produit distant 'id:%s' sur le site '%s'
-ECommerceWoocommerceUpdateRemoteSociete =Erreur de mise à jour de la société distante 'id:%s' sur le site '%s': %s
-ECommerceWoocommerceUpdateRemoteSocpeople =Erreur de mise à jour des contacts/adresses de la société distante 'id:%s' sur le site '%s': %s
+ECommerceWoocommerceUpdateRemoteSociete =Erreur de mise à jour de la société distante 'id:%s' sur le site '%s':
+ECommerceWoocommerceUpdateRemoteSocpeople =Erreur de mise à jour des contacts/adresses de la société distante 'id:%s' sur le site '%s':
ECommerceWoocommerceUpdateRemoteStockProduct =Erreur de mise à jour des stocks (%s) du produit distant 'id:%s' sur le site '%s':
ECommerceWoocommerceUpdateRemoteStockTranslatedProduct =Erreur de mise à jour des stocks (%s) de la traduction 'id:%s' du produit distant 'id:%s' sur le site '%s':
ECommerceWoocommerceUpdateRemoteStockProductVariation =Erreur de mise à jour des stocks (%s) de la variation 'id:%s' du produit distant 'id:%s' sur le site '%s':
ECommerceWoocommerceUpdateRemoteStockTranslatedProductVariation =Erreur de mise à jour des stocks (%s) de la traduction 'id:%s' de la variation 'id:%s' du produit distant 'id:%s' sur le site
-ECommerceWoocommerceGetAllWoocommerceAttributes =Erreur de récupération des données des attributs sur le site '%s': %s
-ECommerceWoocommerceGetAllWoocommerceTaxClass =Erreur de récupération des données des classes de taxes sur le site '%s': %s
-ECommerceWoocommerceGetWoocommerceTaxes =Erreur de récupération des données des taxes sur le site '%s': %s
+ECommerceWoocommerceGetAllWoocommerceAttributes =Erreur de récupération des données des attributs sur le site '%s':
+ECommerceWoocommerceGetAllWoocommerceAttributeTerms =Erreur de récupération des données de l'attribut '%s' sur le site '%s':
+ECommerceWoocommerceGetAllWoocommerceTaxClass =Erreur de récupération des données des classes de taxes sur le site '%s':
+ECommerceWoocommerceGetWoocommerceTaxes =Erreur de récupération des données des taxes sur le site '%s':
ECommerceWoocommerceCreateRemoteProductSendImage =Erreur de l'envoi d'une image pour le produit 'ref:%s' dans les médias de Wordpress sur le site '%s': %s
-ECommerceWoocommerceGetAllWoocommercePaymentGateways =Erreur de récupération des données des classes de taxes sur le site '%s': %s
+ECommerceWoocommerceGetAllWoocommercePaymentGateways =Erreur de récupération des données des modes de paiement sur le site '%s':
+ECommerceWoocommerceGetAllWoocommerceRemoteWarehouses =Erreur de récupération des données des entrepots distants sur le site '%s':
ECommerceWoocommerceGetTranslatedProductVariation =Erreur de récupération de la traduction 'id:%s' de la variation 'id:%s' du produit distant 'id:%s' sur le site '%s':
ECommercengWoocommerceStatus =Statut pour le site [%s]
@@ -66,6 +68,9 @@ ECommerceWoocommerceErrorDisableDictAttribute =Erreur de
ECommerceWoocommerceErrorAddDictAttribute =Erreur d'ajout d'un attribut, slug:"%s", nom:"%s", erreur:"%s"
ECommerceWoocommerceErrorUpdateDictAttribute =Erreur de mise à jour d'un attribut, slug:"%s", erreur:"%s"
+ECommerceWoocommerceEnableWarehouseSlPluginSupport = Stock Locations
+ECommerceWoocommerceEnableWarehousePluginSlSupportDescription = Active le support de l'extension "Stock Locations" installée sur WooCommerce
+
ECommercengWoocommerceStatusDraft =Brouillon
ECommercengWoocommerceStatusPending =En attente de relecture
ECommercengWoocommerceStatusPrivate =Privé
@@ -91,13 +96,14 @@ ECommercengWoocommerceProductAttribute
ECommercengWoocommerceProductExtrafieldsCorrespondenceAttributeSetupDescription = Code champ dolibarr : %s. Les valeurs du champ complémentaire Dolibarr doit être sous la forme "Nom,Nom" exemple: "Jaune,Jaune"
ECommercengWoocommerceExtrafieldsCorrespondence = Correspondance des attributs supplémentaires avec les méta-données de Woocommerce
+ECommercengWoocommerceExtrafieldsCorrespondenceOf = Correspondance des attributs supplémentaires des "%s" avec les méta-données de Woocommerce
ECommercengWoocommerceExtrafieldsCorrespondenceSetupDescription = Renseigner le nom de la méta-donnée correspondant à cet attribut supplémentaire : %s
ECommerceWoocommerceCreateRemoteCategoryParentNotCreated = Erreur pour le site '%s' lors de la recherche de l'ID parent da la catégorie '%s' (slug: '%s')
-ECommerceWoocommerceCreateRemoteBatchCategories = Erreur lors de la création des catégories par lot sur le site '%s': %s
+ECommerceWoocommerceCreateRemoteBatchCategories = Erreur lors de la création des catégories par lot sur le site '%s':
ECommerceWoocommerceCreateRemoteBatchProducts = Erreur lors de la création des produits par lot sur le site '%s': %s
-ECommerceWoocommerceCreateRemoteBatchCategory = Erreur lors de la création de la catégorie (slug : %s) sur le site '%s': %s
+ECommerceWoocommerceCreateRemoteBatchCategory = Erreur lors de la création de la catégorie (slug : %s) sur le site '%s':
ECommerceWoocommerceCreateRemoteBatchProduct = Erreur lors de la création du produit (UGS : %s) sur le site '%s': %s
ECommerceWoocommerceUpdateRemoteBatchProduct = Erreur lors de la mise à jour du produit (UGS : %s) sur le site '%s': %s
@@ -145,5 +151,5 @@ ECommerceWoocommerceErrorUpdateDictTaxRate = Erreur lo
ECommerceWoocommerceErrorAddDictTaxRate = Erreur lors de l'ajout de la ligne du taux de la taxe (ID: %s): %s
ECommerceWooCommerceErrorTaxNotFound = Erreur la taxe n'a pas été trouvée dans celles synchronisées (ID: %s)
ECommerceWooCommerceErrorDontSupportMultiTaxes = Le module ne supporte pas actuellement le multi-taxe.
-ECommerceWoocommerceErrorGetWoocommerceWebHooks = Erreur de récupération des crochets web sur le site '%s': %s
+ECommerceWoocommerceErrorGetWoocommerceWebHooks = Erreur de récupération des crochets web sur le site '%s':
ECommerceWoocommerceErrorTaxClassNotFoundFromTaxRate = La taxe '%s' n'est pas trouvée dans le dictionnaire de taxe du module WooSync pour le site '%s' pour le produit '%s'
diff --git a/langs/it_IT/ecommerce.lang b/langs/it_IT/ecommerce.lang
index 2026fab..959e5b4 100644
--- a/langs/it_IT/ecommerce.lang
+++ b/langs/it_IT/ecommerce.lang
@@ -162,6 +162,7 @@ ShowDebugTools=Mostra gli strumenti init / purge / debug
ECommerceShipping=Spese di spedizione
ECommercePriceLevel=Livello dei prezzi
ECommercePriceLevelDescription=Solo questo livello di prezzo sarà sincronizzato tra Dolibarr ed E-commerce
+ECommerceUpdateLevelPrice =Mise à jour du niveau de prix
ECommerceConfirmUpdatePriceLevel=Hai modificato il livello dei prezzi. I prodotti sul sito di e-commerce verranno aggiornati. Potrebbe essere necessario molto tempo, confermare.
SeeECommerceConfFileIfKo=See content of file %s, on your eCommerce server, if this URL does not work.
RestrictNbInSync=Restrict number of record of same object to synchronize in same request
@@ -171,14 +172,15 @@ ECommerceDontUpdateDolibarrCompany
ECommerceDontUpdateDolibarrCompanyDescription =Ne pas mettre à jour le tiers sur Dolibarr lorsqu'il existe déja dans dolibarr
## OAuth Setup ##
-ECommerceOAuthWordpressSetup=Connessione OAuth2 su WordPress (continua su questa pagina, quindi "Aggiungi un nuovo client" per creare le credenziali OAuth2)
-ECommerceSiteOAuthRedirectUri=URL di reindirizzamento
-ECommerceSiteOAuthRedirectUriDescription=Utilizzare il seguente URL come URI di richiamata quando si crea una nuova applicazione (o un nuovo client)
-ECommerceSiteOAuthId=OAuth ID
-ECommerceSiteOAuthIdDescription=ID connessione servizio OAuth
-ECommerceSiteOAuthSecret=OAuth secret
-ECommerceSiteOAuthSecretDescription=Client Secret della connessione al servizio OAuth
-ECommerceOAuthCheckToken=continua questa pagina per controllare / cancellare le autorizzazioni salvate dal provider OAuth2.
+ECommerceWordpressAuthenticationSetup =Connexion sur WordPress (Allez sur cette page , puis configurer la connexion)
+ECommerceWordpressAuthenticationType =Type d'authentification
+ECommerceWordpressAuthenticationTypeDescription =Choissiez entre la connexion interne Wordpress avec un mot de passe d'application situé sur un utilisateur Ou une authentification JWT grâçe à l'extension "WordPress REST API Authentication" de miniOrange
+ECommerceWordpressAuthenticationTypeWordpressApplication =Mot de passe d'application (Wordpress)
+ECommerceWordpressAuthenticationTypeJWTAuthentication =Authentification JWT
+ECommerceWordpressAuthenticationLogin =Identifiant
+ECommerceWordpressAuthenticationLoginDescription =Identifiant de connexion
+ECommerceWordpressAuthenticationPassword =Mot de passe
+ECommerceWordpressAuthenticationPasswordDescription =Mot de passe de connexion
ECommerceOrderStatusSetup=Sincronizzazione degli stati degli ordini
ECommerceOrderStatusSetupDescription=Scegli lo stato corrispondente durante la sincronizzazione.
@@ -224,12 +226,14 @@ ECommerceCreateRemoteProductLink=Errore durante la creazione del collegamento al
ECommerceUpdateRemoteOrderLink=Errore durante l'aggiornamento del collegamento dell'ordine cliente 'id:%s' per lo shop '%s': %s
ECommerceUpdateRemoteInvoiceLink=Errore durante l'aggiornamento del collegamento alla fattura 'id:%s' per lo shop '%s': %s
-ECommerceRealTimeSynchroDolibarrToECommerceSetup = Sincronizzazione in tempo reale da Dolibarr allo Shop
-ECommerceThirdParty = Soggetti terzi
-ECommerceContact = Contatti
-ECommerceProduct = Prodotti
-ECommerceOrder = Ordini clienti
-ECommerceRealTimeSynchroDolibarrToECommerceSetupDescription = Sincronizza l'articolo nello shop dopo la modifica dell'articolo collegato in Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceThirdParty =Synchronisation du tiers en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceThirdPartyDescription =Synchronisation du tiers dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceContact =Synchronisation du contact en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceContactDescription =Synchronisation du contact dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceProduct =Synchronisation du produit en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceProductDescription =Synchronisation du produit dans le site E-Commerce à la modification de celui lié dans Dolibarr
+ECommerceRealTimeSynchroDolibarrToECommerceOrder =Synchronisation de la commande en temps réel de Dolibarr vers E-Commerce
+ECommerceRealTimeSynchroDolibarrToECommerceOrderDescription =Synchronisation de la commande dans le site E-Commerce à la modification de celui lié dans Dolibarr
ECommerceSyncheCommerceMotherCategoryCreateError=Erreur de création du lien de la catégorie racine pour la catégorie distante '%s' 'id:%s' sur le site '%s'.
ECommerceNGUpdateElementDateMoreRecent=Inclus aussi les éléments dont la date de mise à jour est plus récente que celle de synchronisation
@@ -312,14 +316,21 @@ ECommerceOnlyNew = Only the new ones
ECommerceUpdateRemoteCompanyLinkWhenMergeCompany = Errore durante l'aggiornamento del collegamento della società "id: %s" durante l'unione con la società 'id:%s': %s
ECommerceSynchronizeStockToECommerce=Synchronization of the product stock on the site %s.
-ECommerceCreateOrderInvoiceWhenSyncOrder = Actions when retrieving WooCommerce orders
ECommerceCreateOrder = Create the order
+ECommerceCreateOrderDescription = Activer la création de la commande a la synchronisation de la commande
ECommerceCreateInvoice = Create the bill
+ECommerceCreateInvoiceDescription =Activer la création de la facture a la synchronisation de la commande
+ECommerceCreateInvoiceType =Type la facture
+ECommerceCreateInvoiceTypeDescription =Type la facture créée a la synchronisation de la commande
ECommerceCreateSupplierInvoiceFromFee = Create the supplier bill from the charges
+ECommerceCreateSupplierInvoiceFromFeeDescription =Créer la facture fournisseur à partir des frais lors de la creation de la facture
ECommerceFeeLineAsItemLine = The fee line is as the service line
+ECommerceFeeLineAsItemLineDescription =Considérer les lignes de frais comme des lignes de services lors de la création de la commande/facture
ECommerceSendInvoiceByMail = Send the bill by email
+ECommerceSendInvoiceByMailDescription =Envoyer la facture par courriel après la création avec succes de la facture
ECommerceCreateOrderDescription = Related actions when retrieving WooCommerce orders (Enter the payment methods associated with WooCommerce)
ECommerceCreateInvoiceIfAmount0 =Créer la facture même si le montant est égale à 0
+ECommerceCreateInvoiceIfAmount0Description =Créer la facture même si le montant est nul lors de la synchronisation de la commande
ECommercePaymentGatewaysCorrespondence = Correspondence of the payment methods with the site
ECommercePaymentGatewayLabel = Payment method on the site
diff --git a/langs/it_IT/woocommerce.lang b/langs/it_IT/woocommerce.lang
index dbe678d..2c1b40c 100644
--- a/langs/it_IT/woocommerce.lang
+++ b/langs/it_IT/woocommerce.lang
@@ -2,32 +2,32 @@
CHARSET=UTF-8
ECommerceWoocommerceConnect=Errore di connessione allo shop '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrCommande=Errore durante il recupero degli ordini dallo shop '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProduct=Errore durante il recupero dei prodotti dallo shop '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProductVariations=Errore durante il recupero delle varianti del prodotto remoto 'id:%s' dallo shop '%s': %s
-ECommerceWoocommerceCheckRemoteProductExist =Erreur lors de la verification de l'existance du produit %s sur le site '%s': %s
-ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSociete=Errore durante il recupero dei soggetti terzi dallo shop '%s': %s
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrCommande=Errore durante il recupero degli ordini dallo shop '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProduct=Errore durante il recupero dei prodotti dallo shop '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrProductVariations=Errore durante il recupero delle varianti del prodotto remoto 'id:%s' dallo shop '%s':
+ECommerceWoocommerceCheckRemoteProductExist =Erreur lors de la verification de l'existance du produit %s sur le site '%s':
+ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSociete=Errore durante il recupero dei soggetti terzi dallo shop '%s':
ECommerceWoocommerceConvertRemoteObjectIntoDolibarrSocpeople=Errore durante il recupero dei soggetti terzi (per i contatti / indirizzi) dallo shop '%s': %s
-ECommerceWoocommerceCreateRemoteProduct=Errore durante la creazione del prodotto 'id:%s' dallo shop '%s': %s
+ECommerceWoocommerceCreateRemoteProduct=Errore durante la creazione del prodotto 'id:%s' dallo shop '%s':
ECommerceWoocommerceCreateRemoteProductLink=Errore di creazione del collegamento per il prodotto 'id:%s' per lo shop '%s': %s
-ECommerceWoocommerceGetCategoryData=Errore durante il recupero dei dati dalla categoria remota 'id:%s' per lo shop '%s': %s
-ECommerceWoocommerceGetCommandeToUpdate=Errore durante il recupero dell'elenco degli ordini da aggiornare sullo shop '%s': %s
-ECommerceWoocommerceGetProductToUpdate=Errore durante il recupero dell'elenco dei prodotti da aggiornare sullo shop '%s': %s
-ECommerceWoocommerceGetRemoteCategoryTree=Errore durante il recupero dell'elenco delle categorie da aggiornare sullo shop '%s': %s
-ECommerceWoocommerceGetSocieteToUpdate=Errore durante il recupero dell'elenco dei soggetti terzi da aggiornare sullo shop '%s': %s
-ECommerceWoocommerceSendFileForCommande=Errore durante il collegamento del file con l'ordine cliente remoto'id:%s' per lo shop '%s': %s
+ECommerceWoocommerceGetCategoryData=Errore durante il recupero dei dati dalla categoria remota 'id:%s' per lo shop '%s':
+ECommerceWoocommerceGetCommandeToUpdate=Errore durante il recupero dell'elenco degli ordini da aggiornare sullo shop '%s':
+ECommerceWoocommerceGetProductToUpdate=Errore durante il recupero dell'elenco dei prodotti da aggiornare sullo shop '%s':
+ECommerceWoocommerceGetRemoteCategoryTree=Errore durante il recupero dell'elenco delle categorie da aggiornare sullo shop '%s':
+ECommerceWoocommerceGetSocieteToUpdate=Errore durante il recupero dell'elenco dei soggetti terzi da aggiornare sullo shop '%s':
+ECommerceWoocommerceSendFileForCommande=Errore durante il collegamento del file con l'ordine cliente remoto'id:%s' per lo shop '%s':
ECommerceWoocommerceSendFileForCommandeInWordpress=Errore durante l'invio del file per il comando remoto 'id:%s' nei media di Wordpress per lo shop '%s': %s
-ECommerceWoocommerceUpdateRemoteCommande=Errore durante l'aggiornamento dell'ordine cliente remoto 'id:%s' per lo shop '%s': %s
-ECommerceWoocommerceUpdateRemoteProduct=Errore durante l'aggiornamento del prodotto remoto 'id:%s' per lo shop '%s': %s
-ECommerceWoocommerceUpdateRemoteProductGetRemoteProduct=Errore durante il recupero del prodotto remoto 'id:%s' per lo shop '%s': %s
+ECommerceWoocommerceUpdateRemoteCommande=Errore durante l'aggiornamento dell'ordine cliente remoto 'id:%s' per lo shop '%s':
+ECommerceWoocommerceUpdateRemoteProduct=Errore durante l'aggiornamento del prodotto remoto 'id:%s' per lo shop '%s':
+ECommerceWoocommerceUpdateRemoteProductGetRemoteProduct=Errore durante il recupero del prodotto remoto 'id:%s' per lo shop '%s':
ECommerceWoocommerceUpdateRemoteProductSendImage=Errore durante l'invio di un'immagine per il prodotto remoto 'id:%s' nei media di Wordpress per lo shop '%s': %s
-ECommerceWoocommerceUpdateRemoteProductVariation=Errore durante l'aggiornamento della variazione 'id:%s' del prodotto remoto 'id:%s' per lo shop '%s': %s
-ECommerceWoocommerceUpdateRemoteSociete=Errore durante l'aggiornamento dell'azienda remota 'id:%s' per lo shop '%s': %s
-ECommerceWoocommerceUpdateRemoteSocpeople=Errore durante l'aggiornamento dei contatti / indirizzi dell'azienda remota 'id:%s' per lo shop '%s': %s
+ECommerceWoocommerceUpdateRemoteProductVariation=Errore durante l'aggiornamento della variazione 'id:%s' del prodotto remoto 'id:%s' per lo shop '%s':
+ECommerceWoocommerceUpdateRemoteSociete=Errore durante l'aggiornamento dell'azienda remota 'id:%s' per lo shop '%s':
+ECommerceWoocommerceUpdateRemoteSocpeople=Errore durante l'aggiornamento dei contatti / indirizzi dell'azienda remota 'id:%s' per lo shop '%s':
ECommerceWoocommerceUpdateRemoteStockProduct=Errore di aggiornamento delle scorte di magazzino (%s) del prodotto remoto 'id:%s' per lo shop '%s':
ECommerceWoocommerceUpdateRemoteStockProductVariation=Errore di aggiornamento dello stock (%s) della variante 'id:%s' del prodotto remoto 'id:%s' per lo shop '%s':
-ECommerceWoocommerceGetAllWoocommerceTaxClass=Errore durante la raccolta dei dati sull'aliquota fiscale per lo shop '%s': %s
-ECommerceWoocommerceGetWoocommerceTaxes=Errore durante il recupero delle aliquote fiscali per lo shop '%s': %s
+ECommerceWoocommerceGetAllWoocommerceTaxClass=Errore durante la raccolta dei dati sull'aliquota fiscale per lo shop '%s':
+ECommerceWoocommerceGetWoocommerceTaxes=Errore durante il recupero delle aliquote fiscali per lo shop '%s':
ECommerceWoocommerceCreateRemoteProductSendImage=Errore durante l'invio di un'immagine per il prodotto 'ref:%s' nei media di Wordpress per lo shop '%s': %s
ECommercengWoocommerceStatus=Stato per lo shop [%s]
@@ -61,13 +61,14 @@ ECommercengWoocommerceOrderStatusRefunded=Rimborsato
ECommercengWoocommerceOrderStatusFailed=Fallito
ECommercengWoocommerceExtrafieldsCorrespondence = Abbina attributi aggiuntivi ai metadati di Woocommerce
+ECommercengWoocommerceExtrafieldsCorrespondenceOf = Correspondance des attributs supplémentaires des "%s" avec les méta-données de Woocommerce
ECommercengWoocommerceExtrafieldsCorrespondenceSetupDescription = Inserisci il nome dei metadati corrispondenti a questo attributo aggiuntivo: %s
ECommerceWoocommerceCreateRemoteCategoryParentNotCreated = Errore per lo shop '%s' durante la ricerca dell'ID principale della categoria '%s' (slug: '%s')
-ECommerceWoocommerceCreateRemoteBatchCategories = Errore durante la creazione delle categorie lotto sullo shop '%s': %s
+ECommerceWoocommerceCreateRemoteBatchCategories = Errore durante la creazione delle categorie lotto sullo shop '%s':
ECommerceWoocommerceCreateRemoteBatchProducts = Errore durante la creazione di lotti di prodotto sullo shop '%s': %s
-ECommerceWoocommerceCreateRemoteBatchCategory = Errore durante la creazione della categoria (slug : %s) per lo shop '%s': %s
+ECommerceWoocommerceCreateRemoteBatchCategory = Errore durante la creazione della categoria (slug : %s) per lo shop '%s':
ECommerceWoocommerceCreateRemoteBatchProduct = Errore durante la creazione del prodotto (sku : %s) per lo shop'%s': %s
ECommerceWoocommerceUpdateRemoteBatchProduct = Errore durante l'aggiornamento del prodotto (sku : %s) per lo shop'%s': %s
diff --git a/lib/eCommerce.lib.php b/lib/eCommerce.lib.php
index 8480d3d..c6edb4c 100644
--- a/lib/eCommerce.lib.php
+++ b/lib/eCommerce.lib.php
@@ -22,6 +22,71 @@
dol_include_once('/ecommerceng/class/business/eCommerceSynchro.class.php');
dol_include_once('/ecommerceng/class/data/woocommerce/eCommerceRemoteAccessWoocommerce.class.php');
+/**
+ * Prepare array with list of tabs for configuration of sites
+ *
+ * @param eCommerceSite $object Site handler
+ * @return array Array of tabs to show
+ */
+function ecommercengConfigSitePrepareHead($object)
+{
+ global $langs, $conf, $user;
+ $h = 0;
+ $head = array();
+
+ $head[$h][0] = dol_buildpath("/ecommerceng/admin/setup.php", 1) . ($object->id > 0 ? '?id=' . $object->id : '');
+ $head[$h][1] = $langs->trans("Parameters");
+ $head[$h][2] = 'settings';
+ $h++;
+
+ if ($object->id > 0) {
+ if (!empty($conf->societe->enabled)) {
+ $langs->load('companies');
+ $head[$h][0] = dol_buildpath("/ecommerceng/admin/thirdparty.php", 1) . '?id=' . $object->id;
+ $head[$h][1] = $langs->trans("ThirdParty");
+ $head[$h][2] = 'thirdparty';
+ $h++;
+ }
+
+ if (!empty($conf->product->enabled)) {
+ $langs->load('products');
+ $head[$h][0] = dol_buildpath("/ecommerceng/admin/product.php", 1) . '?id=' . $object->id;
+ $head[$h][1] = $langs->trans("Product");
+ $head[$h][2] = 'product';
+ $h++;
+ }
+
+ if (!empty($conf->stock->enabled)) {
+ $langs->load('products');
+ $head[$h][0] = dol_buildpath("/ecommerceng/admin/stock.php", 1) . '?id=' . $object->id;
+ $head[$h][1] = $langs->trans("Stock");
+ $head[$h][2] = 'stock';
+ $h++;
+ }
+
+ if (!empty($conf->commande->enabled) || !empty($conf->facture->enabled)) {
+ $langs->loadLangs(array('orders','bills'));
+ $labels = array();
+ if (!empty($conf->commande->enabled)) $labels[] = $langs->trans("Order");
+ if (!empty($conf->facture->enabled)) $labels[] = $langs->trans("Invoice");
+ $head[$h][0] = dol_buildpath("/ecommerceng/admin/order.php", 1) . '?id=' . $object->id;
+ $head[$h][1] = implode(' / ', $labels);
+ $head[$h][2] = 'order_invoice';
+ $h++;
+ }
+ }
+
+ // Show more tabs from modules
+ // Entries must be declared in modules descriptor with line
+ // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+ // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'ecommerceng_config_site');
+
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'ecommerceng_config_site', 'remove');
+
+ return $head;
+}
+
/**
* Update the price for all product in the ecommerce product category for this site price level
* @param eCommerceSite $siteDb Object eCommerceSite
@@ -494,35 +559,35 @@ function ecommerceng_update_woocommerce_attribute($db, $site)
} else {
$attribute = $attributes[$line['attribute_id']];
$result = $eCommerceDict->update([
- 'attribute_name' => ['value'=>$attribute->name,'type'=>'string'],
- 'attribute_slug' => ['value'=>$attribute->slug,'type'=>'string'],
- 'attribute_type' => ['value'=>$attribute->type,'type'=>'string'],
- 'attribute_order_by' => ['value'=>$attribute->order_by,'type'=>'string'],
- 'attribute_has_archives' => ['value'=>$attribute->has_archives?1:0],
+ 'attribute_name' => ['value'=>$attribute['name'],'type'=>'string'],
+ 'attribute_slug' => ['value'=>$attribute['slug'],'type'=>'string'],
+ 'attribute_type' => ['value'=>$attribute['type'],'type'=>'string'],
+ 'attribute_order_by' => ['value'=>$attribute['order_by'],'type'=>'string'],
+ 'attribute_has_archives' => ['value'=>$attribute['has_archives']?1:0],
], ['rowid' => ['value' => $line['rowid']]]);
if ($result == false) {
setEventMessage($langs->trans('ECommerceWoocommerceErrorUpdateDictAttribute', $line['attribute_slug'], $db->error()), 'errors');
$db->rollback();
return false;
}
- $attributes[$line['attribute_id']]->founded = true;
+ $attributes[$line['attribute_id']]['founded'] = true;
}
}
// Add new attribute from woocommerce
foreach ($attributes as $attribute) {
- if (!isset($attribute->founded)) {
+ if (!isset($attribute['founded'])) {
// Add new attribute
$result = $eCommerceDict->insert(['site_id','attribute_id','attribute_name','attribute_slug','attribute_type','attribute_order_by','attribute_has_archives','entity','active'], ['site_id'=>['value'=>$site->id],
- 'attribute_id'=>['value'=>$attribute->id],
- 'attribute_name'=>['value'=>$attribute->name,'type'=>'string'],
- 'attribute_slug'=>['value'=>$attribute->slug,'type'=>'string'],
- 'attribute_type'=>['value'=>$attribute->type,'type'=>'string'],
- 'attribute_order_by'=>['value'=>$attribute->order_by,'type'=>'string'],
- 'attribute_has_archives'=>['value'=>$attribute->has_archives?1:0],
+ 'attribute_id'=>['value'=>$attribute['id']],
+ 'attribute_name'=>['value'=>$attribute['name'],'type'=>'string'],
+ 'attribute_slug'=>['value'=>$attribute['slug'],'type'=>'string'],
+ 'attribute_type'=>['value'=>$attribute['type'],'type'=>'string'],
+ 'attribute_order_by'=>['value'=>$attribute['order_by'],'type'=>'string'],
+ 'attribute_has_archives'=>['value'=>$attribute['has_archives']?1:0],
'entity'=>['value'=>$conf->entity],'active'=>['value'=>1]]);
if ($result == false) {
- setEventMessage($langs->trans('ECommerceWoocommerceErrorAddDictAttribute', $attribute->slug, $attribute->name, $db->error()), 'errors');
+ setEventMessage($langs->trans('ECommerceWoocommerceErrorAddDictAttribute', $attribute['slug'], $attribute['name'], $db->error()), 'errors');
$db->rollback();
return false;
}
@@ -571,23 +636,23 @@ function ecommerceng_update_woocommerce_dict_tax($db, $site)
return false;
}
} else {
- $result = $eCommerceDict->update(['label' => ['value'=>$taxClasses[$line['code']]->name,'type'=>'string']], ['rowid' => ['value' => $line['rowid']]]);
+ $result = $eCommerceDict->update(['label' => ['value'=>$taxClasses[$line['code']]['name'],'type'=>'string']], ['rowid' => ['value' => $line['rowid']]]);
if ($result == false) {
setEventMessage($langs->trans('ECommerceWoocommerceErrorUpdateDictTaxClass', $line['code'], $db->error()), 'errors');
$db->rollback();
return false;
}
- $taxClasses[$line['code']]->founded = true;
+ $taxClasses[$line['code']]['founded'] = true;
}
}
// Add new code from woocommerce
foreach ($taxClasses as $taxClass) {
- if (!isset($taxClass->founded)) {
+ if (!isset($taxClass['founded'])) {
// Add new tax class code
- $result = $eCommerceDict->insert(['site_id','code','label','entity','active'], ['site_id'=>['value'=>$site->id],'code'=>['value'=>$taxClass->slug,'type'=>'string'],'label'=>['value'=>$taxClass->name,'type'=>'string'],'entity'=>['value'=>$conf->entity],'active'=>['value'=>1]]);
+ $result = $eCommerceDict->insert(['site_id','code','label','entity','active'], ['site_id'=>['value'=>$site->id],'code'=>['value'=>$taxClass['slug'],'type'=>'string'],'label'=>['value'=>$taxClass['name'],'type'=>'string'],'entity'=>['value'=>$conf->entity],'active'=>['value'=>1]]);
if ($result == false) {
- setEventMessage($langs->trans('ECommerceWoocommerceErrorAddDictTaxClass', $taxClass->slug, $taxClass->name, $db->error()), 'errors');
+ setEventMessage($langs->trans('ECommerceWoocommerceErrorAddDictTaxClass', $taxClass['slug'], $taxClass['name']) . ' ' . $db->error(), 'errors');
$db->rollback();
return false;
}
@@ -618,35 +683,35 @@ function ecommerceng_update_woocommerce_dict_tax($db, $site)
}
} else {
$taxRate = $taxRates[$line['tax_id']];
- $rate = price2num($taxRate->rate);
+ $rate = price2num($taxRate['rate']);
if (strpos((string)$rate, '.') === false) $rate = $rate . '.0';
- $result = $eCommerceDict->update(['tax_country'=>['value'=>$taxRate->country,'type'=>'string'],'tax_state'=>['value'=>$taxRate->state,'type'=>'string'],
- 'tax_postcode'=>['value'=>$taxRate->postcode,'type'=>'string'],'tax_city'=>['value'=>$taxRate->city,'type'=>'string'],'tax_rate'=>['value'=>$rate,'type'=>'string'],
- 'tax_name'=>['value'=>$taxRate->name,'type'=>'string'],'tax_priority'=>['value'=>$taxRate->priority],'tax_compound'=>['value'=>$taxRate->compound?1:0],
- 'tax_shipping'=>['value'=>$taxRate->shipping?1:0],'tax_order'=>['value'=>$taxRate->order],'tax_class'=>['value'=>$taxRate->class,'type'=>'string']], ['rowid' => ['value' => $line['rowid']]]);
+ $result = $eCommerceDict->update(['tax_country'=>['value'=>$taxRate['country'],'type'=>'string'],'tax_state'=>['value'=>$taxRate['state'],'type'=>'string'],
+ 'tax_postcode'=>['value'=>$taxRate['postcode'],'type'=>'string'],'tax_city'=>['value'=>$taxRate['city'],'type'=>'string'],'tax_rate'=>['value'=>$rate,'type'=>'string'],
+ 'tax_name'=>['value'=>$taxRate['name'],'type'=>'string'],'tax_priority'=>['value'=>$taxRate['priority']],'tax_compound'=>['value'=>$taxRate['compound']?1:0],
+ 'tax_shipping'=>['value'=>$taxRate['shipping']?1:0],'tax_order'=>['value'=>$taxRate['order']],'tax_class'=>['value'=>$taxRate['class'],'type'=>'string']], ['rowid' => ['value' => $line['rowid']]]);
if ($result == false) {
setEventMessage($langs->trans('ECommerceWoocommerceErrorUpdateDictTaxRate', $line['tax_id'], $db->error()), 'errors');
$db->rollback();
return false;
}
- $taxRates[$line['tax_id']]->founded = true;
+ $taxRates[$line['tax_id']]['founded'] = true;
}
}
// Add new tax rate from woocommerce
foreach ($taxRates as $taxRate) {
- if (!isset($taxRate->founded)) {
- $rate = price2num($taxRate->rate);
+ if (!isset($taxRate['founded'])) {
+ $rate = price2num($taxRate['rate']);
if (strpos((string)$rate, '.') === false) $rate = $rate . '.0';
// Add new tax rate
$result = $eCommerceDict->insert(['site_id','tax_id','tax_country','tax_state','tax_postcode','tax_city','tax_rate','tax_name','tax_priority','tax_compound','tax_shipping','tax_order','tax_class','entity','active'],
- ['site_id'=>['value'=>$site->id],'tax_id'=>['value'=>$taxRate->id],'tax_country'=>['value'=>$taxRate->country,'type'=>'string'],'tax_state'=>['value'=>$taxRate->state,'type'=>'string'],
- 'tax_postcode'=>['value'=>$taxRate->postcode,'type'=>'string'],'tax_city'=>['value'=>$taxRate->city,'type'=>'string'],'tax_rate'=>['value'=>$rate,'type'=>'string'],
- 'tax_name'=>['value'=>$taxRate->name,'type'=>'string'],'tax_priority'=>['value'=>$taxRate->priority],'tax_compound'=>['value'=>$taxRate->compound?1:0],
- 'tax_shipping'=>['value'=>$taxRate->shipping?1:0],'tax_order'=>['value'=>$taxRate->order],'tax_class'=>['value'=>$taxRate->class,'type'=>'string']
+ ['site_id'=>['value'=>$site->id],'tax_id'=>['value'=>$taxRate['id']],'tax_country'=>['value'=>$taxRate['country'],'type'=>'string'],'tax_state'=>['value'=>$taxRate['state'],'type'=>'string'],
+ 'tax_postcode'=>['value'=>$taxRate['postcode'],'type'=>'string'],'tax_city'=>['value'=>$taxRate['city'],'type'=>'string'],'tax_rate'=>['value'=>$rate,'type'=>'string'],
+ 'tax_name'=>['value'=>$taxRate['name'],'type'=>'string'],'tax_priority'=>['value'=>$taxRate['priority']],'tax_compound'=>['value'=>$taxRate['compound']?1:0],
+ 'tax_shipping'=>['value'=>$taxRate['shipping']?1:0],'tax_order'=>['value'=>$taxRate['order']],'tax_class'=>['value'=>$taxRate['class'],'type'=>'string']
,'entity'=>['value'=>$conf->entity],'active'=>['value'=>1]]);
if ($result == false) {
- setEventMessage($langs->trans('ECommerceWoocommerceErrorAddDictTaxRate', $taxRate->slug, $db->error()), 'errors');
+ setEventMessage($langs->trans('ECommerceWoocommerceErrorAddDictTaxRate', $taxRate['slug'], $db->error()), 'errors');
$db->rollback();
return false;
}
@@ -707,6 +772,71 @@ function ecommerceng_update_payment_gateways($db, $site)
return true;
}
+function ecommerceng_update_remote_warehouses($db, $site)
+{
+ global $conf, $langs;
+ $langs->load('woocommerce@ecommerceng');
+
+ dol_include_once('/ecommerceng/class/business/eCommerceSynchro.class.php');
+ $synchro = new eCommerceSynchro($db, $site, 0, 0);
+
+ dol_syslog("site.php Try to connect to eCommerce site " . $site->name);
+ $result = $synchro->connect();
+ if (!$result) {
+ setEventMessages($synchro->error, $synchro->errors, 'errors');
+ return false;
+ }
+
+ $remote_warehouses_list = $synchro->getAllRemoteWarehouses();
+ if ($remote_warehouses_list === false) {
+ setEventMessages($synchro->error, $synchro->errors, 'errors');
+ return false;
+ }
+
+ // Get all payment gateways
+ dol_include_once('/ecommerceng/class/data/eCommerceRemoteWarehousesPluginSlSupport.class.php');
+ $remote_warehouses = new eCommerceRemoteWarehouses($db);
+ $currentRemoteWarehouses = $remote_warehouses->get_all($site->id);
+ if (!is_array($currentRemoteWarehouses) && $currentRemoteWarehouses < 0) {
+ setEventMessages($remote_warehouses->error, $remote_warehouses->errors, 'errors');
+ return false;
+ }
+
+ $finalRemoteWarehouses = array();
+
+ // Add remotes warehouses
+ foreach ($remote_warehouses_list as $remote_code => $infos) {
+ $finalRemoteWarehouses[$remote_code] = array(
+ 'remote_id' => $infos['remote_id'],
+ 'remote_name' => $infos['name'],
+ 'warehouse_id' => $currentRemoteWarehouses[$remote_code]['warehouse_id'] > 0 ? $currentRemoteWarehouses[$remote_code]['warehouse_id'] : 0,
+ 'set_even_if_empty_stock' => $currentRemoteWarehouses[$remote_code]['set_even_if_empty_stock'] > 0 ? $currentRemoteWarehouses[$remote_code]['set_even_if_empty_stock'] : 0,
+ 'old_entry' => 0,
+ );
+ }
+
+ // Add current warehouses who has been deleted
+ foreach ($currentRemoteWarehouses as $remote_code => $infos) {
+ if (!isset($finalRemoteWarehouses[$remote_code])) {
+ $finalRemoteWarehouses[$remote_code] = array(
+ 'remote_id' => $infos['remote_id'],
+ 'remote_name' => $infos['name'],
+ 'warehouse_id' => $infos['warehouse_id'],
+ 'set_even_if_empty_stock' => $infos['set_even_if_empty_stock'],
+ 'old_entry' => 1,
+ );
+ }
+ }
+
+ $result = $remote_warehouses->set($site->id, $finalRemoteWarehouses);
+ if ($result < 0) {
+ setEventMessages($remote_warehouses->error, $remote_warehouses->errors, 'errors');
+ return false;
+ }
+
+ return true;
+}
+
function get_company_by_email($db, $email, $site=0)
{
$email = $db->escape($email);
diff --git a/patchs/dolibarr/includes/OAuth/OAuth2/Service/WordPress.php b/patchs/dolibarr/includes/OAuth/OAuth2/Service/WordPress.php
deleted file mode 100755
index c59e90c..0000000
--- a/patchs/dolibarr/includes/OAuth/OAuth2/Service/WordPress.php
+++ /dev/null
@@ -1,97 +0,0 @@
-baseApiUri = new Uri('https://addresse_de_votre_site_wordpress');
- }
- }
-/*
- // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
- public $approvalPrompt='auto';
- public function setApprouvalPrompt($prompt)
- {
- if (!in_array($prompt, array('auto', 'force'), true)) {
- // @todo Maybe could we rename this exception
- throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
- }
- $this->approvalPrompt = $prompt;
- }*/
-
- /**
- * {@inheritdoc}
- */
- public function getAuthorizationEndpoint()
- {
- return new Uri(sprintf('%s/oauth/authorize', $this->baseApiUri));
- }
-
- /**
- * {@inheritdoc}
- */
- public function getAccessTokenEndpoint()
- {
- return new Uri(sprintf('%s/oauth/token', $this->baseApiUri));
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getAuthorizationMethod()
- {
- global $conf;
- return empty($conf->global->OAUTH_WORDPRESS_AUTHORIZATION_METHOD_QUERY_STRING) ? static::AUTHORIZATION_METHOD_HEADER_BEARER : static::AUTHORIZATION_METHOD_QUERY_STRING;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function parseAccessTokenResponse($responseBody)
- {
- $data = json_decode($responseBody, true);
-
- if (null === $data || !is_array($data)) {
- throw new TokenResponseException('Unable to parse response: "'.(isset($responseBody)?$responseBody:'NULL').'"');
- } elseif (isset($data['error'])) {
- throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '" : "'.$data['error_description'].'"');
- }
-
- $token = new StdOAuth2Token();
- $token->setAccessToken($data['access_token']);
- $token->setLifetime($data['expires_in']);
-
- if (isset($data['refresh_token'])) {
- $token->setRefreshToken($data['refresh_token']);
- unset($data['refresh_token']);
- }
-
- unset($data['access_token']);
- unset($data['expires_in']);
-
- $token->setExtraParams($data);
-
- return $token;
- }
-}
diff --git a/scripts/syncronize_all_stocks_to_ecommerce.php b/scripts/syncronize_all_stocks_to_ecommerce.php
deleted file mode 100755
index 5dd02a9..0000000
--- a/scripts/syncronize_all_stocks_to_ecommerce.php
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/usr/bin/env php
-
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-/**
- * \file scripts/osv_companies_categories.php
- * \ingroup cron
- * \brief Execute pendings jobs
- */
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
-if (! defined('NOLOGIN')) define('NOLOGIN','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
-
-
-$sapi_type = php_sapi_name();
-$script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
-
-// Test if batch mode
-if (substr($sapi_type, 0, 3) == 'cgi') {
- echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
- exit(-1);
-}
-
-// Check parameters
-if (! isset($argv[1]) || ! $argv[1]) {
- print 'Usage: ' . $script_file . ' user_login_in_dolibarr';
- exit(-1);
-}
-$userlogin=$argv[1];
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-$res=0;
-if (! $res && file_exists("../../master.inc.php")) $res=@include '../../master.inc.php'; // to work if your module directory is into a subdir of root htdocs directory
-if (! $res && file_exists("../../../master.inc.php")) $res=@include '../../../master.inc.php'; // to work if your module directory is into a subdir of root htdocs directory
-if (! $res) die("Include of main fails");
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
-dol_include_once('/ecommerceng/class/data/eCommerceSite.class.php');
-dol_include_once('/ecommerceng/class/business/eCommerceSynchro.class.php');
-dol_include_once('/ecommerceng/class/data/eCommerceProduct.class.php');
-dol_include_once('/ecommerceng/lib/eCommerce.lib.php');
-
-// Global variables
-$version=DOL_VERSION;
-$product_cached = array();
-
-/*
- * Main
- */
-
-// current date
-$now=dol_now();
-
-@set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=" . $userlogin . " ***** " . $now . " *****\n";
-print "\n";
-
-$user = new User($db);
-$res = $user->fetch('', $userlogin);
-if ($res == 0) {
- print "Error user (Login: $userlogin) not found\n";
- $db->close();
- exit(0);
-} elseif ($res < 0) {
- print "Error fetch user (Login: $userlogin) : " . $user->errorsToString() . "\n";
- $db->close();
- exit(0);
-}
-
-$movement_stock_static = new MouvementStock($db);
-$categories = new Categorie($db);
-$siteDb = new eCommerceSite($db);
-
-$all_cat_full_arbo = $categories->get_full_arbo('product');
-$sites = $siteDb->listSites('object');
-
-$max_sites = count($sites);
-$num_sites = 0;
-
-if ($max_sites > 0) {
- $startTime = microtime(true);
-
- foreach ($sites as $site) {
- print "Processing the site '{$site->name}'.\n";
- $num_sites++;
- $max_jobs = 0;
- $num_jobs = 0;
-
- $result = $site->setEntityValues($site->entity);
- if ($result < 0) {
- print "Error set entity to {$site->entity} : " . $db->lasterror() . "\n";
- continue;
- }
- $user->getrights();
-
- print "Connect to the site.\n";
- $eCommerceSynchro = new eCommerceSynchro($db, $site);
- $eCommerceSynchro->connect();
- if (count($eCommerceSynchro->errors)) {
- print "Warning: Connect to site fails: {$eCommerceSynchro->errorsToString()}.\n";
- continue;
- }
-
- print "Get all WooCommerce product categories.\n";
- $woocommerce_product_categories = array();
- if ($site->fk_cat_product > 0) {
- $woocommerce_product_categories[$site->fk_cat_product] = $site->fk_cat_product;
- foreach ($all_cat_full_arbo as $cat_infos) {
- if (preg_match("/^{$site->fk_cat_product}$/", $cat_infos['fullpath']) || preg_match("/^{$site->fk_cat_product}_/", $cat_infos['fullpath']) ||
- preg_match("/_{$site->fk_cat_product}_/", $cat_infos['fullpath']) || preg_match("/_{$site->fk_cat_product}$/", $cat_infos['fullpath'])) {
- $woocommerce_product_categories[$cat_infos['id']] = $cat_infos['id'];
- }
- }
- }
- if (empty($woocommerce_product_categories)) {
- print "Warning: WooCommerce product categories not found.\n";
- continue;
- }
-
- $supported_warehouses = is_array($site->parameters['fk_warehouse_to_ecommerce']) ? $site->parameters['fk_warehouse_to_ecommerce'] : array();
- if (empty($supported_warehouses)) {
- print "Warning: Warehouses not configured.\n";
- continue;
- }
-
- $sql = "SELECT DISTINCT cp.fk_product AS product_id";
- $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
- $sql .= " WHERE cp.fk_categorie IN (" . implode(',', $woocommerce_product_categories) . ")";
-
- $resql = $db->query($sql);
- if ($resql) {
- $max_jobs = $db->num_rows($resql);
- while ($obj = $db->fetch_object($resql)) {
- $error = 0;
-
- // Get product link
- $eCommerceProduct = new eCommerceProduct($db);
- $result = $eCommerceProduct->fetchByProductId($obj->product_id, $site->id);
- if ($result < 0) {
- print "\nError: Get product link (ID: {$obj->product_id}): " . errorsToString($eCommerceProduct) . ".\n";
- $error++;
- } elseif (empty($eCommerceProduct->remote_id)) {
- print "\nError: Get product remote ID (ID: {$obj->product_id}).\n";
- $error++;
- }
-
- // Get product
- if (!$error) {
- $dbProduct = getProduct($obj->product_id);
- if (!($dbProduct->id > 0)) {
- print "\nError: Get product (ID: {$obj->product_id}): " . errorsToString($dbProduct) . ".\n";
- $error++;
- } else {
- $movement_stock_static->qty_after = 0;
- foreach ($supported_warehouses as $warehouse_id) {
- $movement_stock_static->qty_after += isset($dbProduct->stock_warehouse[$warehouse_id]->real) ? $dbProduct->stock_warehouse[$warehouse_id]->real : 0;
- }
- }
- }
-
- if (!$error) {
- $db->begin();
-
- // Update remote product stock
- $result = $eCommerceSynchro->eCommerceRemoteAccess->updateRemoteStockProduct($eCommerceProduct->remote_id, $movement_stock_static, $dbProduct);
- if (!$result) {
- print "\nError: Update product stock (ID: {$obj->product_id}, remote ID: {$eCommerceProduct->remote_id}): " . errorsToString($eCommerceSynchro->eCommerceRemoteAccess) . ".\n";
- $error++;
- }
-
- // Update product link
- if (!$error) {
- $eCommerceProduct->last_update = dol_print_date(dol_now(), '%Y-%m-%d %H:%M:%S');
- $result = $eCommerceProduct->update($user);
- if ($result < 0) {
- print "\nError: Update product link (ID: {$obj->product_id}): " . errorsToString($eCommerceProduct) . ".\n";
- $error++;
- }
- }
-
- if ($error) {
- $db->rollback();
- $db->close();
- exit(0);
- } else {
- $db->commit();
- }
- }
-
- $num_jobs++;
- printStatus($num_sites, $max_sites, $num_jobs, $max_jobs);
- }
-
- $db->free($resql);
- } else {
- print "\nError: SQL : $sql; Error: " . $db->lasterror() . "\n";
- continue;
- }
- }
-}
-
-print "\nEnd.\n";
-
-$db->close();
-
-exit(0);
-
-function getProduct($product_id)
-{
- global $db, $product_cached;
-
- if (!isset($product_cached[$product_id])) {
- $dbProduct = new Product($db);
- $dbProduct->fetch($product_id);
- $dbProduct->load_stock();
-
- $product_cached[$product_id] = $dbProduct;
- }
-
- return $product_cached[$product_id];
-}
-
-function errorsToString($object, $separator = ', ')
-{
- return $object->error . (is_array($object->errors) ? (!empty($object->error) ? $separator : '') . join($separator, $object->errors) : '');
-}
-
-function printStatus($num_sites, $max_sites, $num_jobs, $max_jobs)
-{
- global $startTime;
-
- $sub_percent = $num_sites * 100 / $max_sites;
- $percent = $num_jobs * $sub_percent / $max_jobs;
- $elapsedTime = microtime(true) - $startTime;
- $remainingTime = $percent > 0 ? $elapsedTime * (100 - $percent) / $percent : 0;
- print sprintf("\rStatus: Site: %2d / %2d - Product: %6d / %6d - %3d%% - Elapsed: " . microTimeToTime($elapsedTime) . " - Remaining: " . microTimeToTime($remainingTime), $num_sites, $max_sites, $num_jobs, $max_jobs, $percent);
-}
-
-function microTimeToTime($microtime)
-{
- $hours = (int)($microtime / 60 / 60);
- $minutes = (int)($microtime / 60) - $hours * 60;
- $seconds = (int)$microtime - $hours * 60 * 60 - $minutes * 60;
- return sprintf("%02d:%02d:%02d", $hours, $minutes, $seconds);
-}
\ No newline at end of file
diff --git a/scripts/syncronize_products_to_ecommerce.php b/scripts/syncronize_products_to_ecommerce.php
index 4b5a7fc..4431eb3 100755
--- a/scripts/syncronize_products_to_ecommerce.php
+++ b/scripts/syncronize_products_to_ecommerce.php
@@ -196,6 +196,7 @@
$eCommerceProduct->fk_site = $site->id;
$eCommerceProduct->fk_product = $dbProduct->id;
$eCommerceProduct->last_update = dol_print_date(dol_now(), '%Y-%m-%d %H:%M:%S');
+ if ($site->stock_sync_direction == 'dolibarr2ecommerce') $eCommerceProduct->last_update_stock = $eCommerceProduct->last_update;
$result = $eCommerceProduct->create($user);
if ($result < 0) {
print "\nError: Create product link (ID: {$obj->product_id}): " . errorsToString($eCommerceProduct) . ".\n";
@@ -206,6 +207,7 @@
$result = $eCommerceProduct->fetch($obj->link_id);
if ($result > 0) {
$eCommerceProduct->last_update = dol_print_date(dol_now(), '%Y-%m-%d %H:%M:%S');
+ if ($site->stock_sync_direction == 'dolibarr2ecommerce') $eCommerceProduct->last_update_stock = $eCommerceProduct->last_update;
$result = $eCommerceProduct->update($user);
}
if ($result < 0) {
diff --git a/sql/llx_ecommerce_product.sql b/sql/llx_ecommerce_product.sql
index f795ae0..2846d24 100644
--- a/sql/llx_ecommerce_product.sql
+++ b/sql/llx_ecommerce_product.sql
@@ -21,5 +21,6 @@ CREATE TABLE llx_ecommerce_product (
fk_product integer NOT NULL,
fk_site integer NOT NULL,
remote_id varchar(255) NOT NULL,
- last_update datetime default NULL
+ last_update datetime default NULL,
+ last_update_stock datetime default NULL
) ENGINE=InnoDB COMMENT='Table transition remote site - Dolibarr';
diff --git a/sql/llx_ecommerce_site.sql b/sql/llx_ecommerce_site.sql
index cddacd5..afeb6b5 100644
--- a/sql/llx_ecommerce_site.sql
+++ b/sql/llx_ecommerce_site.sql
@@ -21,18 +21,27 @@ CREATE TABLE llx_ecommerce_site (
name varchar(255) NOT NULL,
type integer NOT NULL DEFAULT 1,
webservice_address varchar(255) NOT NULL,
+ authentication_type varchar(255) NULL,
user_name varchar(255) DEFAULT NULL,
user_password varchar(255) DEFAULT NULL,
+ wordpress_authentication_type varchar(255) NULL,
+ wordpress_authentication_login varchar(255) NULL,
+ wordpress_authentication_password varchar(255) NULL,
+ wordpress_timeout integer NOT NULL DEFAULT 30,
+ wordpress_debug integer(1) NULL,
price_level integer NULL DEFAULT 1,
filter_label varchar(255) DEFAULT NULL,
filter_value varchar(255) DEFAULT NULL,
fk_cat_societe integer NOT NULL,
fk_cat_product integer NOT NULL,
fk_warehouse integer NULL,
+ fk_anonymous_thirdparty integer NULL,
stock_sync_direction varchar(24) DEFAULT 'none',
last_update datetime DEFAULT NULL,
- timeout integer NOT NULL DEFAULT 300,
+ timeout integer NOT NULL DEFAULT 30,
+ debug integer(1) NULL,
magento_use_special_price INTEGER NOT NULL DEFAULT 0,
- magento_price_type VARCHAR(3) NOT NULL DEFAULT 'HT',
+ ecommerce_price_type VARCHAR(3) NOT NULL DEFAULT 'HT',
+ parameters TEXT NULL,
entity integer DEFAULT 1
) ENGINE=InnoDB;
diff --git a/sql/llx_ecommerceng_remote_warehouses.key.sql b/sql/llx_ecommerceng_remote_warehouses.key.sql
new file mode 100644
index 0000000..0f2644a
--- /dev/null
+++ b/sql/llx_ecommerceng_remote_warehouses.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2011 Auguria
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- ===================================================================
+
+ALTER TABLE llx_ecommerceng_remote_warehouses ADD UNIQUE INDEX uk_ecommerceng_remote_warehouses(site_id,remote_code,entity);
+--ALTER TABLE llx_ecommerceng_remote_warehouses ADD CONSTRAINT fk_ecommerceng_remote_warehouses_warehouse_id FOREIGN KEY (warehouse_id) REFERENCES llx_entrepot(rowid);
\ No newline at end of file
diff --git a/sql/llx_ecommerceng_remote_warehouses.sql b/sql/llx_ecommerceng_remote_warehouses.sql
new file mode 100644
index 0000000..3504b7c
--- /dev/null
+++ b/sql/llx_ecommerceng_remote_warehouses.sql
@@ -0,0 +1,30 @@
+-- ===================================================================
+-- Copyright (C) 2011 Auguria
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- ===================================================================
+
+create table llx_ecommerceng_remote_warehouses
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ site_id integer NOT NULL,
+ remote_code varchar(255) NOT NULL, --Remote warehouse code
+ remote_id varchar(255) NOT NULL, --Remote warehouse ID
+ remote_name varchar(255) NOT NULL, --Remote warehouse name
+ warehouse_id integer, -- Dolibarr warehouse ID
+ set_even_if_empty_stock tinyint(1), -- Flag for set the stock of the warehouse even if the stock is empty
+ old_entry tinyint(1), -- Flag for set if this warehouse has been delete on WooCommerce
+ entity integer DEFAULT 1
+) ENGINE=InnoDB;
\ No newline at end of file
diff --git a/sql/update.sql b/sql/update.sql
index 964b77b..5500471 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -18,8 +18,8 @@
-- v4.0.18
ALTER TABLE llx_ecommerce_site ADD COLUMN fk_anonymous_thirdparty integer NULL;
-ALTER TABLE llx_ecommerce_site ADD COLUMN oauth_id varchar(255) NULL after user_password;
-ALTER TABLE llx_ecommerce_site ADD COLUMN oauth_secret varchar(255) NULL after oauth_id;
+-- ALTER TABLE llx_ecommerce_site ADD COLUMN oauth_id varchar(255) NULL after user_password;
+-- ALTER TABLE llx_ecommerce_site ADD COLUMN oauth_secret varchar(255) NULL after oauth_id;
ALTER TABLE llx_ecommerce_site ADD COLUMN price_level integer NULL DEFAULT 1;
ALTER TABLE llx_ecommerce_site CHANGE COLUMN magento_price_type ecommerce_price_type VARCHAR(3) NOT NULL DEFAULT 'HT';
@@ -36,3 +36,15 @@ ALTER TABLE llx_ecommerce_pending_webhooks CHANGE COLUMN webhook_data webhook_da
-- v4.0.92
ALTER TABLE llx_ecommerce_site ADD COLUMN entity integer NULL DEFAULT 1;
+
+-- v4.1.35
+ALTER TABLE llx_ecommerce_site ADD COLUMN authentication_type varchar(255) NULL after webservice_address;
+ALTER TABLE llx_ecommerce_site ADD COLUMN debug integer(1) NULL after timeout;
+ALTER TABLE llx_ecommerce_site ADD COLUMN wordpress_authentication_type varchar(255) NULL after user_password;
+ALTER TABLE llx_ecommerce_site CHANGE COLUMN oauth_id wordpress_authentication_login varchar(255) NULL;
+ALTER TABLE llx_ecommerce_site CHANGE COLUMN oauth_secret wordpress_authentication_password varchar(255) NULL;
+ALTER TABLE llx_ecommerce_site ADD COLUMN wordpress_authentication_login varchar(255) NULL after wordpress_authentication_type;
+ALTER TABLE llx_ecommerce_site ADD COLUMN wordpress_authentication_password varchar(255) NULL after wordpress_authentication_login;
+ALTER TABLE llx_ecommerce_site ADD COLUMN wordpress_timeout integer NOT NULL DEFAULT 30 after wordpress_authentication_password;
+ALTER TABLE llx_ecommerce_site ADD COLUMN wordpress_debug integer(1) NULL after wordpress_timeout;
+ALTER TABLE llx_ecommerce_product ADD COLUMN last_update_stock datetime default NULL after last_update;