Futurenext_Zakeke - Version 1.0.0.9

Version Notes

Bug fixing release

Download this release

Release Info

Developer Futurenext
Extension Futurenext_Zakeke
Version 1.0.0.9
Comparing to
See all releases


Code changes from version 1.0.0.8 to 1.0.0.9

Files changed (5) hide show
  1. app/code/community/Futurenext/Zakeke/Helper/Data.php +2 -1
  2. app/code/community/Futurenext/Zakeke/Model/Observer.php +9 -16
  3. app/code/community/Futurenext/Zakeke/etc/config.xml +1 -1
  4. js/zakeke/customize.js +1 -1
  5. package.xml +4 -4
app/code/community/Futurenext/Zakeke/Helper/Data.php CHANGED
@@ -58,7 +58,8 @@ class Futurenext_Zakeke_Helper_Data extends Mage_Core_Helper_Abstract
58
  * @param array $options
59
  * @return array|false
60
  */
61
- public static function getZakekeOption($options) {
 
62
  foreach ($options as $option) {
63
  if (!isset($option['is_zakeke'])) {
64
  continue;
58
  * @param array $options
59
  * @return array|false
60
  */
61
+ public static function getZakekeOption($options)
62
+ {
63
  foreach ($options as $option) {
64
  if (!isset($option['is_zakeke'])) {
65
  continue;
app/code/community/Futurenext/Zakeke/Model/Observer.php CHANGED
@@ -327,26 +327,19 @@ class Futurenext_Zakeke_Model_Observer
327
  /** @var Mage_Sales_Model_Quote_Item $quoteItem */
328
  $quoteItem = $observer->getQuoteItem();
329
  /** @var Mage_Sales_Model_Quote_Item_Option $option */
330
- $option = Mage::getModel('sales/quote_item_option');
331
- $option->setProductId($product->getId())
332
  ->setCode('product_type')
333
  ->setProduct($product)
334
  ->setValue(Futurenext_Zakeke_Helper_Data::ZAKEKE_PRODUCT_TYPE);
335
- $quoteItem->addOption($option);
336
 
337
  $zakekePrice = 0.0;
338
- if (isset($option['pricing'])) {
339
- $pricing = $option['pricing'];
340
- if ($pricing['modelPriceDeltaPerc']) {
341
- $zakekePrice += $product->getFinalPrice($qty) * ($pricing['modelPriceDeltaPerc'] / 100);
342
- } else {
343
- $zakekePrice += (float)$pricing['modelPriceDeltaValue'];
344
- }
345
-
346
- $zakekePrice += (float)$pricing['designPrice'];
347
  }
348
 
349
- if (!$zakekePrice) {
350
  return $this;
351
  }
352
 
@@ -379,11 +372,11 @@ class Futurenext_Zakeke_Model_Observer
379
  */
380
  public function orderSave($observer)
381
  {
382
- /** @var Futurenext_Zakeke_Helper_ZakekeApi $zakekeApi */
383
- $zakekeApi = Mage::helper('futurenext_zakeke/zakekeApi');
384
 
385
  try {
386
- $zakekeApi->log('Observer orderSave called');
387
 
388
  /** @var Mage_Sales_Model_Order $order */
389
  $order = $observer->getOrder();
327
  /** @var Mage_Sales_Model_Quote_Item $quoteItem */
328
  $quoteItem = $observer->getQuoteItem();
329
  /** @var Mage_Sales_Model_Quote_Item_Option $option */
330
+ $optionType = Mage::getModel('sales/quote_item_option');
331
+ $optionType->setProductId($product->getId())
332
  ->setCode('product_type')
333
  ->setProduct($product)
334
  ->setValue(Futurenext_Zakeke_Helper_Data::ZAKEKE_PRODUCT_TYPE);
335
+ $quoteItem->addOption($optionType);
336
 
337
  $zakekePrice = 0.0;
338
+ if (isset($option['price'])) {
339
+ $zakekePrice = $option['price'];
 
 
 
 
 
 
 
340
  }
341
 
342
+ if ($zakekePrice <= 0.0) {
343
  return $this;
344
  }
345
 
372
  */
373
  public function orderSave($observer)
374
  {
375
+ /** @var Futurenext_Zakeke_Helper_ZakekeApi $zakekeApi */
376
+ $zakekeApi = Mage::helper('futurenext_zakeke/zakekeApi');
377
 
378
  try {
379
+ $zakekeApi->log('Observer orderSave called');
380
 
381
  /** @var Mage_Sales_Model_Order $order */
382
  $order = $observer->getOrder();
app/code/community/Futurenext/Zakeke/etc/config.xml CHANGED
@@ -12,7 +12,7 @@
12
  <config>
13
  <modules>
14
  <Futurenext_Zakeke>
15
- <version>1.0.0.8</version>
16
  </Futurenext_Zakeke>
17
  </modules>
18
 
12
  <config>
13
  <modules>
14
  <Futurenext_Zakeke>
15
+ <version>1.0.0.9</version>
16
  </Futurenext_Zakeke>
17
  </modules>
18
 
js/zakeke/customize.js CHANGED
@@ -62,7 +62,7 @@ function zakekeCustomizationAdd(config) {
62
  }
63
 
64
  pendingProductDataRequests.push(queryString);
65
- $jZakeke.ajax(config.baseUrl + '/zakeke/customize/price?' + queryString)
66
  .done(function (result) {
67
  var productData = $jZakeke.extend({}, result);
68
  productData.color = color;
62
  }
63
 
64
  pendingProductDataRequests.push(queryString);
65
+ $jZakeke.ajax(config.baseUrl + 'zakeke/customize/price?' + queryString)
66
  .done(function (result) {
67
  var productData = $jZakeke.extend({}, result);
68
  productData.color = color;
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Futurenext_Zakeke</name>
4
- <version>1.0.0.8</version>
5
  <stability>stable</stability>
6
  <license uri="https://www.zakeke.com/Contracts/GeneralConditions">Zakeke license</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Zakeke is an innovative cloud platform that allows any Magento store to integrate into the system a 2D and 3D complete customizer of products, giving the possibility to customize "live" products for sale to the end customer.</description>
11
  <notes>Bug fixing release</notes>
12
  <authors><author><name>Futurenext</name><user>futurenext</user><email>info@zakeke.com</email></author></authors>
13
- <date>2017-05-03</date>
14
- <time>08:48:55</time>
15
- <contents><target name="magecommunity"><dir name="Futurenext"><dir name="Zakeke"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Items"><dir name="Column"><dir name="Zakeke"><file name="Name.php" hash="44ee4fa109c9fbf1283cf2a4a4370cab"/></dir></dir></dir></dir></dir><file name="CartItemRenderer.php" hash="9c48c821bdab816c35c4d959e52f1976"/><file name="CheckoutItemRenderer.php" hash="02d4244d1274ac023c7fe997fcedf833"/><dir name="Customize"><file name="Add.php" hash="6d206e080ed91ed1ffbdd7528d89be2f"/><file name="Configure.php" hash="e815ed877af5727bd20289429122107b"/></dir><file name="Customize.php" hash="dcae150aafaa72013f83c0e51746f56d"/><file name="CustomizeButton.php" hash="0289e8754309ed5ba622a4e0ce643d25"/><file name="ModuleChecker.php" hash="8df2615bc87c4e656584ee80a51a9b31"/><file name="SalesItemRenderer.php" hash="2b470077ecef18ec49eab960409914ef"/><file name="View.php" hash="0c5a7231813b3737e069ad1ca3ccf809"/></dir><dir name="Helper"><file name="Data.php" hash="243765672b4e31bbbf945425e544fd5d"/><file name="ZakekeApi.php" hash="9556204f7e6fad0d5917e9dd19819d30"/></dir><dir name="Model"><dir name="Api2"><dir name="Colors"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="0b1ad3d9656fd5b729d1f7a626359e19"/></dir></dir></dir><file name="Colors.php" hash="f9f004c13ef5357bb3d5e798208e7902"/><dir name="ProductAttribute"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="40a6a5def798a5d0e8bcee1ac8c8a4d8"/></dir></dir></dir><file name="ProductAttribute.php" hash="97ea0f12646d9f1f1ab6916ed41f04dc"/><dir name="ProductOptions"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="6c6dd2079f58a654b60c465cc1fbc357"/></dir></dir></dir><file name="ProductOptions.php" hash="5e1234a158723dc5a8e2c3ccf6e152cf"/><dir name="Settings"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="e982e900acb2a4ac267cdda95c87cd35"/></dir></dir></dir><file name="Settings.php" hash="2f7fa711c00e75d3c4afabb007145c49"/><dir name="ZakekeEnabled"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="b107fafe0fa69827bebadfd66c6274d9"/></dir></dir></dir><file name="ZakekeEnabled.php" hash="0f5c210fa296b30283aa41f500c3e3b9"/></dir><file name="ModuleList.php" hash="929479d45eb4252daaff6e4a40733b09"/><file name="Observer.php" hash="06577c15ab93a639c419295d91e90e7c"/><dir name="Resource"><file name="Setup.php" hash="42a7681d56fcd5ad06f75a223ef420f1"/><dir name="ZakekeEnabled"><file name="Collection.php" hash="fdadf3c788c4b5e175e4a20501116027"/></dir><file name="ZakekeEnabled.php" hash="f32fb4b25f1f78287a38c3bd170bdbaa"/></dir><file name="ZakekeEnabled.php" hash="9b31e4606dcf8622092f638ca9f3920c"/></dir><dir name="controllers"><file name="CustomizeController.php" hash="10671c9bfc00cd41c6d983d938fac06a"/><dir name="Zakeke"><file name="ModuleCheckerController.php" hash="b92d1f5b155479a85f358f1356ccdd29"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="22cdf40e6e83327b58f9e97fa17e8f68"/><file name="api2.xml" hash="9af2352582ae62a261d07f58e64d5e77"/><file name="config.xml" hash="1f833aa2e7ed7e42b43a161ee0ea6d12"/><file name="system.xml" hash="daf9c491d17687ab6d464dbf9cacf1f8"/></dir><dir name="sql"><dir name="zakeke_setup"><file name="install-1.0.0.0.php" hash="64a3954b20b3142886446ac432a04b21"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Futurenext_Zakeke.xml" hash="f309795ee4b758943868cb1f7459fb9c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="zakeke.xml" hash="d296777d398f6af473adfb8a15477b47"/></dir><dir name="template"><dir name="zakeke"><file name="modulechecker.phtml" hash="b3101729cc5030c645770af6a814cd26"/><dir name="sales"><dir name="items"><dir name="column"><dir name="zakeke"><file name="name.phtml" hash="723ecc1f6c0ad17495389b8e012d72e3"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="6294158a08ad56639c3a57a4d88c2f81"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="4421194ecc884d934f099a256062cfcb"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="0da287c2ae4a87e0e768fdad0d0adfd3"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="42f0631dd2ce37d9d7289b6d2785b222"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="867a37a7072be0cba7dc9f7c03cec0d4"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="zakeke.xml" hash="e64948c6a8cfd391d35b39c139789a6f"/></dir><dir name="template"><dir name="zakeke"><dir name="cart"><dir name="item"><file name="default.phtml" hash="bfb6e4a50c69ccfdfe66ad8c8711afdd"/></dir><file name="minicart.phtml" hash="1e7398e848e024bbeae11ed1550de3c8"/></dir><dir name="customization"><file name="add.phtml" hash="c647328e435fbe6dbe61e325e7a90f89"/></dir><file name="customize.phtml" hash="5b16967774ef9109760873480f2f23c2"/><file name="customizeButton.phtml" hash="78c81b67f8bb3e63c27d36054edaeb35"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="zakeke"><file name="customize.js" hash="efab393e72ffeedae64002dc1b8c002c"/><file name="jquery.js" hash="105112a8a757f683234e01dec3799022"/><file name="preview.js" hash="a22a32209982d2dda7561cff723b49bb"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="zakeke"><file name="modulechecker.css" hash="e7fd6efc953f7e2aae234607a0a379a8"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="it_IT"><file name="Futurenext_Zakeke.csv" hash="0f0a51c0319322d722cd93f43302b0a9"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>curl</name><min/><max/></extension></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Futurenext_Zakeke</name>
4
+ <version>1.0.0.9</version>
5
  <stability>stable</stability>
6
  <license uri="https://www.zakeke.com/Contracts/GeneralConditions">Zakeke license</license>
7
  <channel>community</channel>
10
  <description>Zakeke is an innovative cloud platform that allows any Magento store to integrate into the system a 2D and 3D complete customizer of products, giving the possibility to customize "live" products for sale to the end customer.</description>
11
  <notes>Bug fixing release</notes>
12
  <authors><author><name>Futurenext</name><user>futurenext</user><email>info@zakeke.com</email></author></authors>
13
+ <date>2017-05-11</date>
14
+ <time>13:13:57</time>
15
+ <contents><target name="magecommunity"><dir name="Futurenext"><dir name="Zakeke"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Items"><dir name="Column"><dir name="Zakeke"><file name="Name.php" hash="44ee4fa109c9fbf1283cf2a4a4370cab"/></dir></dir></dir></dir></dir><file name="CartItemRenderer.php" hash="9c48c821bdab816c35c4d959e52f1976"/><file name="CheckoutItemRenderer.php" hash="02d4244d1274ac023c7fe997fcedf833"/><dir name="Customize"><file name="Add.php" hash="6d206e080ed91ed1ffbdd7528d89be2f"/><file name="Configure.php" hash="e815ed877af5727bd20289429122107b"/></dir><file name="Customize.php" hash="dcae150aafaa72013f83c0e51746f56d"/><file name="CustomizeButton.php" hash="0289e8754309ed5ba622a4e0ce643d25"/><file name="ModuleChecker.php" hash="8df2615bc87c4e656584ee80a51a9b31"/><file name="SalesItemRenderer.php" hash="2b470077ecef18ec49eab960409914ef"/><file name="View.php" hash="0c5a7231813b3737e069ad1ca3ccf809"/></dir><dir name="Helper"><file name="Data.php" hash="fcee50ae4edadc2df205299f598bee6f"/><file name="ZakekeApi.php" hash="9556204f7e6fad0d5917e9dd19819d30"/></dir><dir name="Model"><dir name="Api2"><dir name="Colors"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="0b1ad3d9656fd5b729d1f7a626359e19"/></dir></dir></dir><file name="Colors.php" hash="f9f004c13ef5357bb3d5e798208e7902"/><dir name="ProductAttribute"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="40a6a5def798a5d0e8bcee1ac8c8a4d8"/></dir></dir></dir><file name="ProductAttribute.php" hash="97ea0f12646d9f1f1ab6916ed41f04dc"/><dir name="ProductOptions"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="6c6dd2079f58a654b60c465cc1fbc357"/></dir></dir></dir><file name="ProductOptions.php" hash="5e1234a158723dc5a8e2c3ccf6e152cf"/><dir name="Settings"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="e982e900acb2a4ac267cdda95c87cd35"/></dir></dir></dir><file name="Settings.php" hash="2f7fa711c00e75d3c4afabb007145c49"/><dir name="ZakekeEnabled"><dir name="Rest"><dir name="Admin"><file name="V1.php" hash="b107fafe0fa69827bebadfd66c6274d9"/></dir></dir></dir><file name="ZakekeEnabled.php" hash="0f5c210fa296b30283aa41f500c3e3b9"/></dir><file name="ModuleList.php" hash="929479d45eb4252daaff6e4a40733b09"/><file name="Observer.php" hash="071af0e4a3a5b40a10b71aa55df3c6d6"/><dir name="Resource"><file name="Setup.php" hash="42a7681d56fcd5ad06f75a223ef420f1"/><dir name="ZakekeEnabled"><file name="Collection.php" hash="fdadf3c788c4b5e175e4a20501116027"/></dir><file name="ZakekeEnabled.php" hash="f32fb4b25f1f78287a38c3bd170bdbaa"/></dir><file name="ZakekeEnabled.php" hash="9b31e4606dcf8622092f638ca9f3920c"/></dir><dir name="controllers"><file name="CustomizeController.php" hash="10671c9bfc00cd41c6d983d938fac06a"/><dir name="Zakeke"><file name="ModuleCheckerController.php" hash="b92d1f5b155479a85f358f1356ccdd29"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="22cdf40e6e83327b58f9e97fa17e8f68"/><file name="api2.xml" hash="9af2352582ae62a261d07f58e64d5e77"/><file name="config.xml" hash="bab5dc9e8a889d54715173ea4e8bf3b7"/><file name="system.xml" hash="daf9c491d17687ab6d464dbf9cacf1f8"/></dir><dir name="sql"><dir name="zakeke_setup"><file name="install-1.0.0.0.php" hash="64a3954b20b3142886446ac432a04b21"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Futurenext_Zakeke.xml" hash="f309795ee4b758943868cb1f7459fb9c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="zakeke.xml" hash="d296777d398f6af473adfb8a15477b47"/></dir><dir name="template"><dir name="zakeke"><file name="modulechecker.phtml" hash="b3101729cc5030c645770af6a814cd26"/><dir name="sales"><dir name="items"><dir name="column"><dir name="zakeke"><file name="name.phtml" hash="723ecc1f6c0ad17495389b8e012d72e3"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="6294158a08ad56639c3a57a4d88c2f81"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="4421194ecc884d934f099a256062cfcb"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="0da287c2ae4a87e0e768fdad0d0adfd3"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="42f0631dd2ce37d9d7289b6d2785b222"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="zakeke.phtml" hash="867a37a7072be0cba7dc9f7c03cec0d4"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="zakeke.xml" hash="e64948c6a8cfd391d35b39c139789a6f"/></dir><dir name="template"><dir name="zakeke"><dir name="cart"><dir name="item"><file name="default.phtml" hash="bfb6e4a50c69ccfdfe66ad8c8711afdd"/></dir><file name="minicart.phtml" hash="1e7398e848e024bbeae11ed1550de3c8"/></dir><dir name="customization"><file name="add.phtml" hash="c647328e435fbe6dbe61e325e7a90f89"/></dir><file name="customize.phtml" hash="5b16967774ef9109760873480f2f23c2"/><file name="customizeButton.phtml" hash="78c81b67f8bb3e63c27d36054edaeb35"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="zakeke"><file name="customize.js" hash="1725eb4ec18c34805c1a269c96161999"/><file name="jquery.js" hash="105112a8a757f683234e01dec3799022"/><file name="preview.js" hash="a22a32209982d2dda7561cff723b49bb"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="zakeke"><file name="modulechecker.css" hash="e7fd6efc953f7e2aae234607a0a379a8"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="it_IT"><file name="Futurenext_Zakeke.csv" hash="0f0a51c0319322d722cd93f43302b0a9"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>curl</name><min/><max/></extension></required></dependencies>
18
  </package>