RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-01 19:03:14 +03:00
Code Issues Projects Releases Wiki Activity

Support transfer company and vat number in CRM custom fields (#224)

Browse Source
This commit is contained in:
Uryvskiy Dima 2024-07-31 17:39:31 +03:00 committed by GitHub
parent d0782028ee
commit 41509493e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 117 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v3.6.7
* Добавлена передача полей "Компания" и "Номер НДС" из заказа CMS в пользовательские поля заказа CRM
## v3.6.6
* Добавлена передача поля link при выгрузке брошенных корзин

2
VERSION
View File

@ -1 +1 @@
3.6.6
3.6.7

29
retailcrm/lib/RetailcrmHistory.php
View File

@ -1235,10 +1235,10 @@ class RetailcrmHistory
$addressBuilder = new RetailcrmCustomerAddressBuilder();
$address = $addressBuilder
->setIdCustomer($customer->id)
->setDataCrm(isset($order['delivery']['address']) ? $order['delivery']['address'] : [])
->setFirstName(isset($order['firstName']) ? $order['firstName'] : null)
->setLastName(isset($order['lastName']) ? $order['lastName'] : null)
->setPhone(isset($order['phone']) ? $order['phone'] : null)
->setDataCrm($order['delivery']['address'] ?? [])
->setFirstName($order['firstName'] ?? null)
->setLastName($order['lastName'] ?? null)
->setPhone($order['phone'] ?? null)
->build()
->getData()
;
@ -1525,10 +1525,13 @@ class RetailcrmHistory
return;
}
if (RetailcrmTools::validateEntity($addressInvoice, null, true)) {
$addressInvoice->id_customer = $customer->id;
RetailcrmTools::assignAddressIdsByFields($customer, $addressInvoice);
self::setCompanyAndVatNumberForInvoiceAddress($order, $addressInvoice);
if (empty($addressInvoice->id)) {
self::loadInPrestashop($addressInvoice, 'save');
@ -1954,6 +1957,24 @@ class RetailcrmHistory
return $orderDetail;
}
private static function setCompanyAndVatNumberForInvoiceAddress($crmOrder, $addressInvoice)
{
if (!RetailcrmTools::isCorporateEnabled()
&& RetailcrmTools::isCampanyAndVatNumberSendEnabled()
) {
$company = $crmOrder['customFields']['ps_company'] ?? '';
$vatNumber = $crmOrder['customFields']['ps_vat_number'] ?? '';
if ('' !== $company) {
$addressInvoice->company = $company;
}
if ('' !== $vatNumber) {
$addressInvoice->vat_number = $vatNumber;
}
}
}
private static function handleError($order, $e)
{
RetailcrmLogger::writeCaller(

29
retailcrm/lib/RetailcrmOrderBuilder.php
View File

@ -979,15 +979,25 @@ class RetailcrmOrderBuilder
;
$crmOrder = array_merge($crmOrder, $addressBuilder->getDataArray());
if ($addressInvoice instanceof Address && !empty($addressInvoice->company)) {
$crmOrder['contragent']['legalName'] = $addressInvoice->company;
$isCorporateEnabled = RetailcrmTools::isCorporateEnabled();
if (!empty($addressInvoice->vat_number)) {
$crmOrder['contragent']['INN'] = $addressInvoice->vat_number;
if ($isCorporateEnabled && RetailcrmTools::isOrderCorporate($order)) {
$crmOrder['contragent']['contragentType'] = 'legal-entity';
$crmOrder['contragent']['legalName'] = $addressInvoice->company ?? '';
$crmOrder['contragent']['INN'] = $addressInvoice->vat_number ?? '';
} else {
$crmOrder['contragent']['contragentType'] = 'individual';
if (
RetailcrmTools::isCampanyAndVatNumberSendEnabled()
&& Configuration::get(RetailCRM::COMPANY_AND_VAT_NUMBER_CREATED)
) {
$crmOrder['customFields']['ps_company'] = $addressInvoice->company ?? '';
$crmOrder['customFields']['ps_vat_number'] = $addressInvoice->vat_number ?? '';
}
}
if (isset($payment[$paymentType]) && !empty($payment[$paymentType])) {
if (!empty($payment[$paymentType])) {
$order_payment = [
'externalId' => $order->id . '#' . $order->reference,
'type' => $payment[$paymentType],
@ -1124,9 +1134,6 @@ class RetailcrmOrderBuilder
'productName' => $product['product_name'],
'quantity' => $product['product_quantity'],
'initialPrice' => round($product['product_price'], 2),
/*'initialPrice' => !empty($item['rate'])
? $item['price'] + ($item['price'] * $item['rate'] / 100)
: $item['price'],*/
'purchasePrice' => round($product['purchase_supplier_price'], 2),
];
@ -1161,12 +1168,6 @@ class RetailcrmOrderBuilder
if (!empty($site)) {
$crmOrder['customer']['site'] = $site;
}
if (RetailcrmTools::isCorporateEnabled() && RetailcrmTools::isOrderCorporate($order)) {
$crmOrder['contragent']['contragentType'] = 'legal-entity';
} else {
$crmOrder['contragent']['contragentType'] = 'individual';
}
}
return RetailcrmTools::filter(

48
retailcrm/lib/RetailcrmTools.php
View File

@ -58,6 +58,28 @@ class RetailcrmTools
return self::$default_lang;
}
/**
* Returns ISO code of current employee language or default language.
*
* @return string
*/
public static function getCurrentLanguageISO()
{
global $cookie;
$context = Context::getContext();
if (!empty($context) && !empty($context->employee)) {
$langId = (int) $context->employee->id_lang;
} elseif ($cookie instanceof Cookie) {
$langId = (int) $cookie->id_lang;
} else {
$langId = (int) Configuration::get('PS_LANG_DEFAULT');
}
return (string) Language::getIsoById($langId);
}
/**
* Returns true if corporate customers are enabled in settings
*
@ -78,6 +100,16 @@ class RetailcrmTools
return (bool) Configuration::get(RetailCRM::ENABLE_ICML_SERVICES);
}
/**
* Returns true if the transfer of company and VAT number is enabled in the settings
*
* @return bool
*/
public static function isCampanyAndVatNumberSendEnabled()
{
return (bool) Configuration::get(RetailCRM::ENABLE_COMPANY_AND_VAT_NUMBER_SEND);
}
/**
* Returns true if customer is corporate
*
@ -969,22 +1001,6 @@ class RetailcrmTools
}
}
/**
* @param $name
*
* @return DateTime|false
*/
public static function getConfigurationCreatedAtByName($name)
{
$config = self::getConfigurationByName($name);
if (empty($config)) {
return false;
}
return DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $config['date_add']);
}
/**
* @return string
*/

2
retailcrm/lib/api/RetailcrmApiClientV5.php
View File

@ -362,7 +362,7 @@ class RetailcrmApiClientV5
);
}
if (empty($entity) || 'customer' != $entity || 'order' != $entity) {
if (empty($entity)) {
throw new \InvalidArgumentException(
'Parameter `entity` must contain a data & value must be `order` or `customer`'
);

33
retailcrm/lib/settings/RetailcrmSettings.php
View File

@ -87,6 +87,13 @@ class RetailcrmSettings
$changed['consultantScript'] = $this->consultantScript->getValueStored();
}
if (
!empty($changed['enableCompanyAndVatNumberSend'])
&& !Configuration::get(RetailCRM::COMPANY_AND_VAT_NUMBER_CREATED)
) {
$this->createCompanyAndVatNumberFields();
}
return [
'success' => $this->validator->getSuccess(),
'errors' => $this->validator->getErrors(),
@ -127,4 +134,30 @@ class RetailcrmSettings
}
}
}
private function createCompanyAndVatNumberFields()
{
$api = RetailcrmTools::getApiClient();
$locale = RetailcrmTools::getCurrentLanguageISO();
$translate = [
'ru' => ['company' => 'Компания', 'vat_number' => 'Номер НДС'],
'en' => ['company' => 'Company', 'vat_number' => 'VAT number'],
];
$company = $translate[$locale]['company'] ?? 'Empresa';
$vatNumber = $translate[$locale]['vat_number'] ?? 'Número de IVA';
$customFields = [
['code' => 'ps_company', 'name' => $company, 'type' => 'string', 'displayArea' => 'customer'],
['code' => 'ps_vat_number', 'name' => $vatNumber, 'type' => 'string', 'displayArea' => 'customer'],
];
if (null !== $api) {
foreach ($customFields as $field) {
$api->customFieldsCreate('order', $field);
}
Configuration::updateValue(RetailCRM::COMPANY_AND_VAT_NUMBER_CREATED, true);
}
}
}

1
retailcrm/lib/settings/RetailcrmSettingsItems.php
View File

@ -62,6 +62,7 @@ class RetailcrmSettingsItems
'enableCorporate' => new RetailcrmSettingsItemBool('enableCorporate', RetailCRM::ENABLE_CORPORATE_CLIENTS),
'enableOrderNumberSending' => new RetailcrmSettingsItemBool('enableOrderNumberSending', RetailCRM::ENABLE_ORDER_NUMBER_SENDING),
'enableOrderNumberReceiving' => new RetailcrmSettingsItemBool('enableOrderNumberReceiving', RetailCRM::ENABLE_ORDER_NUMBER_RECEIVING),
'enableCompanyAndVatNumberSend' => new RetailcrmSettingsItemBool('enableCompanyAndVatNumberSend', RetailCRM::ENABLE_COMPANY_AND_VAT_NUMBER_SEND),
'webJobs' => new RetailcrmSettingsItemBool('webJobs', RetailCRM::ENABLE_WEB_JOBS, '1'),
'debugMode' => new RetailcrmSettingsItemBool('debugMode', RetailCRM::ENABLE_DEBUG_MODE),

22
retailcrm/lib/templates/RetailcrmAbstractTemplate.php
View File

@ -65,28 +65,6 @@ abstract class RetailcrmAbstractTemplate
$this->assets = $assets;
}
/**
* Returns ISO code of current employee language or default language.
*
* @return string
*/
protected function getCurrentLanguageISO()
{
$langId = 0;
global $cookie;
if (!empty($this->context) && !empty($this->context->employee)) {
$langId = (int) $this->context->employee->id_lang;
} elseif ($cookie instanceof Cookie) {
$langId = (int) $cookie->id_lang;
} else {
$langId = (int) Configuration::get('PS_LANG_DEFAULT');
}
return (string) Language::getIsoById($langId);
}
/**
* @param $file
*

2
retailcrm/lib/templates/RetailcrmSettingsTemplate.php
View File

@ -47,7 +47,7 @@ class RetailcrmSettingsTemplate extends RetailcrmAbstractTemplate
'chunk-vendors' => filemtime(_PS_MODULE_DIR_ . '/retailcrm/views/js/chunk-vendors.js'),
],
'appData' => [
'locale' => $this->getCurrentLanguageISO(),
'locale' => RetailcrmTools::getCurrentLanguageISO(),
'debug' => RetailcrmTools::isDebug(),
'routes' => [
'settings' => RetailcrmTools::getAdminControllerUrl(RetailcrmSettingsController::class),

7
retailcrm/retailcrm.php
View File

@ -48,7 +48,7 @@ require_once dirname(__FILE__) . '/bootstrap.php';
class RetailCRM extends Module
{
const VERSION = '3.6.6';
const VERSION = '3.6.7';
const API_URL = 'RETAILCRM_ADDRESS';
const API_KEY = 'RETAILCRM_API_TOKEN';
@ -72,12 +72,12 @@ class RetailCRM extends Module
const ENABLE_BALANCES_RECEIVING = 'RETAILCRM_ENABLE_BALANCES_RECEIVING';
const ENABLE_ORDER_NUMBER_SENDING = 'RETAILCRM_ENABLE_ORDER_NUMBER_SENDING';
const ENABLE_ORDER_NUMBER_RECEIVING = 'RETAILCRM_ENABLE_ORDER_NUMBER_RECEIVING';
const ENABLE_COMPANY_AND_VAT_NUMBER_SEND = 'RETAILCRM_ENABLE_COMPANY_AND_VAT_NUMBER_SEND';
const COMPANY_AND_VAT_NUMBER_CREATED = 'RETAILCRM_COMPANY_AND_VAT_NUMBER_CREATED';
const ENABLE_DEBUG_MODE = 'RETAILCRM_ENABLE_DEBUG_MODE';
const CONSULTANT_SCRIPT = 'RETAILCRM_CONSULTANT_SCRIPT';
const CONSULTANT_RCCT = 'RETAILCRM_CONSULTANT_RCCT';
const ENABLE_WEB_JOBS = 'RETAILCRM_ENABLE_WEB_JOBS';
const REQUIRED_CRM_SITE_ACCESS = 'access_selective';
const REQUIRED_CRM_SITE_COUNT = 1;
const REQUIRED_CRM_SCOPES = [
@ -343,6 +343,7 @@ class RetailCRM extends Module
&& Configuration::deleteByName(static::ENABLE_BALANCES_RECEIVING)
&& Configuration::deleteByName(static::ENABLE_ORDER_NUMBER_SENDING)
&& Configuration::deleteByName(static::ENABLE_ORDER_NUMBER_RECEIVING)
&& Configuration::deleteByName(static::ENABLE_COMPANY_AND_VAT_NUMBER_SEND)
&& Configuration::deleteByName(static::ENABLE_DEBUG_MODE)
&& Configuration::deleteByName(static::ENABLE_WEB_JOBS)
&& Configuration::deleteByName('RETAILCRM_LAST_SYNC')

2
retailcrm/views/js/app.js
View File

File diff suppressed because one or more lines are too long