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

Set payment status and amount only for paid orders. Added properties code for cart items

Browse Source
This commit is contained in:
max-baranikov 2021-07-07 16:22:37 +03:00 committed by GitHub
parent 20c8e83a59
commit 27816dcddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
retailcrm/lib/RetailcrmOrderBuilder.php
View File

@ -903,14 +903,16 @@ class RetailcrmOrderBuilder
} }
if (isset($payment[$paymentType]) && !empty($payment[$paymentType])) { if (isset($payment[$paymentType]) && !empty($payment[$paymentType])) {
$crmOrder['payments'] = array( $order_payment = array(
array( 'externalId' => $order->id . '#' . $order->reference,
'externalId' => $order->id . '#' . $order->reference, 'type' => $payment[$paymentType]
'amount' => round($order->total_paid_real, 2),
'status' => ((round($order->total_paid_real, 2) > 0) ? 'paid' : null),
'type' => $payment[$paymentType]
)
); );
if (round($order->total_paid_real, 2) > 0) {
$order_payment['amount'] = round($order->total_paid_real, 2);
$order_payment['status'] = 'paid';
}
$crmOrder['payments'][] = $order_payment;
} else { } else {
$crmOrder['payments'] = array(); $crmOrder['payments'] = array();
} }
@ -1010,6 +1012,14 @@ class RetailcrmOrderBuilder
$arItem = explode(":", $valAttr); $arItem = explode(":", $valAttr);
if ($arItem[0] && $arItem[1]) { if ($arItem[0] && $arItem[1]) {
// Product property code should start with a letter, digit or underscore
// and only contain letters, digits, underscores, hyphens and colons
$propertyCode = preg_replace('/(^[^\w]+)|([^\w\-:])/', '', $arItem[0]);
if (empty($propertyCode)) {
$propertyCode = 'prop_' . $count;
}
$arProp[$count]['code'] = $propertyCode;
$arProp[$count]['name'] = trim($arItem[0]); $arProp[$count]['name'] = trim($arItem[0]);
$arProp[$count]['value'] = trim($arItem[1]); $arProp[$count]['value'] = trim($arItem[1]);
} }