codistoconnect - Version 1.91.1

Version Notes

Release 1.91.1

Download this release

Release Info

Developer Codisto
Extension codistoconnect
Version 1.91.1
Comparing to
See all releases


Code changes from version 1.90.27 to 1.91.1

Files changed (5) hide show
  1. app/code/community/Codisto/Sync/controllers/IndexController.php +32 -11
  2. app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.27.php → data-install-1.91.1.php} +0 -0
  3. app/code/community/Codisto/Sync/etc/config.xml +1 -1
  4. app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.27.php → mysql4-install-1.91.1.php} +0 -0
  5. package.xml +5 -5
app/code/community/Codisto/Sync/controllers/IndexController.php CHANGED
@@ -782,6 +782,7 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
782
  $freighttax = 0.0;
783
  $taxpercent = 0.0;
784
  $taxrate = 1.0;
 
785
 
786
  foreach($ordercontent->orderlines->orderline as $orderline)
787
  {
@@ -1639,6 +1640,8 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
1639
 
1640
  $websiteId = $store->getWebsiteId();
1641
 
 
 
1642
  $billing_address = $ordercontent->orderaddresses->orderaddress[0];
1643
  $billing_first_name = $billing_last_name = '';
1644
 
@@ -1749,18 +1752,34 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
1749
 
1750
  if(!$customer->getId())
1751
  {
1752
- $ebayGroup = Mage::getModel('customer/group');
1753
- $ebayGroup->load('eBay', 'customer_group_code');
1754
- if(!$ebayGroup->getId())
1755
- {
1756
- $defaultGroup = Mage::getModel('customer/group')->load(1);
 
 
1757
 
1758
- $ebayGroup->setCode('eBay');
1759
- $ebayGroup->setTaxClassId($defaultGroup->getTaxClassId());
1760
- $ebayGroup->save();
1761
- }
1762
 
1763
- $customerGroupId = $ebayGroup->getId();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1764
 
1765
  $customer->setWebsiteId($websiteId);
1766
  $customer->setStoreId($store->getId());
@@ -1768,7 +1787,9 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
1768
  $customer->setFirstname((string)$billing_first_name);
1769
  $customer->setLastname((string)$billing_last_name);
1770
  $customer->setPassword('');
1771
- $customer->setGroupId($customerGroupId);
 
 
1772
  $customer->save();
1773
  $customer->setConfirmation(null);
1774
  $customer->save();
782
  $freighttax = 0.0;
783
  $taxpercent = 0.0;
784
  $taxrate = 1.0;
785
+ $shippingDescription = null;
786
 
787
  foreach($ordercontent->orderlines->orderline as $orderline)
788
  {
1640
 
1641
  $websiteId = $store->getWebsiteId();
1642
 
1643
+ $order_source = $ordercontent->source;
1644
+
1645
  $billing_address = $ordercontent->orderaddresses->orderaddress[0];
1646
  $billing_first_name = $billing_last_name = '';
1647
 
1752
 
1753
  if(!$customer->getId())
1754
  {
1755
+ $customerGroupId = null;
1756
+ if($order_source == 'ebay') {
1757
+ $ebayGroup = Mage::getModel('customer/group');
1758
+ $ebayGroup->load('eBay', 'customer_group_code');
1759
+ if(!$ebayGroup->getId())
1760
+ {
1761
+ $defaultGroup = Mage::getModel('customer/group')->load(1);
1762
 
1763
+ $ebayGroup->setCode('eBay');
1764
+ $ebayGroup->setTaxClassId($defaultGroup->getTaxClassId());
1765
+ $ebayGroup->save();
1766
+ }
1767
 
1768
+ $customerGroupId = $ebayGroup->getId();
1769
+ } else if($order_source == 'amazon') {
1770
+ $amazonGroup = Mage::getModel('customer/group');
1771
+ $amazonGroup->load('Amazon', 'customer_group_code');
1772
+ if(!$amazonGroup->getId())
1773
+ {
1774
+ $defaultGroup = Mage::getModel('customer/group')->load(1);
1775
+
1776
+ $amazonGroup->setCode('Amazon');
1777
+ $amazonGroup->setTaxClassId($defaultGroup->getTaxClassId());
1778
+ $amazonGroup->save();
1779
+ }
1780
+
1781
+ $customerGroupId = $amazonGroup->getId();
1782
+ }
1783
 
1784
  $customer->setWebsiteId($websiteId);
1785
  $customer->setStoreId($store->getId());
1787
  $customer->setFirstname((string)$billing_first_name);
1788
  $customer->setLastname((string)$billing_last_name);
1789
  $customer->setPassword('');
1790
+ if($customerGroupId) {
1791
+ $customer->setGroupId($customerGroupId);
1792
+ }
1793
  $customer->save();
1794
  $customer->setConfirmation(null);
1795
  $customer->save();
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.27.php → data-install-1.91.1.php} RENAMED
File without changes
app/code/community/Codisto/Sync/etc/config.xml CHANGED
@@ -23,7 +23,7 @@
23
  <config>
24
  <modules>
25
  <Codisto_Sync>
26
- <version>1.90.27</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
23
  <config>
24
  <modules>
25
  <Codisto_Sync>
26
+ <version>1.91.1</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.27.php → mysql4-install-1.91.1.php} RENAMED
File without changes
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>codistoconnect</name>
4
- <version>1.90.27</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/Apache-2.0">Apache 2</license>
7
  <channel>community</channel>
@@ -16,11 +16,11 @@ Only simple products are supported.&#xD;
16
  You will be required to authorise us to make listings on your behalf. This is easy to do and can be done in 3 steps.&#xD;
17
  &#xD;
18
  </description>
19
- <notes>Release 1.90.27</notes>
20
  <authors><author><name>Codisto</name><user>codistodev</user><email>ebay@codisto.com</email></author></authors>
21
- <date>2017-05-09</date>
22
- <time>06:53:10</time>
23
- <contents><target name="magecommunity"><dir name="Codisto"><dir name="Sync"><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Controller"><file name="Router.php" hash="9dbb9e0e72e5eb0eda425f450542e4db"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="8a0721d8d2d882c4ba64e9dab9de4fe9"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="Model"><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><file name="Observer.php" hash="3349b89012cb681a7a61cecbd4a9f7bf"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir><file name="Sync.php" hash="a71e01da86b0e9c40f84bec3a7307595"/></dir><dir name="Test"><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></dir><dir name="Controllers"><file name="CodistoController.php" hash="a2be4faeac73ff1847c0d7dc4fbdc0e0"/><file name="IndexController.php" hash="f7252fae8d2f7b67397ae56524db49d1"/><file name="SyncController.php" hash="33436e4935631488073765d723a82ff7"/></dir><dir name="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="e9f82f1f097233e8b7c625bed59ef851"/><file name="IndexController.php.save" hash="24cc504720034f8c02ad9b889676abd0"/><file name="SyncController.php" hash="34561518a75844c480722129c780dfdf"/></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.27.php" hash="29334830432cf1a02e4a992b9a42d6c5"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a1225ee5783c6cd41408e9c26091d1a2"/><file name="config.xml" hash="23acb8752e7843650fb5b8aafd1650ef"/></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.90.27.php" hash="f5e7410bdb70ae4c021e3d257ccbf9a9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
26
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>codistoconnect</name>
4
+ <version>1.91.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/Apache-2.0">Apache 2</license>
7
  <channel>community</channel>
16
  You will be required to authorise us to make listings on your behalf. This is easy to do and can be done in 3 steps.&#xD;
17
  &#xD;
18
  </description>
19
+ <notes>Release 1.91.1</notes>
20
  <authors><author><name>Codisto</name><user>codistodev</user><email>ebay@codisto.com</email></author></authors>
21
+ <date>2017-05-24</date>
22
+ <time>05:44:33</time>
23
+ <contents><target name="magecommunity"><dir name="Codisto"><dir name="Sync"><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Controller"><file name="Router.php" hash="9dbb9e0e72e5eb0eda425f450542e4db"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="8a0721d8d2d882c4ba64e9dab9de4fe9"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="Model"><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><file name="Observer.php" hash="3349b89012cb681a7a61cecbd4a9f7bf"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir><file name="Sync.php" hash="a71e01da86b0e9c40f84bec3a7307595"/></dir><dir name="Test"><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></dir><dir name="Controllers"><file name="CodistoController.php" hash="a2be4faeac73ff1847c0d7dc4fbdc0e0"/><file name="IndexController.php" hash="f7252fae8d2f7b67397ae56524db49d1"/><file name="SyncController.php" hash="33436e4935631488073765d723a82ff7"/></dir><dir name="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="74bd637544cee0014d70665ea54b4e24"/><file name="IndexController.php.save" hash="24cc504720034f8c02ad9b889676abd0"/><file name="SyncController.php" hash="34561518a75844c480722129c780dfdf"/></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.91.1.php" hash="29334830432cf1a02e4a992b9a42d6c5"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a1225ee5783c6cd41408e9c26091d1a2"/><file name="config.xml" hash="a3e81c562e39a1a1261906325192974b"/></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.91.1.php" hash="f5e7410bdb70ae4c021e3d257ccbf9a9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
26
  </package>