Skip to content
Browse files

No commit message

  • Loading branch information...
1 parent 1dd1a3a commit 8888f58a4665a84455db5696217755aa81288a02 Magento Core Team committed
Showing with 4,677 additions and 646 deletions.
  1. +10 −2 STATUS.txt
  2. +1 −1 app/Mage.php
  3. +13 −3 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
  4. +12 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
  5. +12 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php
  6. +5 −2 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
  7. +35 −0 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php
  8. +32 −3 app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
  9. +25 −68 app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
  10. +21 −62 app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
  11. +21 −57 app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
  12. +16 −0 app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
  13. +102 −3 app/code/core/Mage/Core/Helper/String.php
  14. +8 −7 app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php
  15. +20 −0 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
  16. +29 −76 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php
  17. +24 −63 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php
  18. +20 −59 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php
  19. +1 −1 app/code/core/Mage/Sales/etc/system.xml
  20. +0 −1 app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
  21. +282 −0 app/design/frontend/default/iphone/layout/bundle.xml
  22. +51 −1 app/design/frontend/default/iphone/layout/catalog.xml
  23. +98 −92 app/design/frontend/default/iphone/layout/catalogsearch.xml
  24. +25 −9 app/design/frontend/default/iphone/layout/checkout.xml
  25. +36 −0 app/design/frontend/default/iphone/layout/chronopay.xml
  26. +3 −0 app/design/frontend/default/iphone/layout/customer.xml
  27. +34 −0 app/design/frontend/default/iphone/layout/cybermut.xml
  28. +47 −0 app/design/frontend/default/iphone/layout/eway.xml
  29. +45 −0 app/design/frontend/default/iphone/layout/ideal.xml
  30. +35 −0 app/design/frontend/default/iphone/layout/oscommerce.xml
  31. +11 −11 app/design/frontend/default/iphone/layout/page.xml
  32. +50 −0 app/design/frontend/default/iphone/layout/paybox.xml
  33. +37 −0 app/design/frontend/default/iphone/layout/protx.xml
  34. +46 −0 app/design/frontend/default/iphone/template/bundle/catalog/product/list/partof.phtml
  35. +96 −0 app/design/frontend/default/iphone/template/bundle/catalog/product/price.phtml
  36. +47 −0 app/design/frontend/default/iphone/template/bundle/catalog/product/view/price.phtml
  37. +35 −0 app/design/frontend/default/iphone/template/bundle/catalog/product/view/tierprices.phtml
  38. +36 −0 app/design/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle.phtml
  39. +43 −0 ...gn/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle/option/checkbox.phtml
  40. +40 −0 ...esign/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle/option/multi.phtml
  41. +73 −0 ...esign/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle/option/radio.phtml
  42. +62 −0 ...sign/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle/option/select.phtml
  43. +39 −0 app/design/frontend/default/iphone/template/bundle/catalog/product/view/type/bundle/options.phtml
  44. +88 −0 app/design/frontend/default/iphone/template/bundle/email/order/items/creditmemo/default.phtml
  45. +89 −0 app/design/frontend/default/iphone/template/bundle/email/order/items/invoice/default.phtml
  46. +94 −0 app/design/frontend/default/iphone/template/bundle/email/order/items/order/default.phtml
  47. +86 −0 app/design/frontend/default/iphone/template/bundle/email/order/items/shipment/default.phtml
  48. +166 −0 app/design/frontend/default/iphone/template/bundle/sales/order/creditmemo/items/renderer.phtml
  49. +147 −0 app/design/frontend/default/iphone/template/bundle/sales/order/invoice/items/renderer.phtml
  50. +170 −0 app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml
  51. +104 −0 app/design/frontend/default/iphone/template/bundle/sales/order/shipment/items/renderer.phtml
  52. +32 −15 app/design/frontend/default/iphone/template/catalog/product/view.phtml
  53. +31 −0 app/design/frontend/default/iphone/template/catalog/product/view/addto.phtml
  54. +33 −0 app/design/frontend/default/iphone/template/catalog/product/view/addtocart.phtml
  55. +39 −0 app/design/frontend/default/iphone/template/catalog/product/view/attributes.phtml
  56. +29 −0 app/design/frontend/default/iphone/template/catalog/product/view/description.phtml
  57. +164 −0 app/design/frontend/default/iphone/template/catalog/product/view/options.phtml
  58. +31 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/type/date.phtml
  59. +2 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/type/default.phtml
  60. +33 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/type/file.phtml
  61. +31 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/type/select.phtml
  62. +33 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/type/text.phtml
  63. +30 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/wrapper.phtml
  64. +24 −0 app/design/frontend/default/iphone/template/catalog/product/view/options/wrapper/bottom.phtml
  65. +22 −0 app/design/frontend/default/iphone/template/catalog/product/view/price_clone.phtml
  66. +44 −0 app/design/frontend/default/iphone/template/catalog/product/view/tierprices.phtml
  67. +40 −0 app/design/frontend/default/iphone/template/catalog/product/view/type/options/configurable.phtml
  68. +37 −0 app/design/frontend/default/iphone/template/catalog/product/view/type/virtual.phtml
  69. +4 −4 app/design/frontend/default/iphone/template/catalogsearch/advanced/result.phtml
  70. +17 −14 app/design/frontend/default/iphone/template/catalogsearch/form.mini.phtml
  71. +4 −0 app/design/frontend/default/iphone/template/catalogsearch/result.phtml
  72. +18 −0 app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml
  73. +11 −6 app/design/frontend/default/iphone/template/checkout/onepage.phtml
  74. +7 −4 app/design/frontend/default/iphone/template/checkout/onepage/billing.phtml
  75. +0 −8 app/design/frontend/default/iphone/template/checkout/onepage/payment.phtml
  76. +3 −3 app/design/frontend/default/iphone/template/checkout/onepage/review.phtml
  77. +5 −4 app/design/frontend/default/iphone/template/checkout/onepage/review/info.phtml
  78. +21 −2 app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml
  79. +1 −2 app/design/frontend/default/iphone/template/checkout/onepage/review/totals.phtml
  80. +1 −2 app/design/frontend/default/iphone/template/checkout/onepage/shipping.phtml
  81. +15 −11 app/design/frontend/default/iphone/template/checkout/onepage/shipping_method.phtml
  82. +11 −1 app/design/frontend/default/iphone/template/checkout/onepage/shipping_method/available.phtml
  83. +83 −0 app/design/frontend/default/iphone/template/chronopay/form.phtml
  84. +29 −0 app/design/frontend/default/iphone/template/chronopay/info.phtml
  85. +24 −0 app/design/frontend/default/iphone/template/chronopay/standard/failure.phtml
  86. +28 −0 app/design/frontend/default/iphone/template/chronopay/standard/form.phtml
  87. +24 −0 app/design/frontend/default/iphone/template/cybermut/error.phtml
  88. +28 −0 app/design/frontend/default/iphone/template/cybermut/form.phtml
  89. +158 −0 app/design/frontend/default/iphone/template/cybersource/form.phtml
  90. +33 −0 app/design/frontend/default/iphone/template/cybersource/info.phtml
  91. +84 −0 app/design/frontend/default/iphone/template/eway/form.phtml
  92. +28 −0 app/design/frontend/default/iphone/template/eway/info.phtml
  93. +25 −0 app/design/frontend/default/iphone/template/eway/secure/failure.phtml
  94. +28 −0 app/design/frontend/default/iphone/template/eway/secure/form.phtml
  95. +25 −0 app/design/frontend/default/iphone/template/eway/shared/failure.phtml
  96. +28 −0 app/design/frontend/default/iphone/template/eway/shared/form.phtml
  97. +83 −0 app/design/frontend/default/iphone/template/flo2cash/form.phtml
  98. +29 −0 app/design/frontend/default/iphone/template/flo2cash/info.phtml
  99. +25 −0 app/design/frontend/default/iphone/template/ideal/advanced/failure.phtml
  100. +38 −0 app/design/frontend/default/iphone/template/ideal/advanced/form.phtml
  101. +27 −0 app/design/frontend/default/iphone/template/ideal/advanced/info.phtml
  102. +25 −0 app/design/frontend/default/iphone/template/ideal/basic/failure.phtml
  103. +28 −0 app/design/frontend/default/iphone/template/ideal/basic/form.phtml
  104. +30 −0 app/design/frontend/default/iphone/template/oscommerce/order/list.phtml
  105. +133 −0 app/design/frontend/default/iphone/template/oscommerce/order/view.phtml
  106. +3 −3 app/design/frontend/default/iphone/template/page/html/header.phtml
  107. +84 −0 app/design/frontend/default/iphone/template/paybox/direct/form.phtml
  108. +29 −0 app/design/frontend/default/iphone/template/paybox/direct/info.phtml
  109. +25 −0 app/design/frontend/default/iphone/template/paybox/system/error.phtml
  110. +28 −0 app/design/frontend/default/iphone/template/paybox/system/form.phtml
  111. +25 −0 app/design/frontend/default/iphone/template/protx/standard/failure.phtml
  112. +28 −0 app/design/frontend/default/iphone/template/protx/standard/form.phtml
  113. +1 −1 app/design/frontend/default/iphone/template/wishlist/view.phtml
  114. +3 −3 index.php
  115. +5 −1 index.php.sample
  116. BIN lib/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf
  117. BIN lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf
  118. +0 −34 php.ini
  119. +5 −0 php.ini.sample
  120. +3 −3 skin/adminhtml/default/default/boxes.css
  121. BIN skin/adminhtml/default/default/images/fam/accept.png
  122. BIN skin/adminhtml/default/default/images/fam/add.png
  123. BIN skin/adminhtml/default/default/images/fam/anchor.png
  124. BIN skin/adminhtml/default/default/images/fam/application.png
  125. BIN skin/adminhtml/default/default/images/fam/application_add.png
  126. BIN skin/adminhtml/default/default/images/fam/application_cascade.png
  127. BIN skin/adminhtml/default/default/images/fam/application_delete.png
  128. BIN skin/adminhtml/default/default/images/fam/application_double.png
  129. BIN skin/adminhtml/default/default/images/fam/application_edit.png
  130. BIN skin/adminhtml/default/default/images/fam/application_error.png
  131. BIN skin/adminhtml/default/default/images/fam/application_form.png
  132. BIN skin/adminhtml/default/default/images/fam/application_form_add.png
  133. BIN skin/adminhtml/default/default/images/fam/application_form_delete.png
  134. BIN skin/adminhtml/default/default/images/fam/application_form_edit.png
  135. BIN skin/adminhtml/default/default/images/fam/application_form_magnify.png
  136. BIN skin/adminhtml/default/default/images/fam/application_get.png
  137. BIN skin/adminhtml/default/default/images/fam/application_go.png
  138. BIN skin/adminhtml/default/default/images/fam/application_home.png
  139. BIN skin/adminhtml/default/default/images/fam/application_key.png
  140. BIN skin/adminhtml/default/default/images/fam/application_lightning.png
  141. BIN skin/adminhtml/default/default/images/fam/application_link.png
  142. BIN skin/adminhtml/default/default/images/fam/application_osx.png
  143. BIN skin/adminhtml/default/default/images/fam/application_osx_terminal.png
  144. BIN skin/adminhtml/default/default/images/fam/application_put.png
  145. BIN skin/adminhtml/default/default/images/fam/application_side_boxes.png
  146. BIN skin/adminhtml/default/default/images/fam/application_side_contract.png
  147. BIN skin/adminhtml/default/default/images/fam/application_side_expand.png
  148. BIN skin/adminhtml/default/default/images/fam/application_side_list.png
  149. BIN skin/adminhtml/default/default/images/fam/application_side_tree.png
  150. BIN skin/adminhtml/default/default/images/fam/application_split.png
  151. BIN skin/adminhtml/default/default/images/fam/application_tile_horizontal.png
  152. BIN skin/adminhtml/default/default/images/fam/application_tile_vertical.png
  153. BIN skin/adminhtml/default/default/images/fam/application_view_columns.png
  154. BIN skin/adminhtml/default/default/images/fam/application_view_detail.png
  155. BIN skin/adminhtml/default/default/images/fam/application_view_gallery.png
  156. BIN skin/adminhtml/default/default/images/fam/application_view_icons.png
  157. BIN skin/adminhtml/default/default/images/fam/application_view_list.png
  158. BIN skin/adminhtml/default/default/images/fam/application_view_tile.png
  159. BIN skin/adminhtml/default/default/images/fam/application_xp.png
  160. BIN skin/adminhtml/default/default/images/fam/application_xp_terminal.png
  161. BIN skin/adminhtml/default/default/images/fam/arrow_branch.png
  162. BIN skin/adminhtml/default/default/images/fam/arrow_divide.png
  163. BIN skin/adminhtml/default/default/images/fam/arrow_down.png
  164. BIN skin/adminhtml/default/default/images/fam/arrow_in.png
  165. BIN skin/adminhtml/default/default/images/fam/arrow_inout.png
  166. BIN skin/adminhtml/default/default/images/fam/arrow_join.png
  167. BIN skin/adminhtml/default/default/images/fam/arrow_left.png
  168. BIN skin/adminhtml/default/default/images/fam/arrow_merge.png
  169. BIN skin/adminhtml/default/default/images/fam/arrow_out.png
  170. BIN skin/adminhtml/default/default/images/fam/arrow_redo.png
  171. BIN skin/adminhtml/default/default/images/fam/arrow_refresh.png
  172. BIN skin/adminhtml/default/default/images/fam/arrow_refresh_small.png
  173. BIN skin/adminhtml/default/default/images/fam/arrow_right.png
  174. BIN skin/adminhtml/default/default/images/fam/arrow_rotate_anticlockwise.png
  175. BIN skin/adminhtml/default/default/images/fam/arrow_rotate_clockwise.png
  176. BIN skin/adminhtml/default/default/images/fam/arrow_switch.png
  177. BIN skin/adminhtml/default/default/images/fam/arrow_turn_left.png
  178. BIN skin/adminhtml/default/default/images/fam/arrow_turn_right.png
  179. BIN skin/adminhtml/default/default/images/fam/arrow_undo.png
  180. BIN skin/adminhtml/default/default/images/fam/arrow_up.png
  181. BIN skin/adminhtml/default/default/images/fam/asterisk_orange.png
  182. BIN skin/adminhtml/default/default/images/fam/asterisk_yellow.png
  183. BIN skin/adminhtml/default/default/images/fam/attach.png
  184. BIN skin/adminhtml/default/default/images/fam/award_star_add.png
  185. BIN skin/adminhtml/default/default/images/fam/award_star_bronze_1.png
  186. BIN skin/adminhtml/default/default/images/fam/award_star_bronze_2.png
  187. BIN skin/adminhtml/default/default/images/fam/award_star_bronze_3.png
  188. BIN skin/adminhtml/default/default/images/fam/award_star_delete.png
  189. BIN skin/adminhtml/default/default/images/fam/award_star_gold_1.png
  190. BIN skin/adminhtml/default/default/images/fam/award_star_gold_2.png
  191. BIN skin/adminhtml/default/default/images/fam/award_star_gold_3.png
  192. BIN skin/adminhtml/default/default/images/fam/award_star_silver_1.png
  193. BIN skin/adminhtml/default/default/images/fam/award_star_silver_2.png
  194. BIN skin/adminhtml/default/default/images/fam/award_star_silver_3.png
  195. BIN skin/adminhtml/default/default/images/fam/basket.png
  196. BIN skin/adminhtml/default/default/images/fam/basket_add.png
  197. BIN skin/adminhtml/default/default/images/fam/basket_delete.png
  198. BIN skin/adminhtml/default/default/images/fam/basket_edit.png
  199. BIN skin/adminhtml/default/default/images/fam/basket_error.png
  200. BIN skin/adminhtml/default/default/images/fam/basket_go.png
  201. BIN skin/adminhtml/default/default/images/fam/basket_put.png
  202. BIN skin/adminhtml/default/default/images/fam/basket_remove.png
  203. BIN skin/adminhtml/default/default/images/fam/bell.png
  204. BIN skin/adminhtml/default/default/images/fam/bell_add.png
  205. BIN skin/adminhtml/default/default/images/fam/bell_delete.png
  206. BIN skin/adminhtml/default/default/images/fam/bell_error.png
  207. BIN skin/adminhtml/default/default/images/fam/bell_go.png
  208. BIN skin/adminhtml/default/default/images/fam/bell_link.png
  209. BIN skin/adminhtml/default/default/images/fam/bin.png
  210. BIN skin/adminhtml/default/default/images/fam/bin_closed.png
  211. BIN skin/adminhtml/default/default/images/fam/bin_empty.png
  212. BIN skin/adminhtml/default/default/images/fam/bomb.png
  213. BIN skin/adminhtml/default/default/images/fam/book.png
  214. BIN skin/adminhtml/default/default/images/fam/book_add.png
  215. BIN skin/adminhtml/default/default/images/fam/book_addresses.png
  216. BIN skin/adminhtml/default/default/images/fam/book_delete.png
  217. BIN skin/adminhtml/default/default/images/fam/book_edit.png
  218. BIN skin/adminhtml/default/default/images/fam/book_error.png
  219. BIN skin/adminhtml/default/default/images/fam/book_go.png
  220. BIN skin/adminhtml/default/default/images/fam/book_key.png
  221. BIN skin/adminhtml/default/default/images/fam/book_link.png
  222. BIN skin/adminhtml/default/default/images/fam/book_next.png
  223. BIN skin/adminhtml/default/default/images/fam/book_open.png
  224. BIN skin/adminhtml/default/default/images/fam/book_previous.png
  225. BIN skin/adminhtml/default/default/images/fam/box.png
  226. BIN skin/adminhtml/default/default/images/fam/brick.png
  227. BIN skin/adminhtml/default/default/images/fam/brick_add.png
  228. BIN skin/adminhtml/default/default/images/fam/brick_delete.png
  229. BIN skin/adminhtml/default/default/images/fam/brick_edit.png
  230. BIN skin/adminhtml/default/default/images/fam/brick_error.png
  231. BIN skin/adminhtml/default/default/images/fam/brick_go.png
  232. BIN skin/adminhtml/default/default/images/fam/brick_link.png
  233. BIN skin/adminhtml/default/default/images/fam/bricks.png
  234. BIN skin/adminhtml/default/default/images/fam/briefcase.png
  235. BIN skin/adminhtml/default/default/images/fam/bug.png
  236. BIN skin/adminhtml/default/default/images/fam/bug_add.png
  237. BIN skin/adminhtml/default/default/images/fam/bug_delete.png
  238. BIN skin/adminhtml/default/default/images/fam/bug_edit.png
  239. BIN skin/adminhtml/default/default/images/fam/bug_error.png
  240. BIN skin/adminhtml/default/default/images/fam/bug_go.png
  241. BIN skin/adminhtml/default/default/images/fam/bug_link.png
  242. BIN skin/adminhtml/default/default/images/fam/building.png
  243. BIN skin/adminhtml/default/default/images/fam/building_add.png
  244. BIN skin/adminhtml/default/default/images/fam/building_delete.png
  245. BIN skin/adminhtml/default/default/images/fam/building_edit.png
  246. BIN skin/adminhtml/default/default/images/fam/building_error.png
  247. BIN skin/adminhtml/default/default/images/fam/building_go.png
  248. BIN skin/adminhtml/default/default/images/fam/building_key.png
  249. BIN skin/adminhtml/default/default/images/fam/building_link.png
  250. BIN skin/adminhtml/default/default/images/fam/bullet_add.png
  251. BIN skin/adminhtml/default/default/images/fam/bullet_arrow_bottom.png
  252. BIN skin/adminhtml/default/default/images/fam/bullet_arrow_down.png
  253. BIN skin/adminhtml/default/default/images/fam/bullet_arrow_top.png
  254. BIN skin/adminhtml/default/default/images/fam/bullet_arrow_up.png
  255. BIN skin/adminhtml/default/default/images/fam/bullet_black.png
  256. BIN skin/adminhtml/default/default/images/fam/bullet_blue.png
  257. BIN skin/adminhtml/default/default/images/fam/bullet_delete.png
  258. BIN skin/adminhtml/default/default/images/fam/bullet_disk.png
  259. BIN skin/adminhtml/default/default/images/fam/bullet_error.png
  260. BIN skin/adminhtml/default/default/images/fam/bullet_feed.png
  261. BIN skin/adminhtml/default/default/images/fam/bullet_go.png
  262. BIN skin/adminhtml/default/default/images/fam/bullet_green.png
  263. BIN skin/adminhtml/default/default/images/fam/bullet_key.png
  264. BIN skin/adminhtml/default/default/images/fam/bullet_orange.png
  265. BIN skin/adminhtml/default/default/images/fam/bullet_picture.png
  266. BIN skin/adminhtml/default/default/images/fam/bullet_pink.png
  267. BIN skin/adminhtml/default/default/images/fam/bullet_purple.png
  268. BIN skin/adminhtml/default/default/images/fam/bullet_red.png
  269. BIN skin/adminhtml/default/default/images/fam/bullet_star.png
  270. BIN skin/adminhtml/default/default/images/fam/bullet_toggle_minus.png
  271. BIN skin/adminhtml/default/default/images/fam/bullet_toggle_plus.png
  272. BIN skin/adminhtml/default/default/images/fam/bullet_white.png
  273. BIN skin/adminhtml/default/default/images/fam/bullet_wrench.png
  274. BIN skin/adminhtml/default/default/images/fam/bullet_yellow.png
  275. BIN skin/adminhtml/default/default/images/fam/cake.png
  276. BIN skin/adminhtml/default/default/images/fam/calculator.png
  277. BIN skin/adminhtml/default/default/images/fam/calculator_add.png
  278. BIN skin/adminhtml/default/default/images/fam/calculator_delete.png
  279. BIN skin/adminhtml/default/default/images/fam/calculator_edit.png
  280. BIN skin/adminhtml/default/default/images/fam/calculator_error.png
  281. BIN skin/adminhtml/default/default/images/fam/calculator_link.png
  282. BIN skin/adminhtml/default/default/images/fam/calendar.png
  283. BIN skin/adminhtml/default/default/images/fam/calendar_add.png
  284. BIN skin/adminhtml/default/default/images/fam/calendar_delete.png
  285. BIN skin/adminhtml/default/default/images/fam/calendar_edit.png
  286. BIN skin/adminhtml/default/default/images/fam/calendar_link.png
  287. BIN skin/adminhtml/default/default/images/fam/calendar_view_day.png
  288. BIN skin/adminhtml/default/default/images/fam/calendar_view_month.png
  289. BIN skin/adminhtml/default/default/images/fam/calendar_view_week.png
  290. BIN skin/adminhtml/default/default/images/fam/camera.png
  291. BIN skin/adminhtml/default/default/images/fam/camera_add.png
  292. BIN skin/adminhtml/default/default/images/fam/camera_delete.png
  293. BIN skin/adminhtml/default/default/images/fam/camera_edit.png
  294. BIN skin/adminhtml/default/default/images/fam/camera_error.png
  295. BIN skin/adminhtml/default/default/images/fam/camera_go.png
  296. BIN skin/adminhtml/default/default/images/fam/camera_link.png
  297. BIN skin/adminhtml/default/default/images/fam/camera_small.png
  298. BIN skin/adminhtml/default/default/images/fam/cancel.png
  299. BIN skin/adminhtml/default/default/images/fam/car.png
  300. BIN skin/adminhtml/default/default/images/fam/car_add.png
Sorry, we could not display the entire diff because too many files (1,131) changed.
View
12 STATUS.txt
@@ -190,6 +190,13 @@ FIXED BUGS:
Fixed updating tier prices with webservices API
Fixed google checkout xml tax section generation
Fixed deleting bundle options
+ Fixed configurable product weight calculation in shopping cart and checkout
+ Fixed displaying of pure virtual orders in admin
+ Fixed fatal error when Soap extension is not installed
+ Fixed wrong SOAP content type
+ Fixed errors in invoice/packingslip PDF print-out (added missing fonts, fixed overlapping columns and text wrapping, displaying of non-latin1 texts)
+ Fixed non-working store switcher
+
CHANGES:
@@ -259,8 +266,9 @@ CHANGES:
Added hiding long options on orders, invoices, etc on frontend
Set svn:ignore on downloader/pearlib/cache
Added N/A label in shipments for virtual products in bundle
- Changed to use tag names instead of ids in URLs
- Added iphone theme (in works)
+
+ iPhone theme updated for 1.1
+ Upgraded core/helper/string for binary-safe string operations
NOTES:
View
2 app/Mage.php
@@ -74,7 +74,7 @@
public static function getVersion()
{
- return '1.1.1';
+ return '1.1.2';
}
/**
View
16 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
@@ -104,11 +104,21 @@ public function getDefaultRecipient()
return '';
}
- if($this->getEntity()->getQuote()) {
- return $this->getEntity()->getQuote()->getShippingAddress()->getName();
+ if($this->getEntity()->getOrder()) {
+ if ($this->getEntity()->getOrder()->getShippingAddress()) {
+ return $this->getEntity()->getOrder()->getShippingAddress()->getName();
+ } else if ($this->getEntity()->getOrder()->getBillingAddress()) {
+ return $this->getEntity()->getOrder()->getBillingAddress()->getName();
+ }
}
- return $this->getEntity()->getShippingAddress()->getName();
+ if ($this->getEntity()->getShippingAddress()) {
+ return $this->getEntity()->getShippingAddress()->getName();
+ } else if ($this->getEntity()->getBillingAddress()) {
+ return $this->getEntity()->getBillingAddress()->getName();
+ }
+
+ return '';
}
/**
View
14 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
@@ -137,10 +137,20 @@ public function getDefaultRecipient()
}
if($this->getEntity()->getOrder()) {
- return $this->getEntity()->getOrder()->getShippingAddress()->getName();
+ if ($this->getEntity()->getOrder()->getShippingAddress()) {
+ return $this->getEntity()->getOrder()->getShippingAddress()->getName();
+ } else if ($this->getEntity()->getOrder()->getBillingAddress()) {
+ return $this->getEntity()->getOrder()->getBillingAddress()->getName();
+ }
}
- return $this->getEntity()->getShippingAddress()->getName();
+ if ($this->getEntity()->getShippingAddress()) {
+ return $this->getEntity()->getShippingAddress()->getName();
+ } else if ($this->getEntity()->getBillingAddress()) {
+ return $this->getEntity()->getBillingAddress()->getName();
+ }
+
+ return '';
}
/**
View
14 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php
@@ -69,10 +69,20 @@ public function getDefaultRecipient()
}
if($this->getItem()->getOrder()) {
- return $this->getItem()->getOrder()->getShippingAddress()->getName();
+ if ($this->getItem()->getOrder()->getShippingAddress()) {
+ return $this->getItem()->getOrder()->getShippingAddress()->getName();
+ } else if ($this->getItem()->getOrder()->getBillingAddress()) {
+ return $this->getItem()->getOrder()->getBillingAddress()->getName();
+ }
}
- return $this->getItem()->getShippingAddress()->getName();
+ if ($this->getItem()->getShippingAddress()) {
+ return $this->getItem()->getShippingAddress()->getName();
+ } else if ($this->getItem()->getBillingAddress()) {
+ return $this->getItem()->getBillingAddress()->getName();
+ }
+
+ return '';
}
/**
View
7 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
@@ -75,7 +75,7 @@ protected function _beforeSave()
$file['tmp_name'] = $_FILES['groups']['tmp_name'][$this->getGroupId()]['fields'][$this->getField()]['value'];
$file['name'] = $_FILES['groups']['name'][$this->getGroupId()]['fields'][$this->getField()]['value'];
$uploader = new Varien_File_Uploader($file);
- $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
+ $uploader->setAllowedExtensions($this->_getAllowedExtensions());
$uploader->setAllowRenameFiles(true);
$uploader->save($uploadDir);
} catch (Exception $e) {
@@ -133,5 +133,8 @@ protected function _appendScopeInfo($path)
return $path;
}
+ protected function _getAllowedExtensions()
+ {
+ return array('jpg', 'jpeg', 'gif', 'png');
+ }
}
-
View
35 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * @category Mage
+ * @package Mage_Adminhtml
+ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * System config image field backend model for Zend PDF generator
+ *
+ * @category Mage
+ * @package Mage_Adminhtml
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+class Mage_Adminhtml_Model_System_Config_Backend_Image_Pdf extends Mage_Adminhtml_Model_System_Config_Backend_Image
+{
+ protected function _getAllowedExtensions()
+ {
+ return array('tif', 'tiff', 'png', 'jpg', 'jpe', 'jpeg');
+ }
+}
View
35 app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
@@ -107,11 +107,16 @@ public function run()
->setHeader('Content-Type','text/xml')
->setBody($template->filter($wsdlContent));
- } else {
+ } elseif ($this->_extensionLoaded()) {
$this->_soap = new SoapServer(Mage::getUrl('*/*/*', array('wsdl'=>1)));
use_soap_error_handler(false);
$this->_soap->setClass($this->getHandler());
- $this->_soap->handle();
+ $this->getController()->getResponse()
+ ->setHeader('Content-Type', 'text/xml')
+ ->setBody($this->_soap->handle());
+
+ } else {
+ $this->fault('0', 'Unable to load Soap extension on the server');
}
return $this;
}
@@ -124,6 +129,30 @@ public function run()
*/
public function fault($code, $message)
{
- throw new SoapFault($code, $message);
+ if ($this->_extensionLoaded()) {
+ throw new SoapFault($code, $message);
+ } else {
+ die('<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+ <SOAP-ENV:Body>
+ <SOAP-ENV:Fault>
+ <faultcode>' . $code . '</faultcode>
+ <faultstring>' . $message . '</faultstring>
+ </SOAP-ENV:Fault>
+ </SOAP-ENV:Body>
+ </SOAP-ENV:Envelope>');
+ }
+
+ }
+
+ /**
+ * Check whether Soap extension is loaded
+ *
+ * @param none
+ * @return boolean
+ */
+ protected function _extensionLoaded ()
+ {
+ return class_exists('SoapServer');
}
+
} // Class Mage_Api_Model_Server_Adapter_Soap End
View
93 app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -36,22 +36,18 @@ public function draw()
$page = $this->getPage();
$items = $this->getChilds($item);
-
$_prevOptionId = '';
-
- $shift{0} = 0;
+ $shift = array(0, 0, 0);
foreach ($items as $_item) {
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
+ $this->_setFontRegular();
$attributes = $this->getSelectionAttributes($_item);
if ($_item->getOrderItem()->getParentItem()) {
if ($_prevOptionId != $attributes['option_id']) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
+ $this->_setfontItalic();
$page->drawText($attributes['option_label'], 60, $pdf->y, 'UTF-8');
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $this->_setFontRegular();
$_prevOptionId = $attributes['option_id'];
$pdf->y -= 10;
}
@@ -69,43 +65,22 @@ public function draw()
$feed = 60;
$name = $_item->getName();
}
- if (strlen($name) > 60) {
- $drawTextValue = explode(" ", $name);
- $drawTextParts = array();
- $i = 0;
- foreach ($drawTextValue as $drawTextPart) {
- if (!empty($drawTextParts{$i}) &&
- (strlen($drawTextParts{$i}) + strlen($drawTextPart)) < 60 ) {
- $drawTextParts{$i} .= ' '. $drawTextPart;
- } else {
- $i++;
- $drawTextParts{$i} = $drawTextPart;
- }
- }
- $shift{0} = 0;
- foreach ($drawTextParts as $drawTextPart) {
- $page->drawText($drawTextPart, $feed, $pdf->y-$shift{0}, 'UTF-8');
- $shift{0} += 10;
+ foreach (Mage::helper('core/string')->str_split($name, 60, true, true) as $key => $part) {
+ $page->drawText($part, $feed, $pdf->y-$shift[0], 'UTF-8');
+ if ($key > 0) {
+ $shift[0] += 10;
}
-
- } else {
- $page->drawText($name, $feed, $pdf->y, 'UTF-8');
}
- if (strlen($_item->getSku()) > 30) {
- $drawTextValue = str_split($_item->getSku(), 30);
- $shift{2} = 0;
- foreach ($drawTextValue as $drawTextPart) {
- $page->drawText($drawTextPart, 265, $pdf->y-$shift{2}, 'UTF-8');
- $shift{2} += 10;
+ $shift[2] = 0;
+ foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) {
+ $page->drawText($part, 265, $pdf->y-$shift[2], 'UTF-8');
+ if ($key > 0) {
+ $shift[2] += 10;
}
-
- } else {
- $page->drawText($_item->getSku(), 265, $pdf->y);
}
-
- $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
- $page->setFont($font, 7);
+ $font = $this->_setFontBold();
+ //$page->setFont($font);
if ($this->canShowPriceInfo($_item)) {
$page->drawText($order->formatPriceTxt($_item->getTaxAmount()), 380, $pdf->y, 'UTF-8');
@@ -121,41 +96,23 @@ public function draw()
}
if ($item->getOrderItem()->getProductOptions() || $item->getOrderItem()->getDescription()) {
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
- $shift{1} = 10;
+ $this->_setFontRegular();
+ $shift[1] = 10;
$options = $item->getOrderItem()->getProductOptions();
if (isset($options['options'])) {
foreach ($options['options'] as $option) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
-
- $optionTxt = strip_tags($option['label']);
- if (strlen($optionTxt) > 80) {
- $optionTxt = str_split($optionTxt, 80);
- foreach ($optionTxt as $_option) {
- $page->drawText($_option, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($optionTxt, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ $this->_setFontItalic();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) {
+ $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
+ $this->_setFontRegular();
if ($option['value']) {
$values = explode(', ', strip_tags($option['value']));
foreach ($values as $value) {
- if (strlen($value) > 80) {
- $value = str_split($value, 80);
- foreach ($value as $_value) {
- $page->drawText($_value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ foreach (Mage::helper('core/string')->str_split($value, 50,true,true) as $_value) {
+ $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
}
}
View
83 app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -35,21 +35,21 @@ public function draw()
$pdf = $this->getPdf();
$page = $this->getPage();
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
+ $this->_setFontRegular();
$items = $this->getChilds($item);
$_prevOptionId = '';
foreach ($items as $_item) {
+ $shift = array(0, 0, 0);
$attributes = $this->getSelectionAttributes($_item);
if ($_item->getOrderItem()->getParentItem()) {
if ($_prevOptionId != $attributes['option_id']) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
+ $this->_setFontItalic();
$page->drawText($attributes['option_label'], 60, $pdf->y, 'UTF-8');
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $this->_setFontRegular();
$_prevOptionId = $attributes['option_id'];
$pdf->y -= 10;
}
@@ -67,48 +67,23 @@ public function draw()
$feed = 60;
$name = $_item->getName();
}
- if (strlen($name) > 80) {
- $drawTextValue = explode(" ", $name);
- $drawTextParts = array();
- $i = 0;
-
- foreach ($drawTextValue as $drawTextPart) {
- if (!empty($drawTextParts{$i}) &&
- (strlen($drawTextParts{$i}) + strlen($drawTextPart)) < 80 ) {
- $drawTextParts{$i} .= ' '. $drawTextPart;
- } else {
- $i++;
- $drawTextParts{$i} = $drawTextPart;
- }
- }
-
- $shift{0} = 0;
- foreach ($drawTextParts as $drawTextPart) {
- $page->drawText($drawTextPart, $feed, $pdf->y-$shift{0}, 'UTF-8');
- $shift{0} += 10;
+ foreach (Mage::helper('core/string')->str_split($name, 60, true, true) as $key => $part) {
+ $page->drawText($part, $feed, $pdf->y-$shift[0], 'UTF-8');
+ if ($key > 0) {
+ $shift[0] += 10;
}
-
- } else {
- $page->drawText($name, $feed, $pdf->y, 'UTF-8');
}
- $shift{1} = 0;
-
/* in case Product SKU is longer than 36 chars - it is written in a few lines */
- if (strlen($_item->getSku()) > 36) {
- $drawTextValue = str_split($_item->getSku(), 36);
- $shift{2} = 0;
- foreach ($drawTextValue as $drawTextPart) {
- $page->drawText($drawTextPart, 380, $pdf->y-$shift{2}, 'UTF-8');
- $shift{2} += 10;
+ foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) {
+ $page->drawText($part, 380, $pdf->y-$shift[2], 'UTF-8');
+ if ($key > 0) {
+ $shift[2] += 10;
}
-
- } else {
- $page->drawText($_item->getSku(), 380, $pdf->y, 'UTF-8');
}
if ($this->canShowPriceInfo($_item)) {
- $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
+ $font = $this->_setFontBold();
$row_total = $order->formatPriceTxt($_item->getRowTotal());
$page->drawText($row_total, 565-$pdf->widthForStringUsingFontSize($row_total, $font, 7), $pdf->y, 'UTF-8');
@@ -122,34 +97,18 @@ public function draw()
$options = $item->getOrderItem()->getProductOptions();
if (isset($options['options'])) {
foreach ($options['options'] as $option) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
-
- $optionTxt = strip_tags($option['label']);
- if (strlen($optionTxt) > 80) {
- $optionTxt = str_split($optionTxt, 80);
- foreach ($optionTxt as $_option) {
- $page->drawText($_option, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($optionTxt, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ $this->_setFontItalic();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) {
+ $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
+ $this->_setFontRegular();
if ($option['value']) {
$values = explode(', ', strip_tags($option['value']));
foreach ($values as $value) {
- if (strlen($value) > 80) {
- $value = str_split($value, 80);
- foreach ($value as $_value) {
- $page->drawText($_value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ foreach (Mage::helper('core/string')->str_split($value, 70,true,true) as $_value) {
+ $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
}
}
View
78 app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -35,7 +35,7 @@ public function draw()
$pdf = $this->getPdf();
$page = $this->getPage();
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $this->_setFontRegular();
$shipItems = $this->getChilds($item);
$items = array_merge(array($item->getOrderItem()), $item->getOrderItem()->getChildrenItems());
@@ -43,14 +43,15 @@ public function draw()
$_prevOptionId = '';
foreach ($items as $_item) {
+ $shift = array(0, 10, 0);
$attributes = $this->getSelectionAttributes($_item);
if ($_item->getParentItem()) {
if ($_prevOptionId != $attributes['option_id']) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
+ $this->_setFontItalic();
$page->drawText($attributes['option_label'], 60, $pdf->y, 'UTF-8');
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $this->_setFontRegular();
$_prevOptionId = $attributes['option_id'];
$pdf->y -= 10;
}
@@ -77,79 +78,42 @@ public function draw()
$feed = 60;
$name = $_item->getName();
}
- if (strlen($name) > 80) {
- $drawTextValue = explode(" ", $name);
- $drawTextParts = array();
- $i = 0;
- foreach ($drawTextValue as $drawTextPart) {
- if (!empty($drawTextParts{$i}) &&
- (strlen($drawTextParts{$i}) + strlen($drawTextPart)) < 80 ) {
- $drawTextParts{$i} .= ' '. $drawTextPart;
- } else {
- $i++;
- $drawTextParts{$i} = $drawTextPart;
- }
- }
- $shift{0} = 0;
- foreach ($drawTextParts as $drawTextPart) {
- $page->drawText($drawTextPart, $feed, $pdf->y-$shift{0}, 'UTF-8');
- $shift{0} += 10;
+ foreach (Mage::helper('core/string')->str_split($name, 60, true, true) as $key => $part) {
+ $page->drawText($part, $feed, $pdf->y-$shift[0], 'UTF-8');
+ if ($key > 0) {
+ $shift[0] += 10;
}
-
- } else {
- $page->drawText($name, $feed, $pdf->y, 'UTF-8');
}
- $shift{1} = 10;
-
- if (strlen($_item->getSku()) > 36) {
- $drawTextValue = str_split($_item->getSku(), 36);
- $shift{2} = 0;
- foreach ($drawTextValue as $drawTextPart) {
- $page->drawText($drawTextPart, 440, $pdf->y-$shift{2}, 'UTF-8');
- $shift{2} += 10;
+ foreach (Mage::helper('core/string')->str_split($item->getSku(), 30) as $key => $part) {
+ $page->drawText($part, 440, $pdf->y-$shift[2], 'UTF-8');
+ if ($key > 0) {
+ $shift[2] += 10;
}
-
- } else {
- $page->drawText($_item->getSku(), 440, $pdf->y, 'UTF-8');
}
$pdf->y -=max($shift)+10;
}
if ($item->getOrderItem()->getProductOptions() || $item->getOrderItem()->getDescription()) {
- $shift{1} = 10;
+ $shift[1] = 10;
$options = $item->getOrderItem()->getProductOptions();
if (isset($options['options'])) {
foreach ($options['options'] as $option) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
-
- $optionTxt = strip_tags($option['label']);
- if (strlen($optionTxt) > 80) {
- $optionTxt = str_split($optionTxt, 80);
- foreach ($optionTxt as $_option) {
- $page->drawText($_option, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($optionTxt, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ $this->_setFontItalic();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) {
+ $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $this->_setFontRegular();
if ($option['value']) {
$values = explode(', ', strip_tags($option['value']));
foreach ($values as $value) {
- if (strlen($value) > 80) {
- $value = str_split($value, 80);
- foreach ($value as $_value) {
- $page->drawText($_value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ foreach (Mage::helper('core/string')->str_split($value, 70,true,true) as $_value) {
+ $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
}
}
View
16 app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -452,4 +452,20 @@ public function hasOptions()
return false;
}
+
+ /**
+ * Return product weight based on simple product
+ * weight or configurable product weight
+ *
+ * @return decimal
+ */
+ public function getWeight()
+ {
+ if ($this->getProduct()->hasCustomOptions() && ($simpleProductOption = $this->getProduct()->getCustomOption('simple_product'))) {
+ $simpleProduct = $simpleProductOption->getProduct();
+ return $simpleProduct->getWeight();
+ } else {
+ return $this->getProduct()->getData('weight');
+ }
+ }
}
View
105 app/code/core/Mage/Core/Helper/String.php
@@ -102,13 +102,13 @@ public function substr($str, $offset, $length = null)
*/
public function splitInjection($str, $length = 50, $needle = '-', $insert = ' ')
{
- $str = str_split($str, $length);
+ $str = $this->str_split($str, $length);
$newStr = '';
foreach ($str as $part) {
if ($this->strlen($part) >= $length) {
- $lastDelimetr = strpos(strrev($part), $needle);
+ $lastDelimetr = iconv_strpos(strrev($part), $needle, null, self::ICONV_CHARSET);
$tmpNewStr = '';
- $tmpNewStr = $this->substr(strrev($part), 0, $lastDelimetr).$insert.substr(strrev($part), $lastDelimetr);
+ $tmpNewStr = $this->substr(strrev($part), 0, $lastDelimetr) . $insert . $this->substr(strrev($part), $lastDelimetr);
$newStr .= strrev($tmpNewStr);
} else {
$newStr .= $part;
@@ -116,4 +116,103 @@ public function splitInjection($str, $length = 50, $needle = '-', $insert = ' ')
}
return $newStr;
}
+
+ /**
+ * Binary-safe strrev()
+ *
+ * @param string $str
+ * @return string
+ */
+ public function strrev($str)
+ {
+ $result = '';
+ $strlen = $this->strlen($str);
+ if (!$strlen) {
+ return $result;
+ }
+ for ($i = $strlen-1; $i >= 0; $i--) {
+ $result .= iconv_substr($str, $i, 1, self::ICONV_CHARSET);
+ }
+ return $result;
+ }
+
+ /**
+ * Binary-safe variant of str_split()
+ * + option not to break words
+ * + option to trim spaces (between each word)
+ *
+ * @param string $str
+ * @param int $length
+ * @param bool $keepWords
+ * @param bool $trim
+ * @return array
+ */
+ public function str_split($str, $length = 1, $keepWords = false, $trim = false)
+ {
+ $result = array();
+ $strlen = $this->strlen($str);
+ if ((!$strlen) || (!is_int($length)) || ($length <= 0)) {
+ return $result;
+ }
+ // trim
+ if ($trim) {
+ $str = trim(preg_replace('/\s{2,}/is', ' ', $str));
+ }
+ // do a usual str_split, but safe for our encoding
+ if ((!$keepWords) || ($length < 2)) {
+ for ($offset = 0; $offset < $strlen; $offset += $length) {
+ $result[] = iconv_substr($str, $offset, $length, self::ICONV_CHARSET);
+ }
+ }
+ // split smartly, keeping words
+ else {
+ $split = preg_split('/(\s+)/is', $str, null, PREG_SPLIT_DELIM_CAPTURE);
+ $i = 0;
+ $space = '';
+ $spaceLen = 0;
+ foreach ($split as $key => $part) {
+ if ($trim) {
+ // ignore spaces (even keys)
+ if ($key % 2) {
+ continue;
+ }
+ $space = ' ';
+ $spaceLen = 1;
+ }
+ if (empty($result[$i])) {
+ $currentLength = 0;
+ $result[$i] = '';
+ $space = '';
+ $spaceLen = 0;
+ }
+ else {
+ $currentLength = iconv_strlen($result[$i], self::ICONV_CHARSET);
+ }
+ $partLength = iconv_strlen($part, self::ICONV_CHARSET);
+ // add part to current last element
+ if (($currentLength + $spaceLen + $partLength) <= $length) {
+ $result[$i] .= $space . $part;
+ }
+ // add part to new element
+ elseif ($partLength <= $length) {
+ $i++;
+ $result[$i] = $part;
+ }
+ // break too long part recursively
+ else {
+ foreach ($this->str_split($part, $length, false, $trim) as $subpart) {
+ $i++;
+ $result[$i] = $subpart;
+ }
+ }
+ }
+ }
+ // remove last element, if empty
+ if ($count = count($result)) {
+ if (empty($result[$count - 1])) {
+ unset($result[$count - 1]);
+ }
+ }
+ return $result;
+ }
}
View
15 app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php
@@ -83,9 +83,9 @@ protected function _afterLoad()
* Assign parent items
*/
foreach ($this as $item) {
- if ($item->getParentItemId()) {
- $item->setParentItem($this->getItemById($item->getParentItemId()));
- }
+ if ($item->getParentItemId()) {
+ $item->setParentItem($this->getItemById($item->getParentItemId()));
+ }
}
/**
@@ -144,15 +144,16 @@ protected function _assignProducts()
if ($product = $productCollection->getItemById($item->getProductId())) {
$product->setCustomOptions(array());
- $item->setProduct($product);
+
foreach ($item->getOptions() as $option) {
- if ($product = $productCollection->getItemById($option->getProductId())) {
- $option->setProduct($product);
+ if ($optionProduct = $productCollection->getItemById($option->getProductId())) {
+ $option->setProduct($optionProduct);
}
else {
- $option->setProduct($item->getProduct());
+ $option->setProduct($product);
}
}
+ $item->setProduct($product);
}
else {
$item->isDeleted(true);
View
20 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php
@@ -246,4 +246,24 @@ public function getItemOptions() {
return $result;
}
+ protected function _setFontRegular($size = 7)
+ {
+ $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertineC_Re-2.8.0.ttf');
+ $this->getPage()->setFont($font, $size);
+ return $font;
+ }
+
+ protected function _setFontBold($size = 7)
+ {
+ $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf');
+ $this->getPage()->setFont($font, $size);
+ return $font;
+ }
+
+ protected function _setFontItalic($size = 7)
+ {
+ $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir() . '/lib/LinLibertineFont/LinLibertine_It-2.8.2.ttf');
+ $this->getPage()->setFont($font, $size);
+ return $font;
+ }
}
View
105 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php
@@ -34,103 +34,56 @@ public function draw()
$item = $this->getItem();
$pdf = $this->getPdf();
$page = $this->getPage();
-
- $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir()."/lib/LinLibertineFont/LinLibertineC_Re-2.8.0.ttf");
- $page->setFont($font, 7);
- //$page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
- $page->drawText($item->getQty()*1, 35, $pdf->y, 'UTF-8');
+ $shift = array(0, 10, 0);
- if (strlen($item->getName()) > 60) {
- $drawTextValue = explode(" ", $item->getName());
- $drawTextParts = array();
- $i = 0;
- foreach ($drawTextValue as $drawTextPart) {
- if (!empty($drawTextParts{$i}) &&
- (strlen($drawTextParts{$i}) + strlen($drawTextPart)) < 60 ) {
- $drawTextParts{$i} .= ' '. $drawTextPart;
- } else {
- $i++;
- $drawTextParts{$i} = $drawTextPart;
- }
- }
- $shift{0} = 0;
- foreach ($drawTextParts as $drawTextPart) {
- $page->drawText($drawTextPart, 60, $pdf->y-$shift{0}, 'UTF-8');
- $shift{0} += 10;
- }
-
- } else {
- $page->drawText($item->getName(), 60, $pdf->y, 'UTF-8');
+ // draw quantity & name
+ $this->_setFontRegular();
+ $page->drawText($item->getQty()*1, 35, $pdf->y, 'UTF-8');
+ foreach (Mage::helper('core/string')->str_split($item->getName(), 60, true, true) as $key => $part) {
+ $page->drawText($part, 60, $pdf->y-$shift[0], 'UTF-8');
+ $shift[0] += 10;
}
- $shift{1} = 10;
+ // draw options
$options = $this->getItemOptions();
if (isset($options)) {
foreach ($options as $option) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
-
- $optionTxt = strip_tags($option['label']);
- if (strlen($optionTxt) > 80) {
- $optionTxt = str_split($optionTxt, 80);
- foreach ($optionTxt as $_option) {
- $page->drawText($_option, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($optionTxt, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ // draw options label
+ $this->_setFontItalic();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60, false, true) as $_option) {
+ $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
- if ($option['value']) {
- $values = explode(', ', strip_tags($option['value']));
- foreach ($values as $value) {
- if (strlen($value) > 80) {
- $value = str_split($value, 80);
- foreach ($value as $_value) {
- $page->drawText($_value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- }
+ // draw options value
+ $this->_setFontRegular();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['value']), 60, true, true) as $_value) {
+ $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
}
}
+ // draw product description
foreach ($this->_parseDescription() as $description){
$page->drawText(strip_tags($description), 65, $pdf->y-$shift{1}, 'UTF-8');
$shift{1} += 10;
}
- if (strlen($item->getSku()) > 30) {
- $drawTextValue = str_split($item->getSku(), 30);
- $shift{2} = 0;
- foreach ($drawTextValue as $drawTextPart) {
- $page->drawText($drawTextPart, 265, $pdf->y-$shift{2}, 'UTF-8');
- $shift{2} += 10;
- }
-
- } else {
- $page->drawText($item->getSku(), 265, $pdf->y);
+ // draw sku
+ foreach (Mage::helper('core/string')->str_split($item->getSku(), 25) as $key => $part) {
+ $page->drawText($part, 275, $pdf->y-$shift[2], 'UTF-8');
+ $shift[2] += 10;
}
-
- $font = Zend_Pdf_Font::fontWithPath(Mage::getRoot()."/verdana.ttf");
- $page->setFont($font, 7);
-
- #$font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
- #$page->setFont($font, 7);
+
+ // draw amounts
+ $font = $this->_setFontBold();
$page->drawText($order->formatPriceTxt($item->getTaxAmount()), 380, $pdf->y, 'UTF-8');
$page->drawText($order->formatPriceTxt(-$item->getDiscountAmount()), 430, $pdf->y, 'UTF-8');
$page->drawText($order->formatPriceTxt($item->getRowTotal()), 480, $pdf->y, 'UTF-8');
- $row_total = $order->formatPriceTxt($item->getRowTotal()+$item->getTaxAmount()-$item->getDiscountAmount());
-
- $page->drawText($row_total, 565-$pdf->widthForStringUsingFontSize($row_total, $font, 7), $pdf->y, 'UTF-8');
+ // draw total
+ $rowTotal = $order->formatPriceTxt($item->getRowTotal()+$item->getTaxAmount()-$item->getDiscountAmount());
+ $page->drawText($rowTotal, 565-$pdf->widthForStringUsingFontSize($rowTotal, $font, 7), $pdf->y, 'UTF-8');
$pdf->y -=max($shift)+10;
}
}
View
87 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php
@@ -34,71 +34,37 @@ public function draw()
$item = $this->getItem();
$pdf = $this->getPdf();
$page = $this->getPage();
-
- $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir()."/lib/LinLibertineFont/LinLibertineC_Re-2.8.0.ttf");
- $page->setFont($font, 7);
- //$page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $shift = array(0, 10, 0);
+
+ $this->_setFontRegular();
$page->drawText($item->getQty()*1, 35, $pdf->y, 'UTF-8');
/* in case Product name is longer than 80 chars - it is written in a few lines */
- if (strlen($item->getName()) > 80) {
- $drawTextValue = explode(" ", $item->getName());
- $drawTextParts = array();
- $i = 0;
-
- foreach ($drawTextValue as $drawTextPart) {
- if (!empty($drawTextParts{$i}) &&
- (strlen($drawTextParts{$i}) + strlen($drawTextPart)) < 80 ) {
- $drawTextParts{$i} .= ' '. $drawTextPart;
- } else {
- $i++;
- $drawTextParts{$i} = $drawTextPart;
- }
+ foreach (Mage::helper('core/string')->str_split($item->getName(), 60, true, true) as $key => $part) {
+ $page->drawText($part, 60, $pdf->y-$shift[0], 'UTF-8');
+ if ($key > 0) {
+ $shift[0] += 10;
}
-
- $shift{0} = 0;
- foreach ($drawTextParts as $drawTextPart) {
- $page->drawText($drawTextPart, 60, $pdf->y-$shift{0}, 'UTF-8');
- $shift{0} += 10;
- }
-
- } else {
- $page->drawText($item->getName(), 60, $pdf->y, 'UTF-8');
}
- $shift{1} = 10;
$options = $this->getItemOptions();
if (isset($options)) {
foreach ($options as $option) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
-
- $optionTxt = strip_tags($option['label']);
- if (strlen($optionTxt) > 80) {
- $optionTxt = str_split($optionTxt, 80);
- foreach ($optionTxt as $_option) {
- $page->drawText($_option, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($optionTxt, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ // draw options label
+ $this->_setFontItalic();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) {
+ $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
+ // draw options value
+ $this->_setFontRegular();
if ($option['value']) {
$values = explode(', ', strip_tags($option['value']));
foreach ($values as $value) {
- if (strlen($value) > 80) {
- $value = str_split($value, 80);
- foreach ($value as $_value) {
- $page->drawText($_value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ foreach (Mage::helper('core/string')->str_split($value, 60,true,true) as $_value) {
+ $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
}
}
@@ -106,24 +72,19 @@ public function draw()
}
foreach ($this->_parseDescription() as $description){
- $page->drawText(strip_tags($description), 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ $page->drawText(strip_tags($description), 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
/* in case Product SKU is longer than 36 chars - it is written in a few lines */
- if (strlen($item->getSku()) > 36) {
- $drawTextValue = str_split($item->getSku(), 36);
- $shift{2} = 0;
- foreach ($drawTextValue as $drawTextPart) {
- $page->drawText($drawTextPart, 380, $pdf->y-$shift{2}, 'UTF-8');
- $shift{2} += 10;
+ foreach (Mage::helper('core/string')->str_split($item->getSku(), 25) as $key => $part) {
+ $page->drawText($part, 380, $pdf->y-$shift[2], 'UTF-8');
+ if ($key > 0) {
+ $shift[2] += 10;
}
-
- } else {
- $page->drawText($item->getSku(), 380, $pdf->y, 'UTF-8');
}
- $font = Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_BOLD);
+ $font = $this->_setFontBold();
$row_total = $order->formatPriceTxt($item->getRowTotal());
$page->drawText($row_total, 565-$pdf->widthForStringUsingFontSize($row_total, $font, 7), $pdf->y, 'UTF-8');
View
79 app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php
@@ -34,69 +34,35 @@ public function draw()
$item = $this->getItem();
$pdf = $this->getPdf();
$page = $this->getPage();
-
- $font = Zend_Pdf_Font::fontWithPath(Mage::getBaseDir()."/lib/LinLibertineFont/LinLibertineC_Re-2.8.0.ttf");
- $page->setFont($font, 7);
-
- #$page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
+ $shift = array(0, 10, 0);
+ $this->_setFontRegular();
$page->drawText($item->getQty()*1, 35, $pdf->y, 'UTF-8');
- if (strlen($item->getName()) > 80) {
- $drawTextValue = explode(" ", $item->getName());
- $drawTextParts = array();
- $i = 0;
- foreach ($drawTextValue as $drawTextPart) {
- if (!empty($drawTextParts{$i}) &&
- (strlen($drawTextParts{$i}) + strlen($drawTextPart)) < 80 ) {
- $drawTextParts{$i} .= ' '. $drawTextPart;
- } else {
- $i++;
- $drawTextParts{$i} = $drawTextPart;
- }
- }
- $shift{0} = 0;
- foreach ($drawTextParts as $drawTextPart) {
- $page->drawText($drawTextPart, 60, $pdf->y-$shift{0}, 'UTF-8');
- $shift{0} += 10;
+ foreach (Mage::helper('core/string')->str_split($item->getName(), 60, true, true) as $key => $part) {
+ $page->drawText($part, 60, $pdf->y-$shift[0], 'UTF-8');
+ if ($key > 0) {
+ $shift[0] += 10;
}
-
- } else {
- $page->drawText($item->getName(), 60, $pdf->y, 'UTF-8');
}
- $shift{1} = 10;
$options = $this->getItemOptions();
if (isset($options)) {
foreach ($options as $option) {
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA_ITALIC), 7);
-
- $optionTxt = strip_tags($option['label']);
- if (strlen($optionTxt) > 80) {
- $optionTxt = str_split($optionTxt, 80);
- foreach ($optionTxt as $_option) {
- $page->drawText($_option, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($optionTxt, 60, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ // draw options label
+ $this->_setFontItalic();
+ foreach (Mage::helper('core/string')->str_split(strip_tags($option['label']), 60,false,true) as $_option) {
+ $page->drawText($_option, 60, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
-
- $page->setFont(Zend_Pdf_Font::fontWithName(Zend_Pdf_Font::FONT_HELVETICA), 7);
-
+ // draw options value
+ $this->_setFontRegular();
if ($option['value']) {
$values = explode(', ', strip_tags($option['value']));
foreach ($values as $value) {
- if (strlen($value) > 80) {
- $value = str_split($value, 80);
- foreach ($value as $_value) {
- $page->drawText($_value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
- }
- } else {
- $page->drawText($value, 65, $pdf->y-$shift{1}, 'UTF-8');
- $shift{1} += 10;
+ foreach (Mage::helper('core/string')->str_split($value, 60,true,true) as $_value) {
+ $page->drawText($_value, 65, $pdf->y-$shift[1], 'UTF-8');
+ $shift[1] += 10;
}
}
}
@@ -108,16 +74,11 @@ public function draw()
$shift{1} += 10;
}
- if (strlen($item->getSku()) > 36) {
- $drawTextValue = str_split($item->getSku(), 36);
- $shift{2} = 0;
- foreach ($drawTextValue as $drawTextPart) {
- $page->drawText($drawTextPart, 440, $pdf->y-$shift{2}, 'UTF-8');
- $shift{2} += 10;
+ foreach (Mage::helper('core/string')->str_split($item->getSku(), 25) as $key => $part) {
+ $page->drawText($part, 440, $pdf->y-$shift[2], 'UTF-8');
+ if ($key > 0) {
+ $shift[2] += 10;
}
-
- } else {
- $page->drawText($item->getSku(), 440, $pdf->y, 'UTF-8');
}
$pdf->y -=max($shift)+10;
View
2 app/code/core/Mage/Sales/etc/system.xml
@@ -116,7 +116,7 @@
<logo translate="label">
<label>Logo (200x50)</label>
<frontend_type>image</frontend_type>
- <backend_model>adminhtml/system_config_backend_image</backend_model>
+ <backend_model>adminhtml/system_config_backend_image_pdf</backend_model>
<upload_dir config="system/filesystem/media" scope_info="1">sales/store/logo</upload_dir>
<base_url type="media" scope_info="1">sales/store/logo</base_url>
<sort_order>100</sort_order>
View
1 app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
@@ -36,7 +36,6 @@
<tr>
<td>
<select name="carrier" class="select" style="width:110px" onchange="selectCarrier(this)">
- <option value="&nbsp;"></option>
<?php foreach ($this->getCarriers() as $_code=>$_name): ?>
<option value="<?php echo $_code ?>"><?php echo $_name ?></option>
<?php endforeach; ?>
View
282 app/design/frontend/default/iphone/layout/bundle.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * @category design_default
+ * @package Mage_Bundle
+ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+-->
+<layout version="0.1.0">
+
+<!--
+Adding custom product price block
+-->
+
+ <catalog_category_default>
+ <reference name="product_list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </catalog_category_default>
+
+ <catalog_category_view>
+ <reference name="product_list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </catalog_category_view>
+
+ <catalog_category_layered>
+ <reference name="product_list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </catalog_category_layered>
+
+ <catalog_product_compare_index>
+ <reference name="catalog.compare.list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </catalog_product_compare_index>
+
+ <catalogsearch_result_index>
+ <reference name="search_result_list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </catalogsearch_result_index>
+
+ <catalogsearch_advanced_result>
+ <reference name="search_result_list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </catalogsearch_advanced_result>
+
+ <tag_product_list>
+ <reference name="search_result_list">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </tag_product_list>
+
+ <default>
+ <reference name="wishlist_sidebar">
+ <action method="addPriceBlockType"><type>bundle</type><block>bundle/catalog_product_price</block><template>bundle/catalog/product/price.phtml</template></action>
+ </reference>
+ </default>
+
+ <wishlist_index_index>