From 36bed88ef3fb89c6e6190d01b7b8ce99a743f25f Mon Sep 17 00:00:00 2001 From: Frosin Date: Tue, 10 Sep 2019 13:23:51 +0300 Subject: [PATCH 1/2] fixed RetailCrmHistory_v5 --- .../classes/general/history/RetailCrmHistory_v5.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index 2cc1f64d..82495723 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -769,7 +769,10 @@ class RetailCrmHistory if (array_key_exists($orderPayment->getField('XML_ID'), $newHistoryPayments)) { $paymentId = $orderPayment->getId(); $paymentExternalId = RCrmActions::generatePaymentExternalId($paymentId); - + if (is_null($paymentId)) { + RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'paymentsUpdate', 'Save payment error, order=' . $order['number']); + continue; + } if ($paymentExternalId) { $newHistoryPayments[$orderPayment->getField('XML_ID')]['externalId'] = $paymentExternalId; RCrmActions::apiMethod($api, 'paymentEditById', __METHOD__, $newHistoryPayments[$orderPayment->getField('XML_ID')]); @@ -1161,7 +1164,7 @@ class RetailCrmHistory unset($paymentsList[$nowPaymentId]); } - } else { + } elseif (array_key_exists($paymentCrm['type'], $optionsPayTypes)) { $newHistoryPayments[$paymentCrm['id']] = $paymentCrm; $newPayment = $paymentColl->createItem(); $newPayment->setField('SUM', $paymentCrm['amount']); @@ -1178,7 +1181,9 @@ class RetailCrmHistory $newPaymentId = $newPayment->getId(); unset($paymentsList[$newPaymentId]); - } + } else { + RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'paymentsUpdate', 'Save payment error, incorrect type: ' . $paymentCrm['type']); + } if ($optionsPayment[$paymentCrm['status']] == 'Y') { $paySumm += $paymentCrm['amount']; From 6fb591c39b00f4e10306fd1a16798dd67f5276a5 Mon Sep 17 00:00:00 2001 From: Frosin Date: Tue, 10 Sep 2019 13:29:23 +0300 Subject: [PATCH 2/2] fixed RetailCrmHistory_v5 --- .../general/history/RetailCrmHistory_v5.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php index 82495723..b064776f 100644 --- a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php +++ b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php @@ -769,10 +769,10 @@ class RetailCrmHistory if (array_key_exists($orderPayment->getField('XML_ID'), $newHistoryPayments)) { $paymentId = $orderPayment->getId(); $paymentExternalId = RCrmActions::generatePaymentExternalId($paymentId); - if (is_null($paymentId)) { - RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'paymentsUpdate', 'Save payment error, order=' . $order['number']); - continue; - } + if (is_null($paymentId)) { + RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'paymentsUpdate', 'Save payment error, order=' . $order['number']); + continue; + } if ($paymentExternalId) { $newHistoryPayments[$orderPayment->getField('XML_ID')]['externalId'] = $paymentExternalId; RCrmActions::apiMethod($api, 'paymentEditById', __METHOD__, $newHistoryPayments[$orderPayment->getField('XML_ID')]); @@ -1181,9 +1181,9 @@ class RetailCrmHistory $newPaymentId = $newPayment->getId(); unset($paymentsList[$newPaymentId]); - } else { - RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'paymentsUpdate', 'Save payment error, incorrect type: ' . $paymentCrm['type']); - } + } else { + RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'paymentsUpdate', 'Save payment error, incorrect type: ' . $paymentCrm['type']); + } if ($optionsPayment[$paymentCrm['status']] == 'Y') { $paySumm += $paymentCrm['amount'];