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

partial fix status mapping, remove deprecated code

Browse Source
This commit is contained in:
Alex Lushpai 2016-01-13 01:49:36 +03:00
parent fc0b1d33f9
commit cc18170153
3 changed files with 12 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retailcrm/lib/RetailcrmIcml.php
View File

@ -117,7 +117,7 @@ class RetailcrmIcml
$e->appendChild( $e->appendChild(
$this->dd->createElement($key) $this->dd->createElement($key)
)->appendChild( )->appendChild(
$this->dd->createTextNode($offer[$key]) $this->dd->createTextNode(trim($offer[$key]))
); );
} }

11
retailcrm/lib/RetailcrmReferences.php
View File

@ -44,18 +44,25 @@ class RetailcrmReferences
public function getStatuses() public function getStatuses()
{ {
$statusTypes = array(); $statusTypes = array();
/**
* TODO: state ids duplicates between both arrays, temporary disable return states
*
$states = array_merge( $states = array_merge(
OrderState::getOrderStates($this->default_lang, true), OrderState::getOrderStates($this->default_lang, true),
OrderReturnState::getOrderReturnStates($this->default_lang, true) OrderReturnState::getOrderReturnStates($this->default_lang, true)
); );
*/
$states = OrderState::getOrderStates($this->default_lang, true);
if (!empty($states)) { if (!empty($states)) {
foreach ($states as $state) { foreach ($states as $state) {
if ($state['name'] != ' ') { if ($state['name'] != ' ') {
$key = isset($state['id_order_state']) /*$key = isset($state['id_order_state'])
? $state['id_order_state'] ? $state['id_order_state']
: $state['id_order_return_state'] : $state['id_order_return_state']
; ;*/
$key = $state['id_order_state'];
$statusTypes[] = array( $statusTypes[] = array(
'type' => 'select', 'type' => 'select',
'label' => $state['name'], 'label' => $state['name'],

80
retailcrm/retailcrm.php
View File

@ -63,8 +63,7 @@ class RetailCRM extends Module
Configuration::deleteByName('RETAILCRM_API_TOKEN') && Configuration::deleteByName('RETAILCRM_API_TOKEN') &&
Configuration::deleteByName('RETAILCRM_API_STATUS') && Configuration::deleteByName('RETAILCRM_API_STATUS') &&
Configuration::deleteByName('RETAILCRM_API_DELIVERY') && Configuration::deleteByName('RETAILCRM_API_DELIVERY') &&
Configuration::deleteByName('RETAILCRM_LAST_SYNC') && Configuration::deleteByName('RETAILCRM_LAST_SYNC');
Configuration::deleteByName('RETAILCRM_API_ADDR');
} }
public function getContent() public function getContent()
@ -91,7 +90,6 @@ class RetailCRM extends Module
$delivery = json_encode(Tools::getValue('RETAILCRM_API_DELIVERY')); $delivery = json_encode(Tools::getValue('RETAILCRM_API_DELIVERY'));
$status = json_encode(Tools::getValue('RETAILCRM_API_STATUS')); $status = json_encode(Tools::getValue('RETAILCRM_API_STATUS'));
$payment = json_encode(Tools::getValue('RETAILCRM_API_PAYMENT')); $payment = json_encode(Tools::getValue('RETAILCRM_API_PAYMENT'));
$order_address = json_encode(Tools::getValue('RETAILCRM_API_ADDR'));
if (!$address || empty($address) || !Validate::isGenericName($address)) { if (!$address || empty($address) || !Validate::isGenericName($address)) {
$output .= $this->displayError($this->l('Invalid crm address')); $output .= $this->displayError($this->l('Invalid crm address'));
@ -103,7 +101,6 @@ class RetailCRM extends Module
Configuration::updateValue('RETAILCRM_API_DELIVERY', $delivery); Configuration::updateValue('RETAILCRM_API_DELIVERY', $delivery);
Configuration::updateValue('RETAILCRM_API_STATUS', $status); Configuration::updateValue('RETAILCRM_API_STATUS', $status);
Configuration::updateValue('RETAILCRM_API_PAYMENT', $payment); Configuration::updateValue('RETAILCRM_API_PAYMENT', $payment);
Configuration::updateValue('RETAILCRM_API_ADDR', $order_address);
$output .= $this->displayConfirmation($this->l('Settings updated')); $output .= $this->displayConfirmation($this->l('Settings updated'));
} }
} }
@ -176,14 +173,6 @@ class RetailCRM extends Module
); );
} }
/*
* Address fields
*/
// $fields_form[4]['form'] = array(
// 'legend' => array('title' => $this->l('Address')),
// 'input' => $this->getAddressFields()
// );
/* /*
* Diplay forms * Diplay forms
*/ */
@ -256,67 +245,9 @@ class RetailCRM extends Module
} }
} }
// $addressSettings = Configuration::get('RETAILCRM_API_ADDR');
//
// if (isset($addressSettings) && $addressSettings != '') {
// $addressTypes = json_decode($addressSettings);
// foreach ($addressTypes as $idx => $address) {
// $name = 'RETAILCRM_API_ADDR[' . $idx . ']';
// $helper->fields_value[$name] = $address;
// }
// }
return $helper->generateForm($fields_form); return $helper->generateForm($fields_form);
} }
// public function getAddressFields()
// {
// $addressFields = array();
// $address = explode(' ', str_replace("\n", ' ', AddressFormat::getAddressCountryFormat($this->context->country->id)));
//
// if (!empty($address)) {
// foreach ($address as $idx => $a) {
// if (!in_array($a, array('vat_number', 'phone_mobile', 'company'))) {
// if (!strpos($a, ':')) {
// $a = preg_replace('/_/', ' ', $a);
// $a = preg_replace('/[\,\.]/', '', $a);
// $addressFields[] = array(
// 'type' => 'select',
// 'label' => $this->l((string)ucfirst($a)),
// 'name' => 'RETAILCRM_API_ADDR[' . $idx . ']',
// 'required' => false,
// 'options' => array(
// 'query' => array(
// array('name' => '', 'id_option' => ''),
// array('name' => $this->l('FIRST_NAME'), 'id_option' => 'first_name'),
// array('name' => $this->l('LAST_NAME'), 'id_option' => 'last_name'),
// array('name' => $this->l('PHONE'), 'id_option' => 'phone'),
// array('name' => $this->l('EMAIL'), 'id_option' => 'email'),
// array('name' => $this->l('ADDRESS'), 'id_option' => 'address'),
// array('name' => $this->l('COUNTRY'), 'id_option' => 'country'),
// array('name' => $this->l('REGION'), 'id_option' => 'region'),
// array('name' => $this->l('CITY'), 'id_option' => 'city'),
// array('name' => $this->l('ZIP'), 'id_option' => 'index'),
// array('name' => $this->l('STREET'), 'id_option' => 'street'),
// array('name' => $this->l('BUILDING'), 'id_option' => 'building'),
// array('name' => $this->l('FLAT'), 'id_option' => 'flat'),
// array('name' => $this->l('INTERCOMCODE'), 'id_option' => 'intercomcode'),
// array('name' => $this->l('FLOOR'), 'id_option' => 'floor'),
// array('name' => $this->l('BLOCK'), 'id_option' => 'block'),
// array('name' => $this->l('HOUSE'), 'ID' => 'house')
// ),
// 'id' => 'id_option',
// 'name' => 'name'
// )
// );
// }
// }
// }
// }
//
// return $addressFields;
// }
public function hookActionCustomerAccountAdd($params) public function hookActionCustomerAccountAdd($params)
{ {
$this->api->customersCreate( $this->api->customersCreate(
@ -365,14 +296,7 @@ class RetailCRM extends Module
'lastName' => $params['customer']->lastname, 'lastName' => $params['customer']->lastname,
'firstName' => $params['customer']->firstname, 'firstName' => $params['customer']->firstname,
'email' => $params['customer']->email, 'email' => $params['customer']->email,
'phones' => array( 'phones' => array(array('number' => $address['phone'])),
array(
'number' => $address['phone'],
),
array(
'number' => $address['phone_mobile'],
)
),
'createdAt' => $params['customer']->date_add 'createdAt' => $params['customer']->date_add
) )
); );