Permalink
Browse files

Merge branch 'release/1.4.0'

  • Loading branch information...
2 parents ff26b88 + 2b3ad37 commit 731035e70542d450d922b3055be527c34459620e @aschempp aschempp committed Mar 18, 2013
Showing with 12,200 additions and 7,734 deletions.
  1. +240 −173 system/drivers/DC_ProductData.php
  2. +13 −13 system/drivers/DC_TablePageId.php
  3. +3 −3 system/modules/isotope/AttributeWizard.php
  4. +189 −0 system/modules/isotope/CHANGELOG-1.4.md
  5. +1 −1 system/modules/isotope/ContentIsotope.php
  6. +0 −76 system/modules/isotope/CybersourceClient.php
  7. +2 −2 system/modules/isotope/FieldWizard.php
  8. +0 −243 system/modules/isotope/ImageWatermarkWizard.php
  9. +2 −2 system/modules/isotope/InheritCheckBox.php
  10. +1 −1 system/modules/isotope/InlineGallery.php
  11. +127 −117 system/modules/isotope/Isotope.php
  12. +181 −0 system/modules/isotope/IsotopeAddressModel.php
  13. +2 −2 system/modules/isotope/IsotopeAutomator.php
  14. +263 −17 system/modules/isotope/IsotopeBackend.php
  15. +30 −12 system/modules/isotope/IsotopeCart.php
  16. +0 −272 system/modules/isotope/IsotopeDatabase.php
  17. +286 −47 system/modules/isotope/IsotopeFrontend.php
  18. +83 −50 system/modules/isotope/IsotopeGallery.php
  19. +250 −49 system/modules/isotope/IsotopeOrder.php
  20. +30 −21 system/modules/isotope/IsotopePayment.php
  21. +520 −278 system/modules/isotope/IsotopeProduct.php
  22. +96 −53 system/modules/isotope/IsotopeProductCollection.php
  23. +12 −10 system/modules/isotope/IsotopeShipping.php
  24. +1 −1 system/modules/isotope/IsotopeTemplate.php
  25. +129 −107 system/modules/isotope/MediaManager.php
  26. +9 −4 system/modules/isotope/ModuleIsotope.php
  27. +10 −7 system/modules/isotope/ModuleIsotopeAddressBook.php
  28. +13 −4 system/modules/isotope/ModuleIsotopeCart.php
  29. +187 −112 system/modules/isotope/ModuleIsotopeCheckout.php
  30. +3 −2 system/modules/isotope/ModuleIsotopeConfigSwitcher.php
  31. +168 −0 system/modules/isotope/ModuleIsotopeCumulativeFilter.php
  32. +76 −0 system/modules/isotope/ModuleIsotopeMessages.php
  33. +88 −36 system/modules/isotope/ModuleIsotopeOrderDetails.php
  34. +22 −12 system/modules/isotope/ModuleIsotopeOrderHistory.php
  35. +94 −45 system/modules/isotope/ModuleIsotopeProductFilter.php
  36. +120 −18 system/modules/isotope/ModuleIsotopeProductList.php
  37. +8 −2 system/modules/isotope/ModuleIsotopeProductReader.php
  38. +2 −2 system/modules/isotope/ModuleIsotopeRelatedProducts.php
  39. +4 −4 system/modules/isotope/ModuleIsotopeSetup.php
  40. +12 −10 system/modules/isotope/PaymentAuthorizeDotNet.php
  41. +6 −12 system/modules/isotope/PaymentCash.php
  42. +0 −446 system/modules/isotope/PaymentCybersource.php
  43. +90 −38 system/modules/isotope/PaymentPaypal.php
  44. +0 −336 system/modules/isotope/PaymentPaypalPayflowPro.php
  45. +5 −3 system/modules/isotope/PaymentPostfinance.php
  46. +13 −13 system/modules/isotope/ProductTree.php
  47. +2 −2 system/modules/isotope/ShippingFlat.php
  48. +1 −1 system/modules/isotope/ShippingOrderTotal.php
  49. +2 −2 system/modules/isotope/ShippingUPS.php
  50. +2 −2 system/modules/isotope/ShippingWeightTotal.php
  51. +0 −248 system/modules/isotope/SurchargeWizard.php
  52. +40 −0 system/modules/isotope/UPDATE-1.4.md
  53. +7 −1 system/modules/isotope/VariantWizard.php
  54. +59 −0 system/modules/isotope/ZoomGallery.php
  55. +40 −17 system/modules/isotope/config/config.php
  56. +84 −21 system/modules/isotope/config/database.sql
  57. +150 −29 system/modules/isotope/config/runonce.php
  58. +19 −8 system/modules/isotope/dca/tl_iso_addresses.php
  59. +138 −51 system/modules/isotope/dca/tl_iso_attributes.php
  60. +152 −0 system/modules/isotope/dca/tl_iso_baseprice.php
  61. +126 −17 system/modules/isotope/dca/tl_iso_config.php
  62. +84 −5 system/modules/isotope/dca/tl_iso_downloads.php
  63. +247 −7 system/modules/isotope/dca/tl_iso_groups.php
  64. +14 −6 system/modules/isotope/dca/tl_iso_mail.php
  65. +2 −1 system/modules/isotope/dca/tl_iso_mail_content.php
  66. +123 −144 system/modules/isotope/dca/tl_iso_orders.php
  67. +231 −0 system/modules/isotope/dca/tl_iso_orderstatus.php
  68. +22 −114 system/modules/isotope/dca/tl_iso_payment_modules.php
  69. +291 −276 system/modules/isotope/dca/tl_iso_prices.php
  70. +5 −5 system/modules/isotope/dca/tl_iso_product_categories.php
  71. +390 −1,198 system/modules/isotope/dca/tl_iso_products.php
  72. +31 −16 system/modules/isotope/dca/tl_iso_producttypes.php
  73. +3 −3 system/modules/isotope/dca/tl_iso_related_products.php
  74. +25 −25 system/modules/isotope/dca/tl_iso_shipping_modules.php
  75. +8 −0 system/modules/isotope/dca/tl_iso_shipping_options.php
  76. +17 −25 system/modules/isotope/dca/tl_iso_tax_class.php
  77. +67 −29 system/modules/isotope/dca/tl_iso_tax_rate.php
  78. +93 −25 system/modules/isotope/dca/tl_module.php
  79. +35 −14 system/modules/isotope/dca/tl_user.php
  80. +35 −2 system/modules/isotope/dca/tl_user_group.php
  81. +50 −0 system/modules/isotope/html/Autocompleter.css
  82. +547 −0 system/modules/isotope/html/Autocompleter.js
  83. +1 −0 system/modules/isotope/html/Autocompleter.min.css
  84. +1 −0 system/modules/isotope/html/Autocompleter.min.js
  85. +1 −1 system/modules/isotope/html/backend.css
  86. +1 −1 system/modules/isotope/html/backend.js
  87. +0 −11 system/modules/isotope/html/backend_src.css
  88. +28 −122 system/modules/isotope/html/backend_src.js
  89. +1 −1 system/modules/isotope/html/isotope.css
  90. +1 −1 system/modules/isotope/html/isotope.js
  91. +4 −2 system/modules/isotope/html/isotope_src.css
  92. +0 −1 system/modules/isotope/html/isotope_src.js
  93. BIN system/modules/isotope/html/sort-price-descending.png
  94. BIN system/modules/isotope/html/traffic-light.png
  95. +1 −0 system/modules/isotope/html/zoomgallery.css
  96. +1 −0 system/modules/isotope/html/zoomgallery.js
  97. +20 −0 system/modules/isotope/html/zoomgallery_src.css
  98. +271 −0 system/modules/isotope/html/zoomgallery_src.js
  99. +0 −9 system/modules/isotope/languages/da/default.php
  100. +0 −4 system/modules/isotope/languages/da/explain.php
  101. +0 −11 system/modules/isotope/languages/da/tl_iso_orders.php
  102. +12 −13 system/modules/isotope/languages/de/default.php
  103. +21 −19 system/modules/isotope/languages/de/explain.php
  104. +65 −49 system/modules/isotope/languages/de/modules.php
  105. +5 −0 system/modules/isotope/languages/de/tl_iso_addresses.php
  106. +21 −6 system/modules/isotope/languages/de/tl_iso_attributes.php
  107. +51 −0 system/modules/isotope/languages/de/tl_iso_baseprice.php
  108. +146 −115 system/modules/isotope/languages/de/tl_iso_config.php
  109. +61 −40 system/modules/isotope/languages/de/tl_iso_mail.php
  110. +4 −13 system/modules/isotope/languages/de/tl_iso_orders.php
  111. +58 −0 system/modules/isotope/languages/de/tl_iso_orderstatus.php
  112. +3 −26 system/modules/isotope/languages/de/tl_iso_payment_modules.php
  113. +2 −2 system/modules/isotope/languages/de/tl_iso_prices.php
  114. +134 −111 system/modules/isotope/languages/de/tl_iso_products.php
  115. +65 −37 system/modules/isotope/languages/de/tl_iso_producttypes.php
  116. +37 −22 system/modules/isotope/languages/de/tl_iso_tax_class.php
  117. +62 −37 system/modules/isotope/languages/de/tl_iso_tax_rate.php
  118. +9 −6 system/modules/isotope/languages/de/tl_module.php
  119. +4 −0 system/modules/isotope/languages/de/tl_user.php
  120. +0 −6 system/modules/isotope/languages/de/tl_user_group.php
  121. +142 −0 system/modules/isotope/languages/en/addresses.php
  122. +0 −284 system/modules/isotope/languages/en/countries.php
  123. +22 −16 system/modules/isotope/languages/en/default.php
  124. +0 −2 system/modules/isotope/languages/en/explain.php
  125. +13 −9 system/modules/isotope/languages/en/modules.php
  126. +2 −1 system/modules/isotope/languages/en/tl_iso_addresses.php
  127. +40 −34 system/modules/isotope/languages/en/tl_iso_attributes.php
  128. +52 −0 system/modules/isotope/languages/en/tl_iso_baseprice.php
  129. +16 −10 system/modules/isotope/languages/en/tl_iso_config.php
  130. +16 −1 system/modules/isotope/languages/en/tl_iso_downloads.php
  131. +2 −1 system/modules/isotope/languages/en/tl_iso_groups.php
  132. +4 −3 system/modules/isotope/languages/en/tl_iso_mail.php
  133. +21 −27 system/modules/isotope/languages/en/tl_iso_orders.php
  134. +59 −0 system/modules/isotope/languages/en/tl_iso_orderstatus.php
  135. +4 −18 system/modules/isotope/languages/en/tl_iso_payment_modules.php
  136. +2 −2 system/modules/isotope/languages/en/tl_iso_prices.php
  137. +7 −1 system/modules/isotope/languages/en/tl_iso_products.php
  138. +9 −4 system/modules/isotope/languages/en/tl_iso_producttypes.php
  139. +1 −0 system/modules/isotope/languages/en/tl_iso_tax_class.php
  140. +5 −2 system/modules/isotope/languages/en/tl_iso_tax_rate.php
  141. +19 −11 system/modules/isotope/languages/en/tl_module.php
  142. +10 −3 system/modules/isotope/languages/en/tl_user.php
  143. +467 −381 system/modules/isotope/languages/fr/default.php
  144. +5 −9 system/modules/isotope/languages/fr/explain.php
  145. +65 −48 system/modules/isotope/languages/fr/modules.php
  146. +47 −42 system/modules/isotope/languages/fr/payment.php
  147. +7 −3 system/modules/isotope/languages/fr/tl_content.php
  148. +1 −1 system/modules/isotope/languages/fr/tl_form_field.php
  149. +64 −43 system/modules/isotope/languages/fr/tl_iso_addresses.php
  150. +120 −85 system/modules/isotope/languages/fr/tl_iso_attributes.php
  151. +51 −0 system/modules/isotope/languages/fr/tl_iso_baseprice.php
  152. +133 −102 system/modules/isotope/languages/fr/tl_iso_config.php
  153. +30 −16 system/modules/isotope/languages/fr/tl_iso_downloads.php
  154. +58 −0 system/modules/isotope/languages/fr/tl_iso_groups.php
  155. +62 −27 system/modules/isotope/languages/fr/tl_iso_mail.php
  156. +37 −23 system/modules/isotope/languages/fr/tl_iso_mail_content.php
  157. +68 −55 system/modules/isotope/languages/fr/tl_iso_orders.php
  158. +59 −0 system/modules/isotope/languages/fr/tl_iso_orderstatus.php
  159. +98 −97 system/modules/isotope/languages/fr/tl_iso_payment_modules.php
  160. +40 −21 system/modules/isotope/languages/fr/tl_iso_prices.php
  161. +6 −2 system/modules/isotope/languages/fr/tl_iso_product_categories.php
  162. +128 −86 system/modules/isotope/languages/fr/tl_iso_products.php
  163. +60 −32 system/modules/isotope/languages/fr/tl_iso_producttypes.php
  164. +34 −20 system/modules/isotope/languages/fr/tl_iso_related_categories.php
  165. +31 −17 system/modules/isotope/languages/fr/tl_iso_related_products.php
  166. +101 −59 system/modules/isotope/languages/fr/tl_iso_shipping_modules.php
  167. +33 −18 system/modules/isotope/languages/fr/tl_iso_shipping_options.php
  168. +33 −18 system/modules/isotope/languages/fr/tl_iso_tax_class.php
  169. +49 −34 system/modules/isotope/languages/fr/tl_iso_tax_rate.php
  170. +62 −37 system/modules/isotope/languages/fr/tl_module.php
  171. +12 −2 system/modules/isotope/languages/fr/tl_page.php
  172. +26 −5 system/modules/isotope/languages/fr/tl_user.php
  173. +4 −6 system/modules/isotope/languages/fr/tl_user_group.php
  174. +0 −9 system/modules/isotope/languages/it/default.php
  175. +0 −4 system/modules/isotope/languages/it/explain.php
  176. +4 −4 system/modules/isotope/languages/it/tl_iso_attributes.php
  177. +0 −15 system/modules/isotope/languages/it/tl_iso_orders.php
  178. +0 −23 system/modules/isotope/languages/it/tl_iso_payment_modules.php
  179. +2 −2 system/modules/isotope/languages/it/tl_iso_prices.php
  180. +0 −1 system/modules/isotope/languages/it/tl_iso_producttypes.php
  181. +0 −4 system/modules/isotope/languages/it/tl_iso_tax_rate.php
  182. +6 −6 system/modules/isotope/languages/it/tl_module.php
  183. +0 −9 system/modules/isotope/languages/nl/default.php
  184. +0 −4 system/modules/isotope/languages/nl/explain.php
  185. +4 −4 system/modules/isotope/languages/nl/tl_iso_attributes.php
  186. +6 −7 system/modules/isotope/languages/nl/tl_iso_config.php
  187. +0 −15 system/modules/isotope/languages/nl/tl_iso_orders.php
  188. +2 −2 system/modules/isotope/languages/nl/tl_iso_prices.php
  189. +0 −1 system/modules/isotope/languages/nl/tl_iso_producttypes.php
  190. +0 −4 system/modules/isotope/languages/nl/tl_iso_tax_rate.php
  191. +6 −6 system/modules/isotope/languages/nl/tl_module.php
  192. +0 −11 system/modules/isotope/languages/pl/default.php
  193. +0 −2 system/modules/isotope/languages/pl/explain.php
  194. +4 −4 system/modules/isotope/languages/pl/tl_iso_attributes.php
  195. +6 −7 system/modules/isotope/languages/pl/tl_iso_config.php
  196. +0 −15 system/modules/isotope/languages/pl/tl_iso_orders.php
  197. +0 −14 system/modules/isotope/languages/pl/tl_iso_payment_modules.php
  198. +2 −2 system/modules/isotope/languages/pl/tl_iso_prices.php
  199. +0 −1 system/modules/isotope/languages/pl/tl_iso_producttypes.php
  200. +0 −2 system/modules/isotope/languages/pl/tl_iso_tax_rate.php
  201. +6 −6 system/modules/isotope/languages/pl/tl_module.php
  202. +0 −9 system/modules/isotope/languages/ru/default.php
  203. +0 −4 system/modules/isotope/languages/ru/explain.php
  204. +0 −1 system/modules/isotope/languages/ru/tl_iso_config.php
  205. +2 −2 system/modules/isotope/languages/ru/tl_module.php
  206. +1 −1 system/modules/isotope/postsale.php
  207. +48 −28 system/modules/isotope/providers/PasteProductButton.php
  208. +1,058 −0 system/modules/isotope/providers/ProductCallbacks.php
  209. +300 −0 system/modules/isotope/providers/ProductPriceFinder.php
  210. +13 −0 system/modules/isotope/templates/iso_checkout_order_info.html5
  211. +13 −0 system/modules/isotope/templates/iso_checkout_order_info.xhtml
  212. +2 −13 ...m/modules/isotope/templates/{iso_checkout_order_review.html5 → iso_checkout_order_products.html5}
  213. +2 −13 ...m/modules/isotope/templates/{iso_checkout_order_review.xhtml → iso_checkout_order_products.xhtml}
  214. +46 −3 system/modules/isotope/templates/iso_filter_default.html5
  215. +46 −1 system/modules/isotope/templates/iso_filter_default.xhtml
  216. +16 −0 system/modules/isotope/templates/iso_gallery_zoom.html5
  217. +18 −0 system/modules/isotope/templates/iso_gallery_zoom.xhtml
  218. +1 −1 system/modules/isotope/templates/iso_invoice.html5
  219. +6 −6 system/modules/isotope/templates/iso_invoice.xhtml
  220. +2 −1 system/modules/isotope/templates/iso_list_default.html5
  221. +2 −1 system/modules/isotope/templates/iso_list_default.xhtml
  222. +2 −1 system/modules/isotope/templates/iso_list_variants.html5
  223. +2 −1 system/modules/isotope/templates/iso_list_variants.xhtml
  224. +1 −1 system/modules/isotope/templates/iso_products_html.html5
  225. +1 −1 system/modules/isotope/templates/iso_products_html.xhtml
  226. +1 −1 system/modules/isotope/templates/iso_products_text.html5
  227. +1 −1 system/modules/isotope/templates/iso_products_text.xhtml
  228. +2 −1 system/modules/isotope/templates/iso_reader_default.html5
  229. +2 −1 system/modules/isotope/templates/iso_reader_default.xhtml
  230. +2 −2 system/modules/isotope/templates/mod_iso_addressbook.html5
  231. +6 −6 system/modules/isotope/templates/mod_iso_cart.html5
  232. +4 −4 system/modules/isotope/templates/mod_iso_cart.xhtml
  233. +13 −7 system/modules/isotope/templates/mod_iso_checkout.html5
  234. +10 −4 system/modules/isotope/templates/mod_iso_checkout.xhtml
  235. +2 −2 system/modules/isotope/templates/mod_iso_configswitcher.html5
  236. +23 −0 system/modules/isotope/templates/mod_iso_cumulativefilter.html5
  237. +23 −0 system/modules/isotope/templates/mod_iso_cumulativefilter.xhtml
  238. +12 −0 system/modules/isotope/templates/mod_iso_messages.html5
  239. +12 −0 system/modules/isotope/templates/mod_iso_messages.xhtml
  240. +3 −3 system/modules/isotope/templates/mod_iso_orderdetails.html5
  241. +1 −1 system/modules/isotope/templates/mod_iso_orderdetails.xhtml
  242. +8 −8 system/modules/isotope/templates/mod_iso_orderhistory.html5
  243. +6 −6 system/modules/isotope/templates/mod_iso_orderhistory.xhtml
  244. +11 −4 system/modules/isotope/templates/mod_iso_productlist.html5
  245. +9 −2 system/modules/isotope/templates/mod_iso_productlist.xhtml
  246. +4 −2 system/modules/isotope/templates/mod_iso_productreader.html5
  247. +2 −0 system/modules/isotope/templates/mod_iso_productreader.xhtml
  248. +5 −1 system/modules/isotope_multilingual/IsotopeTranslation.php
  249. +1 −1 system/modules/isotope_multilingual/languages/en/modules.php
  250. +14 −4 system/modules/isotope_multilingual/languages/fr/default.php
  251. +13 −3 system/modules/isotope_multilingual/languages/fr/modules.php
  252. +28 −14 system/modules/isotope_multilingual/languages/fr/tl_iso_labels.php
  253. +11 −6 system/modules/isotope_rules/IsotopeRules.php
  254. +5 −3 system/modules/isotope_rules/config/database.sql
  255. +48 −30 system/modules/isotope_rules/dca/tl_iso_rules.php
  256. +1 −0 system/modules/isotope_rules/languages/de/modules.php
  257. +8 −4 system/modules/isotope_rules/languages/de/tl_iso_rules.php
  258. +9 −7 system/modules/isotope_rules/languages/en/tl_iso_rules.php
  259. +44 −0 system/modules/isotope_rules/languages/fr/default.php
  260. +39 −0 system/modules/isotope_rules/languages/fr/modules.php
  261. +126 −0 system/modules/isotope_rules/languages/fr/tl_iso_rules.php
Oops, something went wrong.
@@ -71,7 +71,7 @@ public function showAll()
}
// Custom filter
- if (is_array($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['filter']) && count($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['filter']))
+ if (is_array($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['filter']) && !empty($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['filter']))
{
foreach ($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['filter'] as $filter)
{
@@ -511,7 +511,7 @@ protected function reviseTable()
}
// Delete all new but incomplete records (tstamp=0)
- if (is_array($new_records[$this->strTable]) && count($new_records[$this->strTable]) > 0)
+ if (is_array($new_records[$this->strTable]) && !empty($new_records[$this->strTable]))
{
$objStmt = $this->Database->execute("DELETE FROM " . $this->strTable . " WHERE id IN(" . implode(',', array_map('intval', $new_records[$this->strTable])) . ") AND tstamp=0");
@@ -533,7 +533,7 @@ protected function reviseTable()
}
// Delete all records of the child table that are not related to the current table
- if (is_array($ctable) && count($ctable))
+ if (is_array($ctable) && !empty($ctable))
{
foreach ($ctable as $v)
{
@@ -570,7 +570,7 @@ protected function parentView()
$blnMultiboard = false;
// Check clipboard
- if (isset($arrClipboard[$table]) && count($arrClipboard[$table]))
+ if (isset($arrClipboard[$table]) && !empty($arrClipboard[$table]))
{
$blnClipboard = true;
$arrClipboard = $arrClipboard[$table];
@@ -748,17 +748,17 @@ protected function parentView()
$firstOrderBy = preg_replace('/\s+.*$/i', '', $orderBy[0]);
}
- if (count($this->procedure))
+ if (!empty($this->procedure))
{
$query .= " WHERE " . implode(' AND ', $this->procedure);
}
- if (is_array($this->root) && count($this->root) > 0)
+ if (is_array($this->root) && count($this->root) > 0) // Can't use empty() because its an object property (using __get)
{
$query .= (count($this->procedure) ? " AND " : " WHERE ") . "id IN(" . implode(',', array_map('intval', $this->root)) . ")";
}
- if (is_array($orderBy) && count($orderBy) > 0)
+ if (is_array($orderBy) && !empty($orderBy))
{
$query .= " ORDER BY " . implode(', ', $orderBy);
}
@@ -798,7 +798,7 @@ protected function parentView()
<ul id="ul_' . CURRENT_ID . '" class="sortable">';
}
- for ($i=0; $i<count($row); $i++)
+ for ($i=0, $count=count($row); $i<$count; $i++)
{
$this->current[] = $row[$i]['id'];
$imagePasteAfter = $this->generateImage('pasteafter.gif', sprintf($GLOBALS['TL_LANG'][$this->strTable]['pasteafter'][1], $row[$i]['id']), 'class="blink"');
@@ -966,7 +966,7 @@ protected function listView()
$query .= " WHERE " . implode(' AND ', $this->procedure);
}
- if (is_array($this->root) && count($this->root) > 0)
+ if (is_array($this->root) && count($this->root)) // Can't use empty() because its an object property (using __get)
{
$query .= (count($this->procedure) ? " AND " : " WHERE ") . "id IN(" . implode(',', array_map('intval', $this->root)) . ")";
}
@@ -1019,7 +1019,7 @@ protected function listView()
$this->bid = strlen($return) ? $this->bid : 'tl_buttons';
// Display buttos
- if (!$GLOBALS['TL_DCA'][$this->strTable]['config']['closed'] || count($GLOBALS['TL_DCA'][$this->strTable]['list']['global_operations']))
+ if (!$GLOBALS['TL_DCA'][$this->strTable]['config']['closed'] || !empty($GLOBALS['TL_DCA'][$this->strTable]['list']['global_operations']))
{
$return .= '
@@ -1264,7 +1264,7 @@ protected function listView()
*/
protected function generateButtons($arrRow, $strTable, $arrRootIds=array(), $blnCircularReference=false, $arrChildRecordIds=null, $strPrevious=null, $strNext=null)
{
- if (!count($GLOBALS['TL_DCA'][$strTable]['list']['operations']))
+ if (empty($GLOBALS['TL_DCA'][$strTable]['list']['operations']))
{
return '';
}
@@ -1307,11 +1307,11 @@ protected function generateButtons($arrRow, $strTable, $arrRootIds=array(), $bln
if ($dir == 'up')
{
- $return .= ((is_numeric($strPrevious) && (!in_array($arrRow['id'], $arrRootIds) || !count($GLOBALS['TL_DCA'][$strTable]['list']['sorting']['root']))) ? '<a href="'.$this->addToUrl($href.'&amp;id='.$arrRow['id']).'&amp;sid='.intval($strPrevious).'" title="'.specialchars($title).'"'.$attributes.'>'.$label.'</a> ' : $this->generateImage('up_.gif')).' ';
+ $return .= ((is_numeric($strPrevious) && (!in_array($arrRow['id'], $arrRootIds) || empty($GLOBALS['TL_DCA'][$strTable]['list']['sorting']['root']))) ? '<a href="'.$this->addToUrl($href.'&amp;id='.$arrRow['id']).'&amp;sid='.intval($strPrevious).'" title="'.specialchars($title).'"'.$attributes.'>'.$label.'</a> ' : $this->generateImage('up_.gif')).' ';
continue;
}
- $return .= ((is_numeric($strNext) && (!in_array($arrRow['id'], $arrRootIds) || !count($GLOBALS['TL_DCA'][$strTable]['list']['sorting']['root']))) ? '<a href="'.$this->addToUrl($href.'&amp;id='.$arrRow['id']).'&amp;sid='.intval($strNext).'" title="'.specialchars($title).'"'.$attributes.'>'.$label.'</a> ' : $this->generateImage('down_.gif')).' ';
+ $return .= ((is_numeric($strNext) && (!in_array($arrRow['id'], $arrRootIds) || empty($GLOBALS['TL_DCA'][$strTable]['list']['sorting']['root']))) ? '<a href="'.$this->addToUrl($href.'&amp;id='.$arrRow['id']).'&amp;sid='.intval($strNext).'" title="'.specialchars($title).'"'.$attributes.'>'.$label.'</a> ' : $this->generateImage('down_.gif')).' ';
}
}
@@ -129,7 +129,7 @@ public function generate()
$this->import('Database');
$this->objActiveRecord = $this->Database->prepare("SELECT * FROM " . $this->strTable . " WHERE id=?")->execute($this->currentRecord);
- $this->arrDisabledFields = $GLOBALS['ISO_PRODUCT'][$this->objActiveRecord->class]['disabledFields'];
+ $this->arrDisabledFields = (array) $GLOBALS['ISO_PRODUCT'][$this->objActiveRecord->class]['disabledFields'];
$this->arrOptions = $this->getOptions();
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/isotope/html/backend.js';
@@ -236,7 +236,7 @@ public function generate()
// Add a "no entries found" message if there are no options
- if (!count($arrOptions))
+ if (empty($arrOptions))
{
$arrOptions[]= '<p class="tl_noopt">'.$GLOBALS['TL_LANG']['MSC']['noResult'].'</p>';
$blnCheckAll = false;
@@ -322,7 +322,7 @@ protected function getOptions()
foreach ($arrDca as $field => $arrData)
{
- if (is_array($arrData['attributes']) && $arrData['attributes']['legend'] != '' && (!is_array($this->arrDisabledFields) || !in_array($field, $this->arrDisabledFields)))
+ if (is_array($arrData['attributes']) && $arrData['attributes']['legend'] != '' && !in_array($field, $this->arrDisabledFields))
{
// Variant options are not available
if ($this->variants && ($arrData['attributes']['variant_option'] || $arrData['attributes']['inherit']))
@@ -0,0 +1,189 @@
+Isotope eCommerce Changelog
+===========================
+
+Version 1.4.0 (2013-03-18)
+----------------------------
+
+### New
+- Standalone front end module to display Isotope messages (#101)
+- Added all missing german translations (#567)
+- Added option to prevent negative taxes (#536)
+- Added minimum product quantity support (through advanced prices)
+
+### Improved
+- Added short name for known "Krone" and "Franc" currencies
+- noFilter message in product list is now generated inside the productlist template (#530)
+- Automatically set payment date when order status is set to completed
+- `getAllowedProductIds` hook can now override "allow all" permissions
+- Added checkbox to hide filter option when there is just one option (#42)
+- Empty message is now rendered inside product list template (#543)
+- Add default order status when installing Isotope eCommerce (#558)
+- Do not generate options container if no frontend attributes are available (#533)
+- Base price label can now be translated
+- New order status can also be set for cash payment method (#571)
+
+### Fixed
+- Price was 0.00 if there is only one product variant
+- Access rightis on advanced price were not correctly handled
+- preOrderStatusUpdate and postOrderStatusUpdate were not triggered correctly
+- Labels for addresses were not shown in the order details (#538)
+- Do not show filter options of product variant if base product is disabled (#529)
+- Invoice PDF did not consider shop config template folder (#534)
+- Product translations were not correctly fetched in variants (#465)
+- Custom mediamanager widgets now work again (#555)
+- Default tax class was not applied for advanced prices (#553)
+- Default group was not created when groups existed (#554)
+- Allow users to create groups in the root node (#535)
+- Potential issue when generating sitemap XML file (#556)
+- Product search did not consider translated fields (#551)
+- Removed session storage for backend, it does not work :-(
+
+
+Version 1.4.rc2 (2013-01-22)
+----------------------------
+
+### New
+- Tax rates can now be applied to multiple countries
+- Added hook to check for product access permissions
+- Removed PaypalPayflowPro and Cybersource payment methods. They were not maintained anymore.
+- PayPal Standard payment now shows additional information in the order payment info
+
+### Improved
+- Better german translations
+- Payment module will send status email if configured
+- Added default value for base price label field
+- Show "filesOnly" attribute option only if "files" is checked (#481)
+- Added german translations for download attribute fields (#480)
+- Prevent access to other users' order when logged in (#126)
+- Load page object on postsale order checkout if necessary (#123)
+- Price tiers were not calculated through shop config (#431)
+- Can disable shipping address in shop config (#129)
+- Do not show filter options with just one option (#42)
+- Filtered options are now passed as pre-selections to the product reader (#42)
+- Do not filter products if everything is allowed (#125)
+- Added support for list->sorting->filter in DC_ProductData
+- Invoices are now created in the user's language (#524)
+
+### Fixed
+- Attributes were not translated in filters etc.
+- Payment modules did not correctly handle the auto_item parameter (#113)
+- ProductList-noFilter message is shown when keywords are used (#120)
+- Replace inserttags in order prefix when generating unique ID (#510)
+- Company and name was on same line in textual address representation (#127)
+- Labels for rule minimum subtotal fields (#491)
+- Exception when manually sorting products in the backend (#124)
+- The filter module did not work on the index page (#42)
+- Fixed missing parameter "$target" in watermarkImage hook (#67)
+- Fixed using $this in static method in IsotopeFrontend::loadPageConfig()
+- Media data was not correctly merged from fallback language (#465)
+
+
+Version 1.4.rc1 (2012-12-03)
+----------------------------
+
+### New
+- New attribute option to add date picker for frontend and backend
+- The Contao core breadcrumb module now tries to show the correct trail on a product reader page
+- You can now optionally set a default product type per product group
+- Added option to limit tax rate to guests/member groups (#65)
+- Added method to purge a product collection
+- Added support for the auto_item parameter (#74)
+- Can now upload multiple images and supports custom uploaders (#75)
+- Added VAT no field to addresses and store config (#100)
+- Download can be all files from a given folder
+- Use web storage to improve speed of the backend view
+
+### Improved
+- Do not cache or search-index a page if user-centered content (filters, cart, checkout) is on it
+- Changed navigation CSS class for active product from "trail" to "product" (#49)
+- Sorting label for dates now work better (#72)
+- Base prices are now calculated by amount and not a factor
+- Added CSV support and autofocus in DC_ProductData (#103)
+- Pass the product collection to cart, review and order history templates
+- Variant downloads are now inherited from parent product (#94)
+- Better performance for the backend product view
+
+### Fixed
+- Product was hidden if price was not an attribute
+- Tooltip was not available when product view was loaded with ajax in the backend
+- Caching bug when category scope was "article"
+- PayPal checkout threw an exception because of the IsotopeAddressModel
+- Variants were not editable for regular users (permission issue)
+- Default values for image sizes got lost in the MCW migration (#61)
+- Regular users could not add/edit product variants (#60)
+- Order id prefix was limited to 5 chars which made usage of insert tags impossible
+- Publishing toggle did not work in ajax mode (#77)
+- Value field for attribute restrictions in rules was not visible
+
+
+Version 1.4.beta2 (2012-09-24)
+------------------------------
+
+### New
+- Can now apply an autocompleter on the search field of a product filter module
+- Addresses are now formatted as hCard in the frontend
+- Can now list products of a page if it's article is included (e.g. using inserttag) (#3343)
+- Added permissions to product groups. You can no longer have products outside of a group.
+
+### Improved
+- Using MultiColumnWizard for attribute options
+- Hide "default" and "group" checkboxes for variant options
+- Added default address parameter to "addCustomAddress" hook (#2142)
+- New simple tokens ##id# and ##status_id## for order email (#3035)
+- Process input before generating attributes (#2639)
+
+### Fixed
+- Rules for cart subtotal was not correctly applied
+- Price tiers showed as "from" price even if not enabled
+- Fallback image was not rendered
+- Shipping module palette was broken due to Chosen selects
+- Added new order status fields to exclude list (#3366)
+- getOrderEmailData hook was not working correctly
+
+
+Version 1.4.beta1 (2012-08-24)
+------------------------------
+
+### New
+- Can now manage order status in the backend and notify on status changes
+- Added support for base price calculation
+- The backend now lists new orders on the welcome screen (#2111)
+- Option to show checkout conditions before products (german "checkout button" law)
+- Merged the zoom gallery into Isotope eCommerce core
+- Merged isotope_multilingual into Isotope eCommerce core
+- Added new attribute type "upload"
+- New filter module "Cumulative filter"
+- Ever product can now have a CSS class and ID (#2812)
+- Exempt all products of a certain type from shipping (#3148)
+- Can now filter for serialized data (e.g. checkboxes)
+- Rules can now be limited to subtotal in cart
+- Support for i18nl10n extension
+- Added support for the eval->path attribute (#3342)
+- Change page title to reflect current step in checkout module (#2085)
+- Added generateCollection hook (#27)
+- Added getOrderEmailData hook to add custom simple tokens to order emails
+- Added support for frontend-only attributes
+- Added generateProductList hook (#17)
+- Use multiColumnWizard for all appropriate fields (#2038)
+
+### Improved
+- Checkout steps are now a numbered list (#3040)
+- Product list can be sorted by dateAdded, this allows to list the newest products
+- More modular gallery class, also allows to retrieve the list of images (#3173)
+- Added getimagesize data to gallery template (#3173)
+- Added edit-header dropdown for mail templates (#3228)
+- Allow insert tags in order prefix (#3197)
+- Hide "related products" button if there are no categories (#3018)
+- Removed filter-by-node functionality, it's no longer useful (#2766)
+- No longer shows the "create new address" radio for billing address if no stored address is available
+- Insert tags can now be excepted from cache (#3098)
+- The payment and shipping order info is now a context menu
+- Include file extension when generating download attribute
+- generateProduct hook no longer requires template as return value
+- Replaced <section> tags with regular <div> tags.
+- Disabled forward/back buttons on click in checkout module to prevent a second submit (#3328)
+- Use "-" as value to add a variant option that should not be shown in the frontend
+- Added Contao 2.11 image crop modes to gallery size configuration
+
+### Fixed
+- The watermarkImage hook did not pass the image position
@@ -30,7 +30,7 @@
/**
* Class ContentIsotope
- *
+ *
* Provide methods to handle Isotope content elements.
* @copyright Isotope eCommerce Workgroup 2009-2012
* @author Andreas Schempp <andreas@schempp.ch>
Oops, something went wrong.

0 comments on commit 731035e

Please sign in to comment.