Magmodules_Channable - Version 1.3.6

Version Notes

Channable Connect

Download this release

Release Info

Developer Magento Core Team
Extension Magmodules_Channable
Version 1.3.6
Comparing to
See all releases


Code changes from version 1.3.2 to 1.3.6

Files changed (35) hide show
  1. app/code/community/Magmodules/Channable/Block/Adminhtml/Config/Form/Field/Extra.php +1 -1
  2. app/code/community/Magmodules/Channable/Block/Adminhtml/Config/Form/Field/Shipping.php +14 -1
  3. app/code/community/Magmodules/Channable/Block/Adminhtml/Config/Form/Renderer/Select.php +1 -1
  4. app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Feeds.php +1 -1
  5. app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Heading.php +1 -1
  6. app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Note.php +1 -1
  7. app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Token.php +1 -1
  8. app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Version.php +1 -1
  9. app/code/community/Magmodules/Channable/Block/Adminhtml/Widget/Info/Info.php +1 -1
  10. app/code/community/Magmodules/Channable/Helper/Data.php +94 -49
  11. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Extra.php +2 -2
  12. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Shipping.php +4 -1
  13. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Action.php +1 -1
  14. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Attribute.php +2 -2
  15. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Category.php +2 -2
  16. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Categorytype.php +1 -1
  17. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Configurable.php +1 -1
  18. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Countries.php +28 -0
  19. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Images.php +1 -1
  20. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Mainimage.php +33 -0
  21. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Name.php +71 -0
  22. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Pricemodel.php +1 -1
  23. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Selectattribute.php +1 -1
  24. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Shipping.php +27 -0
  25. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Tax.php +1 -1
  26. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Textattribute.php +1 -1
  27. app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Type.php +1 -0
  28. app/code/community/Magmodules/Channable/Model/Channable.php +143 -52
  29. app/code/community/Magmodules/Channable/Model/Common.php +50 -30
  30. app/code/community/Magmodules/Channable/controllers/Adminhtml/ChannableController.php +1 -1
  31. app/code/community/Magmodules/Channable/controllers/FeedController.php +1 -1
  32. app/code/community/Magmodules/Channable/etc/adminhtml.xml +2 -2
  33. app/code/community/Magmodules/Channable/etc/config.xml +13 -6
  34. app/code/community/Magmodules/Channable/etc/system.xml +121 -58
  35. package.xml +4 -4
app/code/community/Magmodules/Channable/Block/Adminhtml/Config/Form/Field/Extra.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/Config/Form/Field/Shipping.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
@@ -21,6 +21,16 @@ class Magmodules_Channable_Block_Adminhtml_Config_Form_Field_Shipping extends Ma
21
 
22
  public function __construct()
23
  {
 
 
 
 
 
 
 
 
 
 
24
  $this->addColumn('price_from', array(
25
  'label' => Mage::helper('channable')->__('Price From'),
26
  'style' => 'width:40px',
@@ -33,6 +43,9 @@ class Magmodules_Channable_Block_Adminhtml_Config_Form_Field_Shipping extends Ma
33
  'label' => Mage::helper('channable')->__('Cost'),
34
  'style' => 'width:40px',
35
  ));
 
 
 
36
  $this->_addAfter = false;
37
  $this->_addButtonLabel = Mage::helper('channable')->__('Add Option');
38
  parent::__construct();
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
21
 
22
  public function __construct()
23
  {
24
+ $layout = Mage::app()->getFrontController()->getAction()->getLayout();
25
+ $renderer_coutries = $layout->createBlock('channable/adminhtml_config_form_renderer_select', '', array('is_render_to_js_template' => true));
26
+ $renderer_coutries->setOptions(Mage::getModel('channable/adminhtml_system_config_source_countries')->toOptionArray());
27
+
28
+ $this->addColumn('country', array(
29
+ 'label' => Mage::helper('channable')->__('Country'),
30
+ 'style' => 'width:120px',
31
+ 'renderer' => $renderer_coutries
32
+ ));
33
+
34
  $this->addColumn('price_from', array(
35
  'label' => Mage::helper('channable')->__('Price From'),
36
  'style' => 'width:40px',
43
  'label' => Mage::helper('channable')->__('Cost'),
44
  'style' => 'width:40px',
45
  ));
46
+
47
+ $this->_renders['country'] = $renderer_coutries;
48
+
49
  $this->_addAfter = false;
50
  $this->_addButtonLabel = Mage::helper('channable')->__('Add Option');
51
  parent::__construct();
app/code/community/Magmodules/Channable/Block/Adminhtml/Config/Form/Renderer/Select.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Feeds.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Heading.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Note.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Token.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/System/Config/Form/Field/Version.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Block/Adminhtml/Widget/Info/Info.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Helper/Data.php CHANGED
@@ -10,9 +10,9 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
- * @version 29-12-2015
16
  * =============================================================
17
  */
18
 
@@ -140,7 +140,13 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
140
  }
141
  if(in_array('replacetags', $actions)) {
142
  $st = str_replace(array("\r", "\n"), "", $st);
143
- $st = str_replace(array("<br>","<br/>", "<br />"), "\\n", $st);
 
 
 
 
 
 
144
  $st = $this->stripTags($st);
145
  $st = rtrim($st);
146
  }
@@ -154,6 +160,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
154
  $st = '<![CDATA[' . $st . ']]>';
155
  }
156
  if(in_array('round', $actions)) {
 
 
 
 
 
157
  $st = round($st);
158
  }
159
  if(in_array('boolean', $actions)) {
@@ -201,49 +212,66 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
201
  }
202
 
203
  public function getProductImage($product, $config)
204
- {
205
-
206
- $image = '';
207
- if($product->getThumbnail()) {
208
- if($product->getThumbnail() != 'no_selection') {
209
- $image = $config['media_image_url'] . $product->getThumbnail();
210
- }
211
- }
212
- if($product->getSmallImage()) {
213
- if($product->getSmallImage() != 'no_selection') {
214
- $image = $config['media_image_url'] . $product->getSmallImage();
215
  }
216
- }
217
- if($product->getImage()) {
218
- if($product->getImage() != 'no_selection') {
219
- $image = $config['media_image_url'] . $product->getImage();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
220
  }
221
- }
222
 
223
- if(!empty($config['images'])) {
224
- $image_data = array();
225
- $image_data['image_link'] = $image;
226
- $container = new Varien_Object(array('attribute' => new Varien_Object(array('id' => $config['media_gallery_id']))));
227
- $img_product = new Varien_Object(array('id' => $product->getId(),'store_id' => $config['store_id']));
228
- $gallery = Mage::getResourceModel('catalog/product_attribute_backend_media')->loadGallery($img_product, $container);
229
- $images = array();
230
- foreach($gallery as $gal_image) {
231
- if($gal_image['disabled'] == 0) {
232
- if($config['media_image_url'] . $gal_image['file'] != $image_data['image_link']) {
233
- $images[] = $config['media_image_url'] . $gal_image['file'];
234
- }
 
 
235
  }
 
 
 
236
  }
237
- if(count($images)) {
238
- if(count($images) > 1) {
239
- $image_data['additional_imagelinks'] = implode(';', $images);
240
- } else {
241
- $image_data['additional_imagelinks'] = $images[0];
242
- }
243
- }
244
- return $image_data;
245
- } else {
246
- return $image;
247
  }
248
  }
249
 
@@ -252,7 +280,9 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
252
  if(isset($config['condition_attribute'])) {
253
  if($condition = $product->getAttributeText($config['condition_attribute'])) {
254
  return $condition;
255
- }
 
 
256
  }
257
  return $config['condition_default'];
258
  }
@@ -314,13 +344,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
314
  } else {
315
  foreach($category_ids as $category_id) {
316
  if(isset($category_data[$category_id])) {
317
- if($category_data[$category_id]['level'] > $level) {
318
- $products_cat = $category_data[$category_id];
319
- $level = $category_data[$category_id]['level'];
320
- }
321
  }
322
  }
323
- }
324
  return $products_cat;
325
  }
326
  }
@@ -498,16 +526,20 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
498
 
499
  foreach($_categories as $key => $cat) {
500
  $path = array();
 
501
  $paths = explode('/', $cat['path']);
502
  foreach($paths as $p) {
503
  if(!empty($_categories[$p]['name'])) {
504
  if($_categories[$p]['level'] > 1) {
505
  $path[] = $_categories[$p]['name'];
 
 
 
506
  }
507
  }
508
  }
509
- $_categories[$key] = array('path' => $this->cleanData($path, 'stiptags'), 'custom' => $this->cleanData($cat['custom'], 'striptags'), 'name' => $this->cleanData($cat['name'], 'striptags'), 'level' => $cat['level']);
510
- }
511
  return $_categories;
512
  }
513
 
@@ -555,6 +587,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
555
  }
556
  }
557
  }
 
 
 
 
 
558
  }
559
  return true;
560
  }
@@ -631,4 +668,12 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
631
  return $non_flat_attributes;
632
  }
633
 
 
 
 
 
 
 
 
 
634
  }
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
+ * @version 03-03-2016
16
  * =============================================================
17
  */
18
 
140
  }
141
  if(in_array('replacetags', $actions)) {
142
  $st = str_replace(array("\r", "\n"), "", $st);
143
+ $st = str_replace(array("<br>","<br/>", "<br />"), '\n', $st);
144
+ $st = $this->stripTags($st);
145
+ $st = rtrim($st);
146
+ }
147
+ if(in_array('replacetagsn', $actions)) {
148
+ $st = str_replace(array("\r", "\n"), "", $st);
149
+ $st = str_replace(array("<br>","<br/>", "<br />"), '\\' . '\n', $st);
150
  $st = $this->stripTags($st);
151
  $st = rtrim($st);
152
  }
160
  $st = '<![CDATA[' . $st . ']]>';
161
  }
162
  if(in_array('round', $actions)) {
163
+ if(!empty($actions[1])) {
164
+ if($st > $actions[1]) {
165
+ $st = $actions[1];
166
+ }
167
+ }
168
  $st = round($st);
169
  }
170
  if(in_array('boolean', $actions)) {
212
  }
213
 
214
  public function getProductImage($product, $config)
215
+ {
216
+ $image_data = array();
217
+ if(!empty($config['image_resize']) && !empty($config['image_size'])) {
218
+ $image_file = $product->getData($config['image_source']);
219
+ $imageModel = Mage::getModel('catalog/product_image')->setSize($config['image_size'])->setDestinationSubdir($config['image_source'])->setBaseFile($image_file);
220
+ if(!$imageModel->isCached()) {
221
+ $imageModel->resize()->saveFile();
 
 
 
 
222
  }
223
+ $productImage = $imageModel->getUrl();
224
+ return (string)$productImage;
225
+ } else {
226
+ $image = '';
227
+ if(!empty($config['media_attributes'])) {
228
+ foreach($config['media_attributes'] as $media_att) {
229
+ $media_data = $product->getData($media_att);
230
+ if(!empty($media_data)) {
231
+ $image = $config['media_image_url'] . $media_data;
232
+ $image_data['image'][$media_att] = $image;
233
+ }
234
+ }
235
+ } else { // FOR OLDER VERSIONS
236
+ if($product->getThumbnail()) {
237
+ if($product->getThumbnail() != 'no_selection') {
238
+ $image = $config['media_image_url'] . $product->getThumbnail();
239
+ $image_data['image']['thumb'] = $image;
240
+ }
241
+ }
242
+ if($product->getSmallImage()) {
243
+ if($product->getSmallImage() != 'no_selection') {
244
+ $image = $config['media_image_url'] . $product->getSmallImage();
245
+ $image_data['image']['small'] = $image;
246
+ }
247
+ }
248
+ if($product->getImage()) {
249
+ if($product->getImage() != 'no_selection') {
250
+ $image = $config['media_image_url'] . $product->getImage();
251
+ $image_data['image']['base'] = $image;
252
+ }
253
+ }
254
  }
 
255
 
256
+ if(!empty($config['images'])) {
257
+ $image_data['image_link'] = $image;
258
+ $container = new Varien_Object(array('attribute' => new Varien_Object(array('id' => $config['media_gallery_id']))));
259
+ $img_product = new Varien_Object(array('id' => $product->getId(),'store_id' => $config['store_id']));
260
+ $gallery = Mage::getResourceModel('catalog/product_attribute_backend_media')->loadGallery($img_product, $container);
261
+ $images = array(); $i = 1;
262
+ usort($gallery, function($a, $b) { return $a['position_default'] > $b['position_default']; });
263
+ foreach($gallery as $gal_image) {
264
+ if($gal_image['disabled'] == 0) {
265
+ $image_data['image']['all']['image_' . $i] = $config['media_image_url'] . $gal_image['file'];
266
+ $image_data['image']['last'] = $config['media_image_url'] . $gal_image['file'];
267
+ if($i == 1) { $image_data['image']['first'] = $config['media_image_url'] . $gal_image['file']; }
268
+ $i++;
269
+ }
270
  }
271
+ return $image_data;
272
+ } else {
273
+ return $image;
274
  }
 
 
 
 
 
 
 
 
 
 
275
  }
276
  }
277
 
280
  if(isset($config['condition_attribute'])) {
281
  if($condition = $product->getAttributeText($config['condition_attribute'])) {
282
  return $condition;
283
+ } else{
284
+ return false;
285
+ }
286
  }
287
  return $config['condition_default'];
288
  }
344
  } else {
345
  foreach($category_ids as $category_id) {
346
  if(isset($category_data[$category_id])) {
347
+ $products_cat[] = $category_data[$category_id];
348
+ $level = $category_data[$category_id]['level'];
 
 
349
  }
350
  }
351
+ }
352
  return $products_cat;
353
  }
354
  }
526
 
527
  foreach($_categories as $key => $cat) {
528
  $path = array();
529
+ $custom_path = array();
530
  $paths = explode('/', $cat['path']);
531
  foreach($paths as $p) {
532
  if(!empty($_categories[$p]['name'])) {
533
  if($_categories[$p]['level'] > 1) {
534
  $path[] = $_categories[$p]['name'];
535
+ if(!empty($_categories[$p]['custom'])) {
536
+ $custom_path[] = $_categories[$p]['custom'];
537
+ }
538
  }
539
  }
540
  }
541
+ $_categories[$key] = array('path' => $this->cleanData($path, 'stiptags'), 'custom_path' => $this->cleanData($custom_path, 'stiptags'), 'custom' => $this->cleanData(end($custom_path), 'striptags'), 'name' => $this->cleanData($cat['name'], 'striptags'), 'level' => $cat['level']);
542
+ }
543
  return $_categories;
544
  }
545
 
587
  }
588
  }
589
  }
590
+ if(!empty($config['conf_exclude_parent'])) {
591
+ if($product->getTypeId() == 'configurable') {
592
+ return false;
593
+ }
594
+ }
595
  }
596
  return true;
597
  }
668
  return $non_flat_attributes;
669
  }
670
 
671
+ public function getMediaAttributes() {
672
+ $media_types = array();
673
+ $attributes = Mage::getResourceModel('catalog/product_attribute_collection')->addFieldToFilter('frontend_input', 'media_image');
674
+ foreach($attributes as $attribute) {
675
+ $media_types[] = $attribute->getData('attribute_code');
676
+ }
677
+ return $media_types;
678
+ }
679
  }
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Extra.php CHANGED
@@ -10,11 +10,11 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
17
-
18
  class Magmodules_Channable_Model_Adminhtml_System_Config_Backend_Design_Extra extends Mage_Adminhtml_Model_System_Config_Backend_Serialized_Array {
19
 
20
  protected function _beforeSave()
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
17
+
18
  class Magmodules_Channable_Model_Adminhtml_System_Config_Backend_Design_Extra extends Mage_Adminhtml_Model_System_Config_Backend_Serialized_Array {
19
 
20
  protected function _beforeSave()
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Backend/Design/Shipping.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
@@ -32,6 +32,9 @@ class Magmodules_Channable_Model_Adminhtml_System_Config_Backend_Design_Shipping
32
  $price_from = str_replace(',','.',$field['price_from']);
33
  $price_to = str_replace(',','.',$field['price_to']);
34
  $cost = str_replace(',','.',$field['cost']);
 
 
 
35
  $value[$key]['price_from'] = number_format($price_from, 2, '.', '');
36
  $value[$key]['price_to'] = number_format($price_to, 2, '.', '');
37
  $value[$key]['cost'] = number_format($cost, 2, '.', '');
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
32
  $price_from = str_replace(',','.',$field['price_from']);
33
  $price_to = str_replace(',','.',$field['price_to']);
34
  $cost = str_replace(',','.',$field['cost']);
35
+ if(empty($price_from)) { $price_from = '0.00'; }
36
+ if(empty($price_to)) { $price_to = '100000.00'; }
37
+ if(empty($cost)) { $cost = '0.00'; }
38
  $value[$key]['price_from'] = number_format($price_from, 2, '.', '');
39
  $value[$key]['price_to'] = number_format($price_to, 2, '.', '');
40
  $value[$key]['cost'] = number_format($cost, 2, '.', '');
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Action.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Attribute.php CHANGED
@@ -10,16 +10,16 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
17
-
18
  class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Attribute {
19
 
20
  public function toOptionArray()
21
  {
22
  $optionArray = array();
 
23
  $backend_types = array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar');
24
  $attributes = Mage::getResourceModel('catalog/product_attribute_collection')->setOrder('frontend_label','ASC')->addFieldToFilter('backend_type', $backend_types);
25
  foreach($attributes as $attribute) {
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
 
17
  class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Attribute {
18
 
19
  public function toOptionArray()
20
  {
21
  $optionArray = array();
22
+ $optionArray[] = array('value' => '', 'label' => Mage::helper('channable')->__('-- none'));
23
  $backend_types = array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar');
24
  $attributes = Mage::getResourceModel('catalog/product_attribute_collection')->setOrder('frontend_label','ASC')->addFieldToFilter('backend_type', $backend_types);
25
  foreach($attributes as $attribute) {
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Category.php CHANGED
@@ -1,4 +1,4 @@
1
- <?php
2
  /**
3
  * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
4
  * =============================================================
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
1
+ <?php
2
  /**
3
  * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
4
  * =============================================================
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Categorytype.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Configurable.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Countries.php ADDED
@@ -0,0 +1,28 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
4
+ * =============================================================
5
+ * NOTICE OF LICENSE [Single domain license]
6
+ * This source file is subject to the EULA that is
7
+ * available through the world-wide-web at:
8
+ * http://www.magmodules.eu/license-agreement/
9
+ * =============================================================
10
+ * @category Magmodules
11
+ * @package Magmodules_Channable
12
+ * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
+ * @license http://www.magmodules.eu/license-agreement/
15
+ * =============================================================
16
+ */
17
+
18
+ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Countries {
19
+
20
+ public function toOptionArray() {
21
+ $countries = array();
22
+ $countries[] = array('value'=> '', 'label'=> Mage::helper('channable')->__('NL & BE'));
23
+ $countries[] = array('value'=> 'NL', 'label'=> Mage::helper('channable')->__('The Netherlands'));
24
+ $countries[] = array('value'=> 'BE', 'label'=> Mage::helper('channable')->__('Belgium'));
25
+ return $countries;
26
+ }
27
+
28
+ }
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Images.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Mainimage.php ADDED
@@ -0,0 +1,33 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
4
+ * =============================================================
5
+ * NOTICE OF LICENSE [Single domain license]
6
+ * This source file is subject to the EULA that is
7
+ * available through the world-wide-web at:
8
+ * http://www.magmodules.eu/license-agreement/
9
+ * =============================================================
10
+ * @category Magmodules
11
+ * @package Magmodules_Channable
12
+ * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
+ * @license http://www.magmodules.eu/license-agreement/
15
+ * =============================================================
16
+ */
17
+
18
+ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Mainimage {
19
+
20
+ public function toOptionArray()
21
+ {
22
+ $attributes = Mage::getResourceModel('catalog/product_attribute_collection')->addFieldToFilter('frontend_input', 'media_image');
23
+ $type = array();
24
+ $type[] = array('value' => '', 'label'=> Mage::helper('channable')->__('Use default'));
25
+ foreach($attributes as $attribute) {
26
+ $type[] = array('value' => $attribute->getData('attribute_code'), 'label'=> str_replace("'", "", $attribute->getData('frontend_label')));
27
+ }
28
+ $type[] = array('value' => 'first', 'label'=> Mage::helper('channable')->__('First Image'));
29
+ $type[] = array('value' => 'last', 'label'=> Mage::helper('channable')->__('Last Image'));
30
+ return $type;
31
+ }
32
+
33
+ }
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Name.php ADDED
@@ -0,0 +1,71 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
4
+ * =============================================================
5
+ * NOTICE OF LICENSE [Single domain license]
6
+ * This source file is subject to the EULA that is
7
+ * available through the world-wide-web at:
8
+ * http://www.magmodules.eu/license-agreement/
9
+ * =============================================================
10
+ * @category Magmodules
11
+ * @package Magmodules_Channable
12
+ * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
+ * @license http://www.magmodules.eu/license-agreement/
15
+ * =============================================================
16
+ */
17
+
18
+ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Name {
19
+
20
+ protected $_ignore = array(
21
+ 'compatibility',
22
+ 'gallery',
23
+ 'installation',
24
+ 'language_support',
25
+ 'country_of_manufacture',
26
+ 'links_title',
27
+ 'current_version',
28
+ 'custom_design',
29
+ 'custom_layout_update',
30
+ 'gift_message_available',
31
+ 'image',
32
+ 'image_label',
33
+ 'media_gallery',
34
+ 'msrp_display_actual_price_type',
35
+ 'msrp_enabled',
36
+ 'options_container',
37
+ 'price_view',
38
+ 'page_layout',
39
+ 'samples_title',
40
+ 'sku_type',
41
+ 'tier_price',
42
+ 'url_key',
43
+ 'small_image',
44
+ 'small_image_label',
45
+ 'thumbnail',
46
+ 'thumbnail_label',
47
+ 'recurring_profile',
48
+ 'version_info',
49
+ 'meta_title',
50
+ 'meta_keyword',
51
+ );
52
+
53
+ public function toOptionArray(){
54
+ $options = array();
55
+ $options[] = array('value' => '', 'label' => Mage::helper('channable')->__('-- none'));
56
+ $entityTypeId = Mage::getModel('eav/entity_type')->loadByCode('catalog_product')->getEntityTypeId();
57
+ $attributes = Mage::getModel('eav/entity_attribute')->getCollection()->addFilter('entity_type_id', $entityTypeId)->setOrder('attribute_code', 'ASC');
58
+ foreach ($attributes as $attribute){
59
+ if(($attribute->getBackendType() == 'text') || ($attribute->getBackendType() == 'varchar') || ($attribute->getBackendType() == 'static')) {
60
+ if($attribute->getFrontendLabel()) {
61
+ if(!in_array($attribute->getAttributeCode(), $this->_ignore)) {
62
+ $options[] = array('value'=> $attribute->getAttributeCode(), 'label'=> $attribute->getFrontendLabel());
63
+ }
64
+ }
65
+ }
66
+ }
67
+ $options[] = array('value' => 'use_custom', 'label' => Mage::helper('channable')->__('-- Custom:'));
68
+ return $options;
69
+ }
70
+
71
+ }
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Pricemodel.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Selectattribute.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Shipping.php ADDED
@@ -0,0 +1,27 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
4
+ * =============================================================
5
+ * NOTICE OF LICENSE [Single domain license]
6
+ * This source file is subject to the EULA that is
7
+ * available through the world-wide-web at:
8
+ * http://www.magmodules.eu/license-agreement/
9
+ * =============================================================
10
+ * @category Magmodules
11
+ * @package Magmodules_Channable
12
+ * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
+ * @license http://www.magmodules.eu/license-agreement/
15
+ * =============================================================
16
+ */
17
+
18
+ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Shipping {
19
+
20
+ public function toOptionArray() {
21
+ $type = array();
22
+ $type[] = array('value' => 'price', 'label'=> Mage::helper('channable')->__('Based on product price'));
23
+ $type[] = array('value' => 'weight', 'label'=> Mage::helper('channable')->__('Based on product weight'));
24
+ return $type;
25
+ }
26
+
27
+ }
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Tax.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Textattribute.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Type.php CHANGED
@@ -20,6 +20,7 @@ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Type {
20
  public function toOptionArray()
21
  {
22
  $type = array();
 
23
  $type[] = array('value'=>'fixed', 'label'=> Mage::helper('channable')->__('Static'));
24
  $type[] = array('value'=>'attribute', 'label'=> Mage::helper('channable')->__('Use Attribute'));
25
  return $type;
20
  public function toOptionArray()
21
  {
22
  $type = array();
23
+ $type[] = array('value'=>'', 'label'=> Mage::helper('channable')->__('Disabled'));
24
  $type[] = array('value'=>'fixed', 'label'=> Mage::helper('channable')->__('Static'));
25
  $type[] = array('value'=>'attribute', 'label'=> Mage::helper('channable')->__('Use Attribute'));
26
  return $type;
app/code/community/Magmodules/Channable/Model/Channable.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
@@ -19,7 +19,8 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
19
 
20
  public function generateFeed($storeId, $limit = '', $page = '', $time_start)
21
  {
22
- $config = $this->getFeedConfig($storeId);
 
23
  $products = $this->getProducts($config, $config['limit'], $page);
24
  if($feed = $this->getFeedData($products, $config, $time_start)) {
25
  return $feed;
@@ -41,6 +42,9 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
41
  $product_row = array_merge($product_row, $extra_data);
42
  }
43
  $feed['products'][] = $product_row;
 
 
 
44
  unset($product_row);
45
  }
46
  }
@@ -69,10 +73,12 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
69
  $config['website_url'] = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
70
  $config['media_url'] = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA);
71
  $config['media_image_url'] = $config['media_url'] . 'catalog' . DS . 'product';
 
72
  $config['limit'] = Mage::getStoreConfig('channable/connect/max_products', $storeId);
73
  $config['version'] = (string)Mage::getConfig()->getNode()->modules->Magmodules_Channable->version;
74
  $config['media_gallery_id'] = Mage::getResourceModel('eav/entity_attribute')->getIdByCode('catalog_product', 'media_gallery');
75
-
 
76
  // PRODUCT & CATEGORY
77
  $config['filter_enabled'] = Mage::getStoreConfig('channable/filter/category_enabled', $storeId);
78
  $config['filter_cat'] = Mage::getStoreConfig('channable/filter/categories', $storeId);
@@ -86,11 +92,16 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
86
  $config['delivery'] = Mage::getStoreConfig('channable/data/delivery', $storeId);
87
  $config['delivery_att'] = Mage::getStoreConfig('channable/data/delivery_att', $storeId);
88
  $config['delivery_in'] = Mage::getStoreConfig('channable/data/delivery_in', $storeId);
89
- $config['delivery_out'] = Mage::getStoreConfig('channable/data/delivery_out', $storeId);
90
-
 
 
 
 
 
91
  $config['images'] = Mage::getStoreConfig('channable/data/images', $storeId);
 
92
  $config['skip_validation'] = true;
93
- $config['category_full'] = true;
94
 
95
  // WEIGHT
96
  $config['weight'] = Mage::getStoreConfig('channable/data/weight', $storeId);
@@ -107,12 +118,13 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
107
  $config['use_tax'] = Mage::helper('channable')->getTaxUsage($config);
108
 
109
  // SHIPPING
110
- $config['shipping'] = @unserialize(Mage::getStoreConfig('channable/advanced/shipping_price', $storeId));
 
111
 
112
  // FIELD & CATEGORY DATA
113
  $config['field'] = $this->getFeedAttributes($config, $storeId);
114
  $config['category_data'] = $feed->getCategoryData($config, $storeId);
115
-
116
  return $config;
117
  }
118
 
@@ -120,8 +132,8 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
120
  {
121
  $attributes = array();
122
  $attributes['id'] = array('label' => 'id', 'source' => 'entity_id');
123
- $attributes['name'] = array('label' => 'name', 'source' => 'name');
124
- $attributes['description'] = array('label' => 'description', 'source' => Mage::getStoreConfig('channable/data/description', $storeId), 'action' => 'replacetags');
125
  $attributes['product_url'] = array('label' => 'url', 'source' => '');
126
  $attributes['image_link'] = array('label' => 'image', 'source' => '');
127
  $attributes['price'] = array('label' => 'price', 'source' => '');
@@ -135,6 +147,7 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
135
  $attributes['categories'] = array('label' => 'categories', 'source' => '', 'parent' => 1);
136
  $attributes['type'] = array('label' => 'type', 'source' => 'type_id');
137
  $attributes['status'] = array('label' => 'status', 'source' => 'status', 'parent' => 1);
 
138
  $attributes['parent_id'] = array('label' => 'item_group_id', 'source' => 'entity_id', 'parent' => 1);
139
  $attributes['weight'] = array('label' => 'weight', 'source' => '');
140
 
@@ -144,7 +157,14 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
144
  if(Mage::getStoreConfig('channable/data/stock', $storeId)) {
145
  $attributes['stock'] = array('label' => 'qty', 'source' => 'qty', 'action' => 'round');
146
  }
147
-
 
 
 
 
 
 
 
148
  if($extra_fields = @unserialize(Mage::getStoreConfig('channable/advanced/extra', $storeId))) {
149
  foreach($extra_fields as $extra_field) {
150
  $attributes[$extra_field['attribute']] = array('label' => $extra_field['label'], 'source' => $extra_field['attribute'], 'action' => '');
@@ -173,60 +193,112 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
173
  return $prices;
174
  }
175
 
176
- protected function getShipping($data, $config, $product)
177
  {
178
- $shipping_array = array();
179
- if(($config['delivery'] == 'attribute') && ($config['delivery_att'])) {
180
- $shipping_array['delivery_period'] = $data[$feed_config['delivery_att']];
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
181
  } else {
182
- if(!empty($config['delivery_in'])) {
183
- if($product->getUseConfigManageStock()) {
184
- $manage_stock = $config['stock_manage'];
 
 
 
 
 
 
 
 
185
  } else {
186
- $manage_stock = $product->getManageStock();
187
- }
188
- if($manage_stock) {
189
- if($product['stock_status']) {
190
- $shipping_array['delivery_period'] = $config['delivery_in'];
191
  } else {
192
- $shipping_array['delivery_period'] = $config['delivery_out'];
193
- }
194
- } else {
195
- $shipping_array['delivery_period'] = $config['delivery_in'];
196
  }
197
- }
198
- }
199
- $i = 1;
200
- $shipping_cost = '0.00';
201
- if(!empty($data['price']['final_price_clean'])) {
202
- $price = $data['price']['final_price_clean'];
203
- if(!empty($config['shipping'])) {
204
- foreach($config['shipping'] as $shipping_price) {
205
- if(($price >= $shipping_price['price_from']) && ($price <= $shipping_price['price_to'])) {
206
- if($shipping_price['cost'] > 0) {
207
- $shipping_cost = $shipping_price['cost'];
208
- $shipping_cost = number_format($shipping_cost, 2, '.', '');
209
- $shipping_array['shipping'] = $shipping_cost . ' ' . $config['currency'];
210
- }
211
- }
212
- }
213
- }
214
  }
215
  return $shipping_array;
216
  }
217
 
218
  protected function getCategoryData($product_data, $config)
219
  {
220
- $category = array();
221
  if(!empty($product_data['categories'])) {
222
- if(is_array($product_data['categories']['path'])) {
223
- $path_array = array_unique($product_data['categories']['path']);
224
- $category['categories'] = implode(' > ', $path_array);
225
- }
 
 
 
 
 
226
  }
227
  return $category;
228
  }
229
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
230
  protected function getExtraDataFields($product_data, $config, $product)
231
  {
232
  $_extra = array();
@@ -235,12 +307,17 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
235
  $_extra = array_merge($_extra, $_prices);
236
  }
237
  }
238
- if($_shipping = $this->getShipping($product_data, $config, $product)) {
239
  $_extra = array_merge($_extra, $_shipping);
240
  }
241
  if($_category_data = $this->getCategoryData($product_data, $config)) {
242
  $_extra = array_merge($_extra, $_category_data);
243
- }
 
 
 
 
 
244
  return $_extra;
245
  }
246
 
@@ -264,4 +341,18 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
264
  return $header;
265
  }
266
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
267
  }
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
19
 
20
  public function generateFeed($storeId, $limit = '', $page = '', $time_start)
21
  {
22
+ $config = $this->getFeedConfig($storeId);
23
+ $clean = $this->cleanItemUpdates($storeId, $page);
24
  $products = $this->getProducts($config, $config['limit'], $page);
25
  if($feed = $this->getFeedData($products, $config, $time_start)) {
26
  return $feed;
42
  $product_row = array_merge($product_row, $extra_data);
43
  }
44
  $feed['products'][] = $product_row;
45
+ if($config['item_updates']) {
46
+ $this->processItemUpdates($product_row, $config['store_id']);
47
+ }
48
  unset($product_row);
49
  }
50
  }
73
  $config['website_url'] = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
74
  $config['media_url'] = Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA);
75
  $config['media_image_url'] = $config['media_url'] . 'catalog' . DS . 'product';
76
+ $config['media_attributes'] = $feed->getMediaAttributes();
77
  $config['limit'] = Mage::getStoreConfig('channable/connect/max_products', $storeId);
78
  $config['version'] = (string)Mage::getConfig()->getNode()->modules->Magmodules_Channable->version;
79
  $config['media_gallery_id'] = Mage::getResourceModel('eav/entity_attribute')->getIdByCode('catalog_product', 'media_gallery');
80
+ $config['item_updates'] = Mage::getStoreConfig('channable_api/item/enabled', $storeId);
81
+
82
  // PRODUCT & CATEGORY
83
  $config['filter_enabled'] = Mage::getStoreConfig('channable/filter/category_enabled', $storeId);
84
  $config['filter_cat'] = Mage::getStoreConfig('channable/filter/categories', $storeId);
92
  $config['delivery'] = Mage::getStoreConfig('channable/data/delivery', $storeId);
93
  $config['delivery_att'] = Mage::getStoreConfig('channable/data/delivery_att', $storeId);
94
  $config['delivery_in'] = Mage::getStoreConfig('channable/data/delivery_in', $storeId);
95
+ $config['delivery_out'] = Mage::getStoreConfig('channable/data/delivery_out', $storeId);
96
+ $config['delivery_be'] = Mage::getStoreConfig('channable/data/delivery', $storeId);
97
+ $config['delivery_be'] = Mage::getStoreConfig('channable/data/delivery_be', $storeId);
98
+ $config['delivery_att_be'] = Mage::getStoreConfig('channable/data/delivery_att_be', $storeId);
99
+ $config['delivery_in_be'] = Mage::getStoreConfig('channable/data/delivery_in_be', $storeId);
100
+ $config['delivery_out_be'] = Mage::getStoreConfig('channable/data/delivery_out_be', $storeId);
101
+ $config['delivery_out_be'] = Mage::getStoreConfig('channable/data/delivery_out_be', $storeId);
102
  $config['images'] = Mage::getStoreConfig('channable/data/images', $storeId);
103
+ $config['default_image'] = Mage::getStoreConfig('channable/data/default_image', $storeId);
104
  $config['skip_validation'] = true;
 
105
 
106
  // WEIGHT
107
  $config['weight'] = Mage::getStoreConfig('channable/data/weight', $storeId);
118
  $config['use_tax'] = Mage::helper('channable')->getTaxUsage($config);
119
 
120
  // SHIPPING
121
+ $config['shipping_prices'] = @unserialize(Mage::getStoreConfig('channable/advanced/shipping_price', $storeId));
122
+ $config['shipping_method'] = Mage::getStoreConfig('channable/advanced/shipping_method', $storeId);
123
 
124
  // FIELD & CATEGORY DATA
125
  $config['field'] = $this->getFeedAttributes($config, $storeId);
126
  $config['category_data'] = $feed->getCategoryData($config, $storeId);
127
+
128
  return $config;
129
  }
130
 
132
  {
133
  $attributes = array();
134
  $attributes['id'] = array('label' => 'id', 'source' => 'entity_id');
135
+ $attributes['name'] = array('label' => 'name', 'source' => Mage::getStoreConfig('channable/data/name', $storeId));
136
+ $attributes['description'] = array('label' => 'description', 'source' => Mage::getStoreConfig('channable/data/description', $storeId));
137
  $attributes['product_url'] = array('label' => 'url', 'source' => '');
138
  $attributes['image_link'] = array('label' => 'image', 'source' => '');
139
  $attributes['price'] = array('label' => 'price', 'source' => '');
147
  $attributes['categories'] = array('label' => 'categories', 'source' => '', 'parent' => 1);
148
  $attributes['type'] = array('label' => 'type', 'source' => 'type_id');
149
  $attributes['status'] = array('label' => 'status', 'source' => 'status', 'parent' => 1);
150
+ $attributes['visibility'] = array('label' => 'visibility', 'source' => 'visibility');
151
  $attributes['parent_id'] = array('label' => 'item_group_id', 'source' => 'entity_id', 'parent' => 1);
152
  $attributes['weight'] = array('label' => 'weight', 'source' => '');
153
 
157
  if(Mage::getStoreConfig('channable/data/stock', $storeId)) {
158
  $attributes['stock'] = array('label' => 'qty', 'source' => 'qty', 'action' => 'round');
159
  }
160
+
161
+ if(Mage::getStoreConfig('channable/data/delivery', $storeId) == 'attribute') {
162
+ $attributes['delivery'] = array('label' => 'delivery_period', 'source' => Mage::getStoreConfig('channable/data/delivery_att', $storeId), 'parent' => 1);
163
+ }
164
+ if(Mage::getStoreConfig('channable/data/delivery_be', $storeId) == 'attribute') {
165
+ $attributes['delivery_be'] = array('label' => 'delivery_period_be', 'source' => Mage::getStoreConfig('channable/data/delivery_att_be', $storeId), 'parent' => 1);
166
+ }
167
+
168
  if($extra_fields = @unserialize(Mage::getStoreConfig('channable/advanced/extra', $storeId))) {
169
  foreach($extra_fields as $extra_field) {
170
  $attributes[$extra_field['attribute']] = array('label' => $extra_field['label'], 'source' => $extra_field['attribute'], 'action' => '');
193
  return $prices;
194
  }
195
 
196
+ public function getShipping($data, $config, $weight, $product)
197
  {
198
+ $shipping_array = array();
199
+
200
+ if($config['delivery'] == 'fixed') {
201
+ if(!empty($data['availability'])) {
202
+ if(!empty($config['delivery_in'])) {
203
+ $shipping_array['delivery'] = $config['delivery_in'];
204
+ }
205
+ } else {
206
+ if(!empty($config['delivery_out'])) {
207
+ $shipping_array['delivery'] = $config['delivery_out'];
208
+ }
209
+ }
210
+ }
211
+
212
+ if($config['delivery_be'] == 'fixed') {
213
+ if(!empty($data['availability'])) {
214
+ if(!empty($config['delivery_in_be'])) {
215
+ $shipping_array['delivery_be'] = $config['delivery_in_be'];
216
+ }
217
+ } else {
218
+ if(!empty($config['delivery_out'])) {
219
+ $shipping_array['delivery_be'] = $config['delivery_out_be'];
220
+ }
221
+ }
222
+ }
223
+
224
+ $shipping_cost = '0.00';
225
+ $cal_value = '';
226
+ if($config['shipping_method'] == 'weight') {
227
+ $cal_value = $weight;
228
  } else {
229
+ if(!empty($data['price']['final_price_clean'])) {
230
+ $cal_value = $data['price']['final_price_clean'];
231
+ }
232
+ }
233
+ foreach($config['shipping_prices'] as $shipping_price) {
234
+ if(($cal_value >= $shipping_price['price_from']) && ($cal_value <= $shipping_price['price_to'])) {
235
+ $shipping_cost = $shipping_price['cost'];
236
+ $shipping_cost = number_format($shipping_cost, 2, '.', '');
237
+ if(empty($shipping_price['country'])) {
238
+ $shipping_array['shipping'] = $shipping_cost;
239
+ $shipping_array['shipping_be'] = $shipping_cost;
240
  } else {
241
+ if($shipping_price['country'] == 'BE') {
242
+ $shipping_array['shipping_be'] = $shipping_cost;
 
 
 
243
  } else {
244
+ $shipping_array['shipping'] = $shipping_cost;
245
+ }
 
 
246
  }
247
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
248
  }
249
  return $shipping_array;
250
  }
251
 
252
  protected function getCategoryData($product_data, $config)
253
  {
254
+ $category = array(); $i = 0;
255
  if(!empty($product_data['categories'])) {
256
+ foreach($product_data['categories'] as $cat) {
257
+ if(!empty($cat['path'])) {
258
+ if($i == 0) {
259
+ $category['category'] = implode(' > ', $cat['path']);
260
+ }
261
+ $category['categories'][] = implode(' > ', $cat['path']);
262
+ $i++;
263
+ }
264
+ }
265
  }
266
  return $category;
267
  }
268
+
269
+ public function getImages($product_data, $config)
270
+ {
271
+ $_images = array();
272
+ if(!empty($config['default_image'])) {
273
+ if(!empty($product_data['image'][$config['default_image']])) {
274
+ $_images['image_link'] = $product_data['image'][$config['default_image']];
275
+ }
276
+ } else {
277
+ if(!empty($product_data['image']['base'])) {
278
+ $_images['image_link'] = $product_data['image']['base'];
279
+ }
280
+ }
281
+
282
+ if(empty($_images['image_link'])) {
283
+ if(!empty($product_data['image_link'])) {
284
+ $_images['image_link'] = $product_data['image_link'];
285
+ }
286
+ }
287
+
288
+ if(!empty($product_data['image']['all'])) {
289
+ $_additional = array();
290
+ foreach($product_data['image']['all'] as $image) {
291
+ if($image != $_images['image_link']) {
292
+ $_additional[] = $image;
293
+ }
294
+ }
295
+ if(count($_additional) > 0) {
296
+ $_images['additional_imagelinks'] = $_additional;
297
+ }
298
+ }
299
+ return $_images;
300
+ }
301
+
302
  protected function getExtraDataFields($product_data, $config, $product)
303
  {
304
  $_extra = array();
307
  $_extra = array_merge($_extra, $_prices);
308
  }
309
  }
310
+ if($_shipping = $this->getShipping($product_data, $config, $product->getWeight(), $product)) {
311
  $_extra = array_merge($_extra, $_shipping);
312
  }
313
  if($_category_data = $this->getCategoryData($product_data, $config)) {
314
  $_extra = array_merge($_extra, $_category_data);
315
+ }
316
+ if($config['images'] == 'all') {
317
+ if($_images = $this->getImages($product_data, $config)) {
318
+ $_extra = array_merge($_extra, $_images);
319
+ }
320
+ }
321
  return $_extra;
322
  }
323
 
341
  return $header;
342
  }
343
 
344
+ protected function cleanItemUpdates($storeId, $page) {
345
+ if(empty($page)) {
346
+ if(Mage::helper('core')->isModuleEnabled('Magmodules_Channableapi')) {
347
+ Mage::getModel('channableapi/items')->cleanItemStore($storeId);
348
+ }
349
+ }
350
+ }
351
+
352
+ protected function processItemUpdates($product_row, $store_id) {
353
+ if(Mage::helper('core')->isModuleEnabled('Magmodules_Channableapi')) {
354
+ Mage::getModel('channableapi/items')->saveItemFeed($product_row, $store_id);
355
+ }
356
+ }
357
+
358
  }
app/code/community/Magmodules/Channable/Model/Common.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
@@ -24,7 +24,7 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
24
  $collection->setStore($store_id);
25
  $collection->addStoreFilter($store_id);
26
  $collection->addFinalPrice();
27
-
28
  if(!empty($config['filter_enabled'])) {
29
  $type = $config['filter_type'];
30
  $categories = $config['filter_cat'];
@@ -40,34 +40,22 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
40
  }
41
  }
42
 
43
- $collection->addAttributeToFilter('status', 1);
44
-
45
  if(($limit) && ($type != 'count')) {
46
  $collection->setPage($page, $limit)->getCurPage();
47
  }
48
-
49
- if(!empty($config['filter_status'])) {
50
- $visibility = $config['filter_status'];
51
- if(strlen($visibility) > 1) {
52
- $visibility = explode(',', $visibility);
53
- if($config['conf_enabled']) {
54
- $visibility[] = '1';
55
- }
56
- $collection->addAttributeToFilter('visibility', array('in' => array($visibility)));
57
- } else {
58
- if(!empty($config['conf_enabled'])) {
59
- $visibility = '1,' . $visibility;
60
- $visibility = explode(',', $visibility);
61
- $collection->addAttributeToFilter('visibility', array('in' => array($visibility)));
62
- } else {
63
- $collection->addAttributeToFilter('visibility', array('eq' => array($visibility)));
64
- }
65
- }
66
- }
67
 
68
  if($type != 'count') {
 
 
69
  $attributes = array();
70
- $attributes[] = 'url_path';
 
71
  $attributes[] = 'price';
72
  $attributes[] = 'final_price';
73
  $attributes[] = 'price_model';
@@ -83,8 +71,8 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
83
  $attributes[] = 'type_id';
84
  $attributes[] = 'image';
85
  $attributes[] = 'small_image';
86
- $attributes[] = 'thumbnail';
87
-
88
  if(!empty($config['filter_exclude'])) {
89
  $attributes[] = $config['filter_exclude'];
90
  }
@@ -93,17 +81,49 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
93
  if(!empty($field['source'])) {
94
  $attributes[] = $field['source'];
95
  }
 
 
 
 
 
 
 
 
96
  }
97
 
98
- $collection->addAttributeToSelect($attributes);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
99
  $collection->joinTable('cataloginventory/stock_item', 'product_id=entity_id', array("qty" => "qty", "stock_status" => "is_in_stock", "manage_stock" => "manage_stock", "use_config_manage_stock" => "use_config_manage_stock"))->addAttributeToSelect(array('qty', 'stock_status', 'manage_stock', 'use_config_manage_stock'));
100
  $collection->getSelect()->group('e.entity_id');
101
- $products = $collection->load();
102
  } else {
103
  $products = $collection->getSize();
104
  }
105
-
106
- return $products;
107
  }
108
 
109
  }
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
24
  $collection->setStore($store_id);
25
  $collection->addStoreFilter($store_id);
26
  $collection->addFinalPrice();
27
+
28
  if(!empty($config['filter_enabled'])) {
29
  $type = $config['filter_type'];
30
  $categories = $config['filter_cat'];
40
  }
41
  }
42
 
43
+ $collection->addAttributeToFilter('status', 1);
44
+
45
  if(($limit) && ($type != 'count')) {
46
  $collection->setPage($page, $limit)->getCurPage();
47
  }
48
+
49
+ if(empty($config['conf_enabled'])) {
50
+ $collection->addAttributeToFilter('visibility', array('in' => array(2,3,4)));
51
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
52
 
53
  if($type != 'count') {
54
+
55
+ // All attributes
56
  $attributes = array();
57
+ $attributes[] = 'url_path';
58
+ $attributes[] = 'sku';
59
  $attributes[] = 'price';
60
  $attributes[] = 'final_price';
61
  $attributes[] = 'price_model';
71
  $attributes[] = 'type_id';
72
  $attributes[] = 'image';
73
  $attributes[] = 'small_image';
74
+ $attributes[] = 'thumbnail';
75
+
76
  if(!empty($config['filter_exclude'])) {
77
  $attributes[] = $config['filter_exclude'];
78
  }
81
  if(!empty($field['source'])) {
82
  $attributes[] = $field['source'];
83
  }
84
+ }
85
+
86
+ if(!empty($config['delivery_att'])) {
87
+ $attributes[] = $config['delivery_att'];
88
+ }
89
+
90
+ if(!empty($config['delivery_att_be'])) {
91
+ $attributes[] = $config['delivery_att_be'];
92
  }
93
 
94
+ if(!empty($config['media_attributes'])) {
95
+ foreach($config['media_attributes'] as $media_att) {
96
+ $attributes[] = $media_att;
97
+ }
98
+ }
99
+
100
+ $custom_values = '';
101
+ if(isset($config['custom_name'])) {
102
+ $custom_values .= $config['custom_name'] . ' ';
103
+ }
104
+ if(isset($config['custom_description'])) {
105
+ $custom_values .= $config['custom_description'] . ' ';
106
+ }
107
+ if(isset($config['category_default'])) {
108
+ $custom_values .= $config['category_default'] . ' ';
109
+ }
110
+
111
+ $att = preg_match_all("/{{([^}]*)}}/", $custom_values, $found_atts);
112
+ if(!empty($found_atts)) {
113
+ foreach($found_atts[1] as $att) {
114
+ $attributes[] = $att;
115
+ }
116
+ }
117
+
118
+ $collection->addAttributeToSelect($attributes);
119
+
120
  $collection->joinTable('cataloginventory/stock_item', 'product_id=entity_id', array("qty" => "qty", "stock_status" => "is_in_stock", "manage_stock" => "manage_stock", "use_config_manage_stock" => "use_config_manage_stock"))->addAttributeToSelect(array('qty', 'stock_status', 'manage_stock', 'use_config_manage_stock'));
121
  $collection->getSelect()->group('e.entity_id');
122
+ $products = $collection->load();
123
  } else {
124
  $products = $collection->getSize();
125
  }
126
+ return $products;
 
127
  }
128
 
129
  }
app/code/community/Magmodules/Channable/controllers/Adminhtml/ChannableController.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/controllers/FeedController.php CHANGED
@@ -10,7 +10,7 @@
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
10
  * @category Magmodules
11
  * @package Magmodules_Channable
12
  * @author Magmodules <info@magmodules.eu>
13
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
14
  * @license http://www.magmodules.eu/license-agreement/
15
  * =============================================================
16
  */
app/code/community/Magmodules/Channable/etc/adminhtml.xml CHANGED
@@ -11,7 +11,7 @@
11
  * @category Magmodules
12
  * @package Magmodules_Channable
13
  * @author Magmodules <info@magmodules.eu>
14
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
15
  * @license http://www.magmodules.eu/license-agreement/
16
  * =============================================================
17
  */
@@ -26,7 +26,7 @@
26
  <config>
27
  <children>
28
  <channable translate="title" module="channable">
29
- <title>Channable Connect</title>
30
  </channable>
31
  </children>
32
  </config>
11
  * @category Magmodules
12
  * @package Magmodules_Channable
13
  * @author Magmodules <info@magmodules.eu>
14
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
15
  * @license http://www.magmodules.eu/license-agreement/
16
  * =============================================================
17
  */
26
  <config>
27
  <children>
28
  <channable translate="title" module="channable">
29
+ <title>Channable Feed</title>
30
  </channable>
31
  </children>
32
  </config>
app/code/community/Magmodules/Channable/etc/config.xml CHANGED
@@ -11,7 +11,7 @@
11
  * @category Magmodules
12
  * @package Magmodules_Channable
13
  * @author Magmodules <info@magmodules.eu>
14
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
15
  * @license http://www.magmodules.eu/license-agreement/
16
  * =============================================================
17
  */
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Magmodules_Channable>
22
- <version>1.3.2</version>
23
  </Magmodules_Channable>
24
  </modules>
25
  <global>
@@ -49,6 +49,13 @@
49
  </args>
50
  </channable>
51
  </routers>
 
 
 
 
 
 
 
52
  </frontend>
53
  <admin>
54
  <routers>
@@ -77,25 +84,25 @@
77
  <connect>
78
  <token></token>
79
  <enabled>1</enabled>
80
- <max_products>50</max_products>
81
  </connect>
82
  <data>
 
83
  <description>description</description>
84
  <brand>manufacturer</brand>
85
  <ean>sku</ean>
86
  <sku>sku</sku>
87
  <color>color</color>
88
  <size></size>
 
89
  <material></material>
90
  <gender></gender>
 
91
  <delivery_in>24 Hours</delivery_in>
92
  <delivery_out>1-7 Days</delivery_out>
93
  <stock_status>1</stock_status>
94
  <stock>1</stock>
95
  </data>
96
- <filter>
97
- <visibility_inc>4</visibility_inc>
98
- </filter>
99
  </channable>
100
  </default>
101
  </config>
11
  * @category Magmodules
12
  * @package Magmodules_Channable
13
  * @author Magmodules <info@magmodules.eu>
14
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
15
  * @license http://www.magmodules.eu/license-agreement/
16
  * =============================================================
17
  */
19
  <config>
20
  <modules>
21
  <Magmodules_Channable>
22
+ <version>1.3.6</version>
23
  </Magmodules_Channable>
24
  </modules>
25
  <global>
49
  </args>
50
  </channable>
51
  </routers>
52
+ <product>
53
+ <collection>
54
+ <attributes>
55
+ <image />
56
+ </attributes>
57
+ </collection>
58
+ </product>
59
  </frontend>
60
  <admin>
61
  <routers>
84
  <connect>
85
  <token></token>
86
  <enabled>1</enabled>
87
+ <max_products>200</max_products>
88
  </connect>
89
  <data>
90
+ <name>name</name>
91
  <description>description</description>
92
  <brand>manufacturer</brand>
93
  <ean>sku</ean>
94
  <sku>sku</sku>
95
  <color>color</color>
96
  <size></size>
97
+ <images>all</images>
98
  <material></material>
99
  <gender></gender>
100
+ <delivery>fixed</delivery>
101
  <delivery_in>24 Hours</delivery_in>
102
  <delivery_out>1-7 Days</delivery_out>
103
  <stock_status>1</stock_status>
104
  <stock>1</stock>
105
  </data>
 
 
 
106
  </channable>
107
  </default>
108
  </config>
app/code/community/Magmodules/Channable/etc/system.xml CHANGED
@@ -11,7 +11,7 @@
11
  * @category Magmodules
12
  * @package Magmodules_Channable
13
  * @author Magmodules <info@magmodules.eu>
14
- * @copyright Copyright (c) 2015 (http://www.magmodules.eu)
15
  * @license http://www.magmodules.eu/license-agreement/
16
  * =============================================================
17
  */
@@ -25,7 +25,7 @@
25
  </tabs>
26
  <sections>
27
  <channable translate="label" module="channable">
28
- <label>Channable Connect</label>
29
  <tab>magmodules</tab>
30
  <frontend_type>text</frontend_type>
31
  <sort_order>103</sort_order>
@@ -85,13 +85,13 @@
85
  <show_in_store>1</show_in_store>
86
  </enabled>
87
  <max_products translate="label">
88
- <label>Products per feed</label>
89
  <frontend_type>text</frontend_type>
90
  <sort_order>13</sort_order>
91
  <show_in_default>1</show_in_default>
92
  <show_in_website>1</show_in_website>
93
  <show_in_store>1</show_in_store>
94
- <comment>Limit products per feed</comment>
95
  </max_products>
96
  </fields>
97
  </connect>
@@ -112,19 +112,28 @@
112
  <show_in_website>1</show_in_website>
113
  <show_in_store>1</show_in_store>
114
  </note>
115
- <heading_map translate="label">
116
  <label>General Fields</label>
117
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
118
  <sort_order>10</sort_order>
119
  <show_in_default>1</show_in_default>
120
  <show_in_website>1</show_in_website>
121
  <show_in_store>1</show_in_store>
122
- </heading_map>
 
 
 
 
 
 
 
 
 
123
  <description translate="label">
124
  <label>Description</label>
125
  <frontend_type>select</frontend_type>
126
  <source_model>channable/adminhtml_system_config_source_textattribute</source_model>
127
- <sort_order>11</sort_order>
128
  <show_in_default>1</show_in_default>
129
  <show_in_website>1</show_in_website>
130
  <show_in_store>1</show_in_store>
@@ -132,8 +141,8 @@
132
  <brand translate="label">
133
  <label>Brand</label>
134
  <frontend_type>select</frontend_type>
135
- <source_model>channable/adminhtml_system_config_source_selectattribute</source_model>
136
- <sort_order>12</sort_order>
137
  <show_in_default>1</show_in_default>
138
  <show_in_website>1</show_in_website>
139
  <show_in_store>1</show_in_store>
@@ -146,24 +155,42 @@
146
  <show_in_default>1</show_in_default>
147
  <show_in_website>1</show_in_website>
148
  <show_in_store>1</show_in_store>
149
- </ean>
 
 
 
 
 
 
 
 
150
  <images translate="label">
151
  <label>Images</label>
152
  <frontend_type>select</frontend_type>
153
  <source_model>channable/adminhtml_system_config_source_images</source_model>
154
- <sort_order>15</sort_order>
155
  <show_in_default>1</show_in_default>
156
  <show_in_website>1</show_in_website>
157
  <show_in_store>1</show_in_store>
158
- </images>
159
- <heading_map2 translate="label">
 
 
 
 
 
 
 
 
 
 
160
  <label>Additional Fields</label>
161
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
162
  <sort_order>20</sort_order>
163
  <show_in_default>1</show_in_default>
164
  <show_in_website>1</show_in_website>
165
  <show_in_store>1</show_in_store>
166
- </heading_map2>
167
  <sku translate="label">
168
  <label>SKU</label>
169
  <frontend_type>select</frontend_type>
@@ -176,7 +203,7 @@
176
  <size translate="label">
177
  <label>Size</label>
178
  <frontend_type>select</frontend_type>
179
- <source_model>channable/adminhtml_system_config_source_selectattribute</source_model>
180
  <sort_order>22</sort_order>
181
  <show_in_default>1</show_in_default>
182
  <show_in_website>1</show_in_website>
@@ -185,7 +212,7 @@
185
  <color translate="label">
186
  <label>Color</label>
187
  <frontend_type>select</frontend_type>
188
- <source_model>channable/adminhtml_system_config_source_selectattribute</source_model>
189
  <sort_order>23</sort_order>
190
  <show_in_default>1</show_in_default>
191
  <show_in_website>1</show_in_website>
@@ -194,7 +221,7 @@
194
  <material translate="label">
195
  <label>Material</label>
196
  <frontend_type>select</frontend_type>
197
- <source_model>channable/adminhtml_system_config_source_selectattribute</source_model>
198
  <sort_order>24</sort_order>
199
  <show_in_default>1</show_in_default>
200
  <show_in_website>1</show_in_website>
@@ -203,22 +230,48 @@
203
  <gender translate="label">
204
  <label>Gender</label>
205
  <frontend_type>select</frontend_type>
206
- <source_model>channable/adminhtml_system_config_source_selectattribute</source_model>
207
  <sort_order>25</sort_order>
208
  <show_in_default>1</show_in_default>
209
  <show_in_website>1</show_in_website>
210
  <show_in_store>1</show_in_store>
211
  </gender>
212
- <heading_delivery translate="label">
213
- <label>Delivery Time</label>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
214
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
215
  <sort_order>40</sort_order>
216
  <show_in_default>1</show_in_default>
217
  <show_in_website>1</show_in_website>
218
  <show_in_store>1</show_in_store>
219
- </heading_delivery>
220
  <delivery translate="label">
221
- <label>Type</label>
222
  <frontend_type>select</frontend_type>
223
  <source_model>channable/adminhtml_system_config_source_type</source_model>
224
  <sort_order>41</sort_order>
@@ -229,7 +282,7 @@
229
  <delivery_att translate="label">
230
  <label>Attribute</label>
231
  <frontend_type>select</frontend_type>
232
- <source_model>channable/adminhtml_system_config_source_selectattribute</source_model>
233
  <sort_order>42</sort_order>
234
  <show_in_default>1</show_in_default>
235
  <show_in_website>1</show_in_website>
@@ -239,7 +292,7 @@
239
  <delivery_in translate="label">
240
  <label>Delivery Time - In Stock</label>
241
  <frontend_type>text</frontend_type>
242
- <sort_order>42</sort_order>
243
  <show_in_default>1</show_in_default>
244
  <show_in_website>1</show_in_website>
245
  <show_in_store>1</show_in_store>
@@ -248,38 +301,57 @@
248
  <delivery_out translate="label">
249
  <label>Delivery Time - Out of Stock</label>
250
  <frontend_type>text</frontend_type>
251
- <sort_order>43</sort_order>
252
  <show_in_default>1</show_in_default>
253
  <show_in_website>1</show_in_website>
254
  <show_in_store>1</show_in_store>
255
  <depends><delivery>fixed</delivery></depends>
256
  </delivery_out>
257
- <heading_stock translate="label">
258
- <label>Stock</label>
259
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
260
- <sort_order>60</sort_order>
261
  <show_in_default>1</show_in_default>
262
  <show_in_website>1</show_in_website>
263
  <show_in_store>1</show_in_store>
264
- </heading_stock>
265
- <stock_status translate="label">
266
- <label>Send Status</label>
267
  <frontend_type>select</frontend_type>
268
- <source_model>adminhtml/system_config_source_yesno</source_model>
269
- <sort_order>61</sort_order>
270
  <show_in_default>1</show_in_default>
271
  <show_in_website>1</show_in_website>
272
  <show_in_store>1</show_in_store>
273
- </stock_status>
274
- <stock translate="label">
275
- <label>Send Stock Level</label>
276
  <frontend_type>select</frontend_type>
277
- <source_model>adminhtml/system_config_source_yesno</source_model>
278
- <sort_order>62</sort_order>
279
  <show_in_default>1</show_in_default>
280
  <show_in_website>1</show_in_website>
281
  <show_in_store>1</show_in_store>
282
- </stock>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
283
  <weight_heading translate="label">
284
  <label>Weight</label>
285
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
@@ -435,11 +507,20 @@
435
  <show_in_website>1</show_in_website>
436
  <show_in_store>1</show_in_store>
437
  </heading_shipping>
 
 
 
 
 
 
 
 
 
438
  <shipping_price>
439
  <label>Shipping Price</label>
440
  <frontend_model>channable/adminhtml_config_form_field_shipping</frontend_model>
441
  <backend_model>channable/adminhtml_system_config_backend_design_shipping</backend_model>
442
- <sort_order>51</sort_order>
443
  <show_in_default>1</show_in_default>
444
  <show_in_website>1</show_in_website>
445
  <show_in_store>1</show_in_store>
@@ -463,24 +544,6 @@
463
  <show_in_website>1</show_in_website>
464
  <show_in_store>1</show_in_store>
465
  </note>
466
- <visibility_heading translate="label">
467
- <label>Only add products with the following visibility</label>
468
- <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
469
- <sort_order>10</sort_order>
470
- <show_in_default>1</show_in_default>
471
- <show_in_website>1</show_in_website>
472
- <show_in_store>1</show_in_store>
473
- </visibility_heading>
474
- <visibility_inc translate="label">
475
- <label>Visibility</label>
476
- <frontend_type>multiselect</frontend_type>
477
- <source_model>channable/adminhtml_system_config_source_visibility</source_model>
478
- <sort_order>11</sort_order>
479
- <show_in_default>1</show_in_default>
480
- <show_in_website>1</show_in_website>
481
- <show_in_store>1</show_in_store>
482
- <comment>Include products with this visibility</comment>
483
- </visibility_inc>
484
  <category_heading translate="label">
485
  <label>Filter by Category</label>
486
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
11
  * @category Magmodules
12
  * @package Magmodules_Channable
13
  * @author Magmodules <info@magmodules.eu>
14
+ * @copyright Copyright (c) 2016 (http://www.magmodules.eu)
15
  * @license http://www.magmodules.eu/license-agreement/
16
  * =============================================================
17
  */
25
  </tabs>
26
  <sections>
27
  <channable translate="label" module="channable">
28
+ <label>Channable Feed</label>
29
  <tab>magmodules</tab>
30
  <frontend_type>text</frontend_type>
31
  <sort_order>103</sort_order>
85
  <show_in_store>1</show_in_store>
86
  </enabled>
87
  <max_products translate="label">
88
+ <label>Products per page</label>
89
  <frontend_type>text</frontend_type>
90
  <sort_order>13</sort_order>
91
  <show_in_default>1</show_in_default>
92
  <show_in_website>1</show_in_website>
93
  <show_in_store>1</show_in_store>
94
+ <comment>Limits the amount of product Channable will import per run. This setting wil not limit the total products sent to Channable!</comment>
95
  </max_products>
96
  </fields>
97
  </connect>
112
  <show_in_website>1</show_in_website>
113
  <show_in_store>1</show_in_store>
114
  </note>
115
+ <heading_general translate="label">
116
  <label>General Fields</label>
117
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
118
  <sort_order>10</sort_order>
119
  <show_in_default>1</show_in_default>
120
  <show_in_website>1</show_in_website>
121
  <show_in_store>1</show_in_store>
122
+ </heading_general>
123
+ <name translate="label">
124
+ <label>Name</label>
125
+ <frontend_type>select</frontend_type>
126
+ <source_model>channable/adminhtml_system_config_source_name</source_model>
127
+ <sort_order>11</sort_order>
128
+ <show_in_default>1</show_in_default>
129
+ <show_in_website>1</show_in_website>
130
+ <show_in_store>1</show_in_store>
131
+ </name>
132
  <description translate="label">
133
  <label>Description</label>
134
  <frontend_type>select</frontend_type>
135
  <source_model>channable/adminhtml_system_config_source_textattribute</source_model>
136
+ <sort_order>12</sort_order>
137
  <show_in_default>1</show_in_default>
138
  <show_in_website>1</show_in_website>
139
  <show_in_store>1</show_in_store>
141
  <brand translate="label">
142
  <label>Brand</label>
143
  <frontend_type>select</frontend_type>
144
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
145
+ <sort_order>13</sort_order>
146
  <show_in_default>1</show_in_default>
147
  <show_in_website>1</show_in_website>
148
  <show_in_store>1</show_in_store>
155
  <show_in_default>1</show_in_default>
156
  <show_in_website>1</show_in_website>
157
  <show_in_store>1</show_in_store>
158
+ </ean>
159
+ <heading_images translate="label">
160
+ <label>Images</label>
161
+ <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
162
+ <sort_order>15</sort_order>
163
+ <show_in_default>1</show_in_default>
164
+ <show_in_website>1</show_in_website>
165
+ <show_in_store>1</show_in_store>
166
+ </heading_images>
167
  <images translate="label">
168
  <label>Images</label>
169
  <frontend_type>select</frontend_type>
170
  <source_model>channable/adminhtml_system_config_source_images</source_model>
171
+ <sort_order>16</sort_order>
172
  <show_in_default>1</show_in_default>
173
  <show_in_website>1</show_in_website>
174
  <show_in_store>1</show_in_store>
175
+ </images>
176
+ <default_image translate="label">
177
+ <label>Default Image</label>
178
+ <frontend_type>select</frontend_type>
179
+ <source_model>channable/adminhtml_system_config_source_mainimage</source_model>
180
+ <sort_order>17</sort_order>
181
+ <show_in_default>1</show_in_default>
182
+ <show_in_website>1</show_in_website>
183
+ <show_in_store>1</show_in_store>
184
+ <depends><images>all</images></depends>
185
+ </default_image>
186
+ <heading_additional translate="label">
187
  <label>Additional Fields</label>
188
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
189
  <sort_order>20</sort_order>
190
  <show_in_default>1</show_in_default>
191
  <show_in_website>1</show_in_website>
192
  <show_in_store>1</show_in_store>
193
+ </heading_additional>
194
  <sku translate="label">
195
  <label>SKU</label>
196
  <frontend_type>select</frontend_type>
203
  <size translate="label">
204
  <label>Size</label>
205
  <frontend_type>select</frontend_type>
206
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
207
  <sort_order>22</sort_order>
208
  <show_in_default>1</show_in_default>
209
  <show_in_website>1</show_in_website>
212
  <color translate="label">
213
  <label>Color</label>
214
  <frontend_type>select</frontend_type>
215
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
216
  <sort_order>23</sort_order>
217
  <show_in_default>1</show_in_default>
218
  <show_in_website>1</show_in_website>
221
  <material translate="label">
222
  <label>Material</label>
223
  <frontend_type>select</frontend_type>
224
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
225
  <sort_order>24</sort_order>
226
  <show_in_default>1</show_in_default>
227
  <show_in_website>1</show_in_website>
230
  <gender translate="label">
231
  <label>Gender</label>
232
  <frontend_type>select</frontend_type>
233
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
234
  <sort_order>25</sort_order>
235
  <show_in_default>1</show_in_default>
236
  <show_in_website>1</show_in_website>
237
  <show_in_store>1</show_in_store>
238
  </gender>
239
+ <heading_stock translate="label">
240
+ <label>Stock</label>
241
+ <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
242
+ <sort_order>30</sort_order>
243
+ <show_in_default>1</show_in_default>
244
+ <show_in_website>1</show_in_website>
245
+ <show_in_store>1</show_in_store>
246
+ </heading_stock>
247
+ <stock_status translate="label">
248
+ <label>Send Status</label>
249
+ <frontend_type>select</frontend_type>
250
+ <source_model>adminhtml/system_config_source_yesno</source_model>
251
+ <sort_order>31</sort_order>
252
+ <show_in_default>1</show_in_default>
253
+ <show_in_website>1</show_in_website>
254
+ <show_in_store>1</show_in_store>
255
+ </stock_status>
256
+ <stock translate="label">
257
+ <label>Send Stock Level</label>
258
+ <frontend_type>select</frontend_type>
259
+ <source_model>adminhtml/system_config_source_yesno</source_model>
260
+ <sort_order>32</sort_order>
261
+ <show_in_default>1</show_in_default>
262
+ <show_in_website>1</show_in_website>
263
+ <show_in_store>1</show_in_store>
264
+ </stock>
265
+ <heading_delivery_nl translate="label">
266
+ <label>Delivery Time - The Netherlands</label>
267
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
268
  <sort_order>40</sort_order>
269
  <show_in_default>1</show_in_default>
270
  <show_in_website>1</show_in_website>
271
  <show_in_store>1</show_in_store>
272
+ </heading_delivery_nl>
273
  <delivery translate="label">
274
+ <label>Config</label>
275
  <frontend_type>select</frontend_type>
276
  <source_model>channable/adminhtml_system_config_source_type</source_model>
277
  <sort_order>41</sort_order>
282
  <delivery_att translate="label">
283
  <label>Attribute</label>
284
  <frontend_type>select</frontend_type>
285
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
286
  <sort_order>42</sort_order>
287
  <show_in_default>1</show_in_default>
288
  <show_in_website>1</show_in_website>
292
  <delivery_in translate="label">
293
  <label>Delivery Time - In Stock</label>
294
  <frontend_type>text</frontend_type>
295
+ <sort_order>43</sort_order>
296
  <show_in_default>1</show_in_default>
297
  <show_in_website>1</show_in_website>
298
  <show_in_store>1</show_in_store>
301
  <delivery_out translate="label">
302
  <label>Delivery Time - Out of Stock</label>
303
  <frontend_type>text</frontend_type>
304
+ <sort_order>44</sort_order>
305
  <show_in_default>1</show_in_default>
306
  <show_in_website>1</show_in_website>
307
  <show_in_store>1</show_in_store>
308
  <depends><delivery>fixed</delivery></depends>
309
  </delivery_out>
310
+ <heading_delivery_be translate="label">
311
+ <label>Delivery Time - Belgium</label>
312
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
313
+ <sort_order>45</sort_order>
314
  <show_in_default>1</show_in_default>
315
  <show_in_website>1</show_in_website>
316
  <show_in_store>1</show_in_store>
317
+ </heading_delivery_be>
318
+ <delivery_be translate="label">
319
+ <label>Config</label>
320
  <frontend_type>select</frontend_type>
321
+ <source_model>channable/adminhtml_system_config_source_type</source_model>
322
+ <sort_order>46</sort_order>
323
  <show_in_default>1</show_in_default>
324
  <show_in_website>1</show_in_website>
325
  <show_in_store>1</show_in_store>
326
+ </delivery_be>
327
+ <delivery_att_be translate="label">
328
+ <label>Attribute</label>
329
  <frontend_type>select</frontend_type>
330
+ <source_model>channable/adminhtml_system_config_source_attribute</source_model>
331
+ <sort_order>47</sort_order>
332
  <show_in_default>1</show_in_default>
333
  <show_in_website>1</show_in_website>
334
  <show_in_store>1</show_in_store>
335
+ <depends><delivery_be>attribute</delivery_be></depends>
336
+ </delivery_att_be>
337
+ <delivery_in_be translate="label">
338
+ <label>Delivery Time - In Stock</label>
339
+ <frontend_type>text</frontend_type>
340
+ <sort_order>48</sort_order>
341
+ <show_in_default>1</show_in_default>
342
+ <show_in_website>1</show_in_website>
343
+ <show_in_store>1</show_in_store>
344
+ <depends><delivery_be>fixed</delivery_be></depends>
345
+ </delivery_in_be>
346
+ <delivery_out_be translate="label">
347
+ <label>Delivery Time - Out of Stock</label>
348
+ <frontend_type>text</frontend_type>
349
+ <sort_order>49</sort_order>
350
+ <show_in_default>1</show_in_default>
351
+ <show_in_website>1</show_in_website>
352
+ <show_in_store>1</show_in_store>
353
+ <depends><delivery_be>fixed</delivery_be></depends>
354
+ </delivery_out_be>
355
  <weight_heading translate="label">
356
  <label>Weight</label>
357
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
507
  <show_in_website>1</show_in_website>
508
  <show_in_store>1</show_in_store>
509
  </heading_shipping>
510
+ <shipping_method translate="label">
511
+ <label>Shipping Calculation</label>
512
+ <frontend_type>select</frontend_type>
513
+ <source_model>channable/adminhtml_system_config_source_shipping</source_model>
514
+ <sort_order>51</sort_order>
515
+ <show_in_default>1</show_in_default>
516
+ <show_in_website>1</show_in_website>
517
+ <show_in_store>1</show_in_store>
518
+ </shipping_method>
519
  <shipping_price>
520
  <label>Shipping Price</label>
521
  <frontend_model>channable/adminhtml_config_form_field_shipping</frontend_model>
522
  <backend_model>channable/adminhtml_system_config_backend_design_shipping</backend_model>
523
+ <sort_order>52</sort_order>
524
  <show_in_default>1</show_in_default>
525
  <show_in_website>1</show_in_website>
526
  <show_in_store>1</show_in_store>
544
  <show_in_website>1</show_in_website>
545
  <show_in_store>1</show_in_store>
546
  </note>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
547
  <category_heading translate="label">
548
  <label>Filter by Category</label>
549
  <frontend_model>channable/adminhtml_system_config_form_field_heading</frontend_model>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Channable</name>
4
- <version>1.3.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Magmodules_Channable</description>
11
  <notes>Channable Connect</notes>
12
  <authors><author><name>Magmodules</name><user>auto-converted</user><email>info@magmodules.nl</email></author></authors>
13
- <date>2016-01-19</date>
14
- <time>09:39:13</time>
15
- <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Channable"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="9288e8a22a0134475bc44fd5c1240849"/><file name="Shipping.php" hash="0fa8d17c32c828a0d4f68d897c455f3b"/></dir><dir name="Renderer"><file name="Select.php" hash="2657667fe85d29ddf2a5080ff2ec5a50"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="a52355d4909a425a0f4cbbfb137f6d04"/><file name="Heading.php" hash="633b7c330bcb5900c7feae34e95d9fda"/><file name="Note.php" hash="ad97b87c2e8a0692098fb667dde75331"/><file name="Token.php" hash="2776dfd599605df190c4cf21833751c1"/><file name="Version.php" hash="31ab0c3609ee145b551f0158268bc212"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="7ac9087428330d5fb6c46be612dda16d"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="704c3de8f540f5641fb93f53b6115519"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="eb3f7a890881c91e81cb77689f96d788"/><file name="Shipping.php" hash="adc990676f255344e267b91e194ec093"/></dir></dir><dir name="Source"><file name="Action.php" hash="51da5aa9c1bcfd691d4ed32e82f89541"/><file name="Attribute.php" hash="cd7715df0bda2432e304f7383349cefa"/><file name="Category.php" hash="9f4b9c7b0430bb9a454afec43d5a446b"/><file name="Categorytype.php" hash="e0438b44f2b29674456728145d1f4f9c"/><file name="Configurable.php" hash="225cbd8f3b9f1381136a3ef79be5dc9f"/><file name="Images.php" hash="7f0fc55582c25580fc230fb247a7fd86"/><file name="Pricemodel.php" hash="265f426b67355ed02fd4aad9179a8bf7"/><file name="Selectattribute.php" hash="c0fe15d0206bc7fd6ec2a39cd97f349d"/><file name="Tax.php" hash="534795c315765bc4ec23fdef8184ba31"/><file name="Textattribute.php" hash="8093b591bba8554936f5c84d9bfb11a6"/><file name="Type.php" hash="083a651459b0c0ca5fa939d2528fad87"/><file name="Visibility.php" hash="c2e80831d9d8b5fc6cd642a590812a56"/><file name="Weight.php" hash="ba1e3c862ea2779c275d3d267b819435"/></dir></dir></dir></dir><file name="Channable.php" hash="abcd0e86f7db4cf9cef9e895a68296b7"/><file name="Common.php" hash="70def4c29e590e26cbbd8097de7d0216"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="a60c879d83956e568f45bda580e8a1a8"/></dir><file name="FeedController.php" hash="473afd692bfff811fbe199ce39899e79"/></dir><dir name="etc"><file name="adminhtml.xml" hash="d0343b3683cb40691a882015fd5a8341"/><file name="config.xml" hash="72c5acfedad919c5db066c349e623fb4"/><file name="system.xml" hash="957b3d52a16c1e5174bdd492d74cecff"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Magmodules_Channable.csv" hash="342ab8e5f81e36067a6129189ca72b6e"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="462df316feb223708a2a104cd11d556c"/></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="061032d718f1ddd64de211fc7133685c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Channable</name>
4
+ <version>1.3.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
10
  <description>Magmodules_Channable</description>
11
  <notes>Channable Connect</notes>
12
  <authors><author><name>Magmodules</name><user>auto-converted</user><email>info@magmodules.nl</email></author></authors>
13
+ <date>2016-03-10</date>
14
+ <time>08:26:00</time>
15
+ <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Channable"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="73e9ccaafacba4153962b37a8038c1ad"/><file name="Shipping.php" hash="7f15ea3b4fed5dcb20b37a78dd84cf5d"/></dir><dir name="Renderer"><file name="Select.php" hash="90a71e109a5f96bca26209c922a74961"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="e1127c67a55f163e0c17ae54111b4538"/><file name="Heading.php" hash="cf8597dec6375bbf35014e1a491605d6"/><file name="Note.php" hash="6d7c8056bf0418ab6008dd86ed1d93ca"/><file name="Token.php" hash="d6f89e494288e7d90525d8067a7bb1de"/><file name="Version.php" hash="7be709c731b412258539184c3c4e01dd"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="61fe176ed4490ffeb9813fb6a779ebeb"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="1cd66ec2147dd20dbf00d2acd4fd9c64"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="6f888d0db7ed195c93a84748dd0a0c94"/><file name="Shipping.php" hash="6bea82000c4341ff2c5a9b05c992406c"/></dir></dir><dir name="Source"><file name="Action.php" hash="d655c22564992e02daccd9aac650358a"/><file name="Attribute.php" hash="eca41820c579f551037fb4ea1c087165"/><file name="Category.php" hash="bad1adc7e7890cfa5b83de0cd7a16835"/><file name="Categorytype.php" hash="7284943e01d7fe3346da7233ea827086"/><file name="Configurable.php" hash="08f157df27a2424e1a91d81bc1a572a7"/><file name="Countries.php" hash="5d382aeec5a685381026571ff2201593"/><file name="Images.php" hash="d1c8294e6434fa3b0c03635b45964cc0"/><file name="Mainimage.php" hash="c85a8c05df234c188a0aff45a93a6b5c"/><file name="Name.php" hash="86af909704dc4f9320f2154d7c38ff4b"/><file name="Pricemodel.php" hash="359aeff8e7dc6099f55c493abed92a75"/><file name="Selectattribute.php" hash="5579305934bb5b51a443cc9525215975"/><file name="Shipping.php" hash="7f6f98ed747d4c396dd1d1cd7ab205f8"/><file name="Tax.php" hash="1b50c014c9e204e60cbbfcb883c76a9b"/><file name="Textattribute.php" hash="ea0a682c8a1aa0b51ee3e529c60fcbe8"/><file name="Type.php" hash="ffe6276231f501ac35943d3a83c77447"/><file name="Visibility.php" hash="c2e80831d9d8b5fc6cd642a590812a56"/><file name="Weight.php" hash="ba1e3c862ea2779c275d3d267b819435"/></dir></dir></dir></dir><file name="Channable.php" hash="d7a779c448700e05fb1ab36e06e3d79a"/><file name="Common.php" hash="35f99fa819869c67f930eb6ef34882bb"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="e6110aeea10eca08da781c70206f6ed9"/></dir><file name="FeedController.php" hash="e2b205016ebdc274835165111b1ed7f9"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f6d3e3176f08cd111e0655837c3365dd"/><file name="config.xml" hash="f1cea92f6293dd716ca19324c6f6bc4f"/><file name="system.xml" hash="fa2d450ce9899a31c1e88edf8da498fe"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Magmodules_Channable.csv" hash="342ab8e5f81e36067a6129189ca72b6e"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="462df316feb223708a2a104cd11d556c"/></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="061032d718f1ddd64de211fc7133685c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>