RetailCRM-Mirror/magento-module
1
0
Fork 0
mirror of synced 2024-11-25 22:46:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15 from iyzoer/v1.9

Browse Source 
v1.1.1
This commit is contained in:
Alex Lushpai 2018-09-04 09:58:28 +03:00 committed by GitHub
commit 8def052f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 134 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/code/community/Retailcrm/Retailcrm/Model/Exchange.php
View File

@ -154,11 +154,12 @@ class Retailcrm_Retailcrm_Model_Exchange
$customer->setWebsiteId($siteid); $customer->setWebsiteId($siteid);
$customer->loadByEmail($order['email']); $customer->loadByEmail($order['email']);
if (!is_numeric($customer->getId())) { if (!is_numeric($customer->getId())) {
$customer $customer
->setGroupId(1) ->setGroupId(1)
->setWebsiteId($siteid) ->setWebsiteId($siteid)
->setStore($storeId) ->setStoreId($storeId)
->setEmail($order['email']) ->setEmail($order['email'])
->setFirstname($order['firstName']) ->setFirstname($order['firstName'])
->setLastname($order['lastName']) ->setLastname($order['lastName'])
@ -390,7 +391,7 @@ class Retailcrm_Retailcrm_Model_Exchange
$customer $customer
->setGropuId(1) ->setGropuId(1)
->setWebsiteId($siteid) ->setWebsiteId($siteid)
->setStore($storeId) ->setStoreId($storeId)
->setEmail($order['email']) ->setEmail($order['email'])
->setFirstname($order['firstName']) ->setFirstname($order['firstName'])
->setLastname($order['lastName']) ->setLastname($order['lastName'])

8
app/code/community/Retailcrm/Retailcrm/Model/Order.php
View File

@ -103,7 +103,6 @@ class Retailcrm_Retailcrm_Model_Order extends Retailcrm_Retailcrm_Model_Exchange
} }
$product = array( $product = array(
'productId' => $item->getProductId(),
'productName' => !isset($parent) ? $item->getName() : $parent->getName(), 'productName' => !isset($parent) ? $item->getName() : $parent->getName(),
'quantity' => !isset($parent) ? intval($item->getQtyOrdered()) : intval($parent->getQtyOrdered()), 'quantity' => !isset($parent) ? intval($item->getQtyOrdered()) : intval($parent->getQtyOrdered()),
'initialPrice' => !isset($parent) ? $item->getPrice() : $parent->getPrice(), 'initialPrice' => !isset($parent) ? $item->getPrice() : $parent->getPrice(),
@ -116,7 +115,6 @@ class Retailcrm_Retailcrm_Model_Order extends Retailcrm_Retailcrm_Model_Exchange
$items[] = $product; $items[] = $product;
} elseif ($item->getProductType() == "grouped") { } elseif ($item->getProductType() == "grouped") {
$product = array( $product = array(
'productId' => $item->getProductId(),
'productName' => $item->getName(), 'productName' => $item->getName(),
'quantity' => $item->getQtyOrdered(), 'quantity' => $item->getQtyOrdered(),
'initialPrice' => $item->getPrice(), 'initialPrice' => $item->getPrice(),
@ -343,10 +341,12 @@ class Retailcrm_Retailcrm_Model_Order extends Retailcrm_Retailcrm_Model_Exchange
} }
$product = array( $product = array(
'productId' => $item->getProductId(),
'productName' => !isset($parent) ? $item->getName() : $parent->getName(), 'productName' => !isset($parent) ? $item->getName() : $parent->getName(),
'quantity' => !isset($parent) ? intval($item->getQtyOrdered()) : intval($parent->getQtyOrdered()), 'quantity' => !isset($parent) ? intval($item->getQtyOrdered()) : intval($parent->getQtyOrdered()),
'initialPrice' => !isset($parent) ? $item->getPrice() : $parent->getPrice() 'initialPrice' => !isset($parent) ? $item->getPrice() : $parent->getPrice(),
'offer' => array(
'externalId' => $item->getProductId()
)
); );
unset($parent); unset($parent);
$items[] = $product; $items[] = $product;