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

correct export and set lang rule (#15)

Browse Source
This commit is contained in:
DmitryZagorulko 2017-06-16 16:13:25 +03:00 committed by Alex Lushpai
parent 226e88966b
commit 9bbe23195c
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
retailcrm/job/export.php
View File

@ -113,8 +113,13 @@ foreach ($orderRecords as $record) {
$products = $object->getProducts(); $products = $object->getProducts();
foreach($products as $product) { foreach($products as $product) {
if(isset($product['product_attribute_id']) && $product['product_attribute_id'] > 0) {
$productId = $product['product_id'] . '#' . $product['product_attribute_id'];
} else {
$productId = $product['product_id'];
}
$item = array( $item = array(
'productId' => $product['product_id'], 'offer' => array('externalId' => $productId),
'productName' => $product['product_name'], 'productName' => $product['product_name'],
'quantity' => $product['product_quantity'], 'quantity' => $product['product_quantity'],
'initialPrice' => round($product['product_price'], 2), 'initialPrice' => round($product['product_price'], 2),

10
retailcrm/lib/RetailcrmReferences.php
View File

@ -50,10 +50,6 @@ class RetailcrmReferences
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'])
? $state['id_order_state']
: $state['id_order_return_state']
;*/
$key = $state['id_order_state']; $key = $state['id_order_state'];
$statusTypes[] = array( $statusTypes[] = array(
'type' => 'select', 'type' => 'select',
@ -98,7 +94,7 @@ class RetailcrmReferences
return $paymentTypes; return $paymentTypes;
} }
public function getPaymentAndDeliveryForDefault() public function getPaymentAndDeliveryForDefault($arParams)
{ {
$paymentTypes = array(); $paymentTypes = array();
$deliveryTypes = array(); $deliveryTypes = array();
@ -121,7 +117,7 @@ public function getPaymentAndDeliveryForDefault()
$paymentDeliveryTypes[] = array( $paymentDeliveryTypes[] = array(
'type' => 'select', 'type' => 'select',
'label' => "Доставка", 'label' => $arParams[0],
'name' => 'RETAILCRM_API_DELIVERY_DEFAULT', 'name' => 'RETAILCRM_API_DELIVERY_DEFAULT',
'required' => false, 'required' => false,
'options' => array( 'options' => array(
@ -148,7 +144,7 @@ public function getPaymentAndDeliveryForDefault()
$paymentDeliveryTypes[] = array( $paymentDeliveryTypes[] = array(
'type' => 'select', 'type' => 'select',
'label' => "Система оплаты", 'label' => $arParams[1],
'name' => 'RETAILCRM_API_PAYMENT_DEFAULT', 'name' => 'RETAILCRM_API_PAYMENT_DEFAULT',
'required' => false, 'required' => false,
'options' => array( 'options' => array(

4
retailcrm/retailcrm.php
View File

@ -190,8 +190,8 @@ class RetailCRM extends Module
* Default * Default
*/ */
$fields_form[4]['form'] = array( $fields_form[4]['form'] = array(
'legend' => array('title' => 'По умолчанию'), 'legend' => array('title' => $this->l('Default')),
'input' => $this->reference->getPaymentAndDeliveryForDefault(), 'input' => $this->reference->getPaymentAndDeliveryForDefault(array($this->l('Delivery method'), $this->l('Payment type'))),
); );
} }

3
retailcrm/translations/ru.php
View File

@ -18,6 +18,8 @@ $_MODULE['<{retailcrm}prestashop>retailcrm_c9cc8cce247e49bae79f15173ce97354'] =
$_MODULE['<{retailcrm}prestashop>retailcrm_065ab3a28ca4f16f55f103adc7d0226f'] = 'Способы доставки'; $_MODULE['<{retailcrm}prestashop>retailcrm_065ab3a28ca4f16f55f103adc7d0226f'] = 'Способы доставки';
$_MODULE['<{retailcrm}prestashop>retailcrm_33af8066d3c83110d4bd897f687cedd2'] = 'Статусы заказов'; $_MODULE['<{retailcrm}prestashop>retailcrm_33af8066d3c83110d4bd897f687cedd2'] = 'Статусы заказов';
$_MODULE['<{retailcrm}prestashop>retailcrm_bab959acc06bb03897b294fbb892be6b'] = 'Способы оплаты'; $_MODULE['<{retailcrm}prestashop>retailcrm_bab959acc06bb03897b294fbb892be6b'] = 'Способы оплаты';
$_MODULE['<{retailcrm}prestashop>retailcrm_6310f29293c902c64db619c29179d99a'] = 'Способ доставки';
$_MODULE['<{retailcrm}prestashop>retailcrm_4dbcb38bbbff5d4a402f2575c57a35e6'] = 'Тип оплаты';
$_MODULE['<{retailcrm}prestashop>retailcrm_dd7bf230fde8d4836917806aff6a6b27'] = 'Адрес'; $_MODULE['<{retailcrm}prestashop>retailcrm_dd7bf230fde8d4836917806aff6a6b27'] = 'Адрес';
$_MODULE['<{retailcrm}prestashop>retailcrm_630f6dc397fe74e52d5189e2c80f282b'] = 'Вернуться к списку'; $_MODULE['<{retailcrm}prestashop>retailcrm_630f6dc397fe74e52d5189e2c80f282b'] = 'Вернуться к списку';
$_MODULE['<{retailcrm}prestashop>retailcrm_5c1cf6cfec2dad86c8ca5286a0294516'] = 'Имя'; $_MODULE['<{retailcrm}prestashop>retailcrm_5c1cf6cfec2dad86c8ca5286a0294516'] = 'Имя';
@ -47,3 +49,4 @@ $_MODULE['<{retailcrm}prestashop>retailcrm_69aede266809f89b89fe70681f6a129f'] =
$_MODULE['<{retailcrm}prestashop>retailcrm_57d056ed0984166336b7879c2af3657f'] = 'Город'; $_MODULE['<{retailcrm}prestashop>retailcrm_57d056ed0984166336b7879c2af3657f'] = 'Город';
$_MODULE['<{retailcrm}prestashop>retailcrm_bcc254b55c4a1babdf1dcb82c207506b'] = 'Телефон'; $_MODULE['<{retailcrm}prestashop>retailcrm_bcc254b55c4a1babdf1dcb82c207506b'] = 'Телефон';
$_MODULE['<{retailcrm}prestashop>retailcrm_f0e1fc6f97d36cb80f29196e2662ffde'] = 'Мобильный телефон'; $_MODULE['<{retailcrm}prestashop>retailcrm_f0e1fc6f97d36cb80f29196e2662ffde'] = 'Мобильный телефон';
$_MODULE['<{retailcrm}prestashop>retailcrm_7a1920d61156abc05a60135aefe8bc67'] = 'По умолчанию';