spree_core 3.0.10 → 3.1.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (289) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree.js.coffee.erb +12 -3
  3. data/app/helpers/spree/base_helper.rb +4 -1
  4. data/app/helpers/spree/products_helper.rb +37 -6
  5. data/app/mailers/spree/base_mailer.rb +11 -2
  6. data/app/models/concerns/spree/adjustment_source.rb +3 -10
  7. data/app/models/concerns/spree/default_price.rb +7 -1
  8. data/app/models/concerns/spree/named_type.rb +1 -1
  9. data/app/models/concerns/spree/user_api_authentication.rb +7 -1
  10. data/app/models/concerns/spree/user_methods.rb +47 -0
  11. data/app/models/concerns/spree/user_reporting.rb +2 -2
  12. data/app/models/concerns/spree/vat_price_calculation.rb +47 -0
  13. data/app/models/spree/address.rb +8 -7
  14. data/app/models/spree/adjustable/adjuster/base.rb +25 -0
  15. data/app/models/spree/adjustable/adjuster/promotion.rb +41 -0
  16. data/app/models/spree/adjustable/adjuster/tax.rb +26 -0
  17. data/app/models/spree/adjustable/adjustments_updater.rb +22 -45
  18. data/app/models/spree/adjustment.rb +8 -10
  19. data/app/models/spree/app_configuration.rb +5 -2
  20. data/app/models/spree/base.rb +4 -0
  21. data/app/models/spree/calculator.rb +0 -5
  22. data/app/models/spree/calculator/default_tax.rb +2 -10
  23. data/app/models/spree/classification.rb +7 -3
  24. data/app/models/spree/country.rb +14 -3
  25. data/app/models/spree/credit_card.rb +21 -31
  26. data/app/models/spree/customer_return.rb +7 -15
  27. data/app/models/spree/gateway.rb +7 -6
  28. data/app/models/spree/image.rb +1 -1
  29. data/app/models/spree/inventory_unit.rb +9 -6
  30. data/app/models/spree/legacy_user.rb +1 -6
  31. data/app/models/spree/line_item.rb +69 -68
  32. data/app/models/spree/log_entry.rb +1 -4
  33. data/app/models/spree/option_type.rb +15 -6
  34. data/app/models/spree/option_type_prototype.rb +9 -0
  35. data/app/models/spree/option_value.rb +11 -3
  36. data/app/models/spree/option_value_variant.rb +6 -0
  37. data/app/models/spree/order.rb +113 -64
  38. data/app/models/spree/order/checkout.rb +8 -11
  39. data/app/models/spree/order/currency_updater.rb +1 -1
  40. data/app/models/spree/order/store_credit.rb +96 -0
  41. data/app/models/spree/order_contents.rb +6 -1
  42. data/app/models/spree/order_inventory.rb +4 -8
  43. data/app/models/spree/order_promotion.rb +6 -0
  44. data/app/models/spree/order_updater.rb +2 -7
  45. data/app/models/spree/payment.rb +46 -19
  46. data/app/models/spree/payment/gateway_options.rb +8 -4
  47. data/app/models/spree/payment_method.rb +12 -13
  48. data/app/models/spree/payment_method/store_credit.rb +130 -0
  49. data/app/models/spree/preference.rb +1 -1
  50. data/app/models/spree/price.rb +16 -6
  51. data/app/models/spree/product.rb +52 -49
  52. data/app/models/spree/product/scopes.rb +7 -2
  53. data/app/models/spree/product_option_type.rb +7 -2
  54. data/app/models/spree/product_promotion_rule.rb +9 -0
  55. data/app/models/spree/product_property.rb +8 -10
  56. data/app/models/spree/promotion.rb +19 -19
  57. data/app/models/spree/promotion/rules/product.rb +3 -1
  58. data/app/models/spree/promotion/rules/taxon.rb +2 -1
  59. data/app/models/spree/promotion/rules/user.rb +4 -4
  60. data/app/models/spree/promotion_action.rb +3 -3
  61. data/app/models/spree/promotion_category.rb +1 -1
  62. data/app/models/spree/promotion_rule_taxon.rb +9 -0
  63. data/app/models/spree/promotion_rule_user.rb +9 -0
  64. data/app/models/spree/property.rb +2 -1
  65. data/app/models/spree/property_prototype.rb +9 -0
  66. data/app/models/spree/prototype.rb +8 -3
  67. data/app/models/spree/prototype_taxon.rb +9 -0
  68. data/app/models/spree/refund.rb +10 -7
  69. data/app/models/spree/refund_reason.rb +1 -1
  70. data/app/models/spree/reimbursement.rb +12 -16
  71. data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +23 -6
  72. data/app/models/spree/reimbursement_type/store_credit.rb +28 -0
  73. data/app/models/spree/return_authorization.rb +8 -13
  74. data/app/models/spree/return_authorization_reason.rb +1 -1
  75. data/app/models/spree/return_item.rb +13 -12
  76. data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +1 -1
  77. data/app/models/spree/role.rb +3 -2
  78. data/app/models/spree/role_user.rb +6 -0
  79. data/app/models/spree/shipment.rb +18 -23
  80. data/app/models/spree/shipment_handler.rb +2 -2
  81. data/app/models/spree/shipping_category.rb +6 -3
  82. data/app/models/spree/shipping_method.rb +11 -10
  83. data/app/models/spree/shipping_method_zone.rb +6 -0
  84. data/app/models/spree/shipping_rate.rb +16 -29
  85. data/app/models/spree/state.rb +3 -2
  86. data/app/models/spree/state_change.rb +1 -1
  87. data/app/models/spree/stock/content_item.rb +10 -12
  88. data/app/models/spree/stock/coordinator.rb +13 -14
  89. data/app/models/spree/stock/estimator.rb +28 -30
  90. data/app/models/spree/stock/inventory_unit_builder.rb +1 -9
  91. data/app/models/spree/stock/packer.rb +1 -1
  92. data/app/models/spree/stock/quantifier.rb +5 -5
  93. data/app/models/spree/stock/splitter/backordered.rb +2 -2
  94. data/app/models/spree/stock_item.rb +12 -18
  95. data/app/models/spree/stock_location.rb +4 -7
  96. data/app/models/spree/stock_movement.rb +11 -9
  97. data/app/models/spree/stock_transfer.rb +11 -12
  98. data/app/models/spree/store.rb +14 -6
  99. data/app/models/spree/store_credit.rb +252 -0
  100. data/app/models/spree/store_credit_category.rb +22 -0
  101. data/app/models/spree/store_credit_event.rb +38 -0
  102. data/app/models/spree/store_credit_type.rb +6 -0
  103. data/app/models/spree/tax_category.rb +3 -8
  104. data/app/models/spree/tax_rate.rb +56 -122
  105. data/app/models/spree/taxon.rb +11 -5
  106. data/app/models/spree/tracker.rb +12 -1
  107. data/app/models/spree/validations/db_maximum_length_validator.rb +2 -1
  108. data/app/models/spree/variant.rb +82 -50
  109. data/app/models/spree/zone.rb +21 -17
  110. data/app/models/spree/zone_member.rb +6 -0
  111. data/app/validators/db_maximum_length_validator.rb +11 -0
  112. data/app/views/layouts/spree/base_mailer.html.erb +38 -781
  113. data/app/views/spree/order_mailer/_adjustment.html.erb +8 -0
  114. data/app/views/spree/order_mailer/_subtotal.html.erb +8 -0
  115. data/app/views/spree/order_mailer/_total.html.erb +8 -0
  116. data/app/views/spree/order_mailer/cancel_email.html.erb +13 -28
  117. data/app/views/spree/order_mailer/cancel_email.text.erb +1 -1
  118. data/app/views/spree/order_mailer/confirm_email.html.erb +49 -63
  119. data/app/views/spree/order_mailer/confirm_email.text.erb +1 -1
  120. data/app/views/spree/shared/_base_mailer_header.html.erb +5 -7
  121. data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +777 -0
  122. data/app/views/spree/shared/_error_messages.html.erb +1 -1
  123. data/app/views/spree/shared/_mailer_line_item.html.erb +12 -0
  124. data/app/views/spree/shipment_mailer/shipped_email.html.erb +21 -14
  125. data/app/views/spree/shipment_mailer/shipped_email.text.erb +3 -3
  126. data/config/initializers/user_class_extensions.rb +7 -38
  127. data/config/locales/en.yml +113 -13
  128. data/config/routes.rb +7 -0
  129. data/db/default/spree/default_reimbursement_type.rb +1 -1
  130. data/db/default/spree/zones.rb +4 -5
  131. data/db/migrate/20150118210639_create_spree_store_credits.rb +24 -0
  132. data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +8 -0
  133. data/db/migrate/20150118212051_create_spree_store_credit_events.rb +17 -0
  134. data/db/migrate/20150118212101_create_spree_store_credit_types.rb +10 -0
  135. data/db/migrate/20150314013438_add_missing_indexes.rb +25 -0
  136. data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb +18 -0
  137. data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb +14 -0
  138. data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb +5 -0
  139. data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb +19 -0
  140. data/db/migrate/20150627090949_migrate_payment_methods_display.rb +12 -0
  141. data/db/migrate/20150714154102_spree_payment_method_store_credits.rb +12 -0
  142. data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb +18 -0
  143. data/db/migrate/20150727191614_spree_store_credit_types.rb +11 -0
  144. data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb +68 -0
  145. data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb +13 -0
  146. data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb +16 -0
  147. data/db/migrate/20160219165458_add_indexes.rb +14 -0
  148. data/lib/generators/spree/dummy/templates/rails/database.yml +31 -24
  149. data/lib/generators/spree/dummy/templates/rails/test.rb +2 -1
  150. data/lib/spree/core.rb +16 -0
  151. data/lib/spree/core/controller_helpers/auth.rb +1 -1
  152. data/lib/spree/core/controller_helpers/common.rb +3 -3
  153. data/lib/spree/core/controller_helpers/order.rb +6 -5
  154. data/lib/spree/core/controller_helpers/search.rb +1 -1
  155. data/lib/spree/core/controller_helpers/store.rb +29 -0
  156. data/lib/spree/core/delegate_belongs_to.rb +2 -2
  157. data/lib/spree/core/engine.rb +30 -25
  158. data/lib/spree/core/environment.rb +1 -1
  159. data/lib/spree/core/importer/order.rb +37 -40
  160. data/lib/spree/core/number_generator.rb +52 -0
  161. data/lib/spree/core/product_filters.rb +1 -1
  162. data/lib/spree/core/search/base.rb +4 -3
  163. data/lib/spree/core/version.rb +1 -1
  164. data/lib/spree/localized_number.rb +3 -1
  165. data/lib/spree/permitted_attributes.rb +5 -2
  166. data/lib/spree/testing_support/common_rake.rb +3 -3
  167. data/lib/spree/testing_support/factories.rb +3 -3
  168. data/lib/spree/testing_support/factories/address_factory.rb +1 -1
  169. data/lib/spree/testing_support/factories/country_factory.rb +2 -2
  170. data/lib/spree/testing_support/factories/order_factory.rb +2 -2
  171. data/lib/spree/testing_support/factories/payment_factory.rb +5 -0
  172. data/lib/spree/testing_support/factories/payment_method_factory.rb +8 -0
  173. data/lib/spree/testing_support/factories/promotion_rule_factory.rb +5 -0
  174. data/lib/spree/testing_support/factories/refund_factory.rb +9 -1
  175. data/lib/spree/testing_support/factories/return_authorization_factory.rb +2 -0
  176. data/lib/spree/testing_support/factories/state_factory.rb +2 -2
  177. data/lib/spree/testing_support/factories/store_credit_category_factory.rb +9 -0
  178. data/lib/spree/testing_support/factories/store_credit_event_factory.rb +8 -0
  179. data/lib/spree/testing_support/factories/store_credit_factory.rb +17 -0
  180. data/lib/spree/testing_support/factories/store_credit_type_factory.rb +11 -0
  181. data/lib/spree/testing_support/factories/user_factory.rb +1 -1
  182. data/lib/spree/testing_support/factories/zone_member_factory.rb +6 -0
  183. data/lib/spree/testing_support/microdata.rb +189 -0
  184. data/lib/tasks/core.rake +68 -0
  185. data/lib/tasks/exchanges.rake +2 -2
  186. data/spec/fixtures/microdata.html +22 -0
  187. data/spec/fixtures/microdata_itemref.html +15 -0
  188. data/spec/fixtures/microdata_no_itemscope.html +20 -0
  189. data/spec/helpers/base_helper_spec.rb +64 -1
  190. data/spec/helpers/products_helper_spec.rb +75 -3
  191. data/spec/lib/i18n_spec.rb +2 -2
  192. data/spec/lib/search/base_spec.rb +2 -2
  193. data/spec/lib/spree/core/controller_helpers/auth_spec.rb +4 -2
  194. data/spec/lib/spree/core/controller_helpers/store_spec.rb +56 -0
  195. data/spec/lib/spree/core/importer/order_spec.rb +226 -123
  196. data/spec/lib/spree/core/number_generator_spec.rb +175 -0
  197. data/spec/lib/spree/core_spec.rb +23 -0
  198. data/spec/lib/spree/localized_number_spec.rb +10 -0
  199. data/spec/mailers/order_mailer_spec.rb +11 -13
  200. data/spec/mailers/shipment_mailer_spec.rb +26 -8
  201. data/spec/mailers/test_mailer_spec.rb +15 -1
  202. data/spec/models/option_type_prototype_spec.rb +9 -0
  203. data/spec/models/spree/ability_spec.rb +6 -13
  204. data/spec/models/spree/address_spec.rb +1 -1
  205. data/spec/models/spree/adjustable/adjuster/base_spec.rb +10 -0
  206. data/spec/models/spree/adjustable/adjuster/promotion_spec.rb +211 -0
  207. data/spec/models/spree/adjustable/adjuster/tax_spec.rb +86 -0
  208. data/spec/models/spree/adjustable/adjustments_updater_spec.rb +2 -262
  209. data/spec/models/spree/adjustment_spec.rb +27 -1
  210. data/spec/models/spree/app_configuration_spec.rb +5 -2
  211. data/spec/models/spree/calculator/default_tax_spec.rb +39 -14
  212. data/spec/models/spree/concerns/user_methods_spec.rb +55 -0
  213. data/spec/models/spree/concerns/vat_price_calculation_spec.rb +66 -0
  214. data/spec/models/spree/country_spec.rb +45 -8
  215. data/spec/models/spree/credit_card_spec.rb +8 -8
  216. data/spec/models/spree/customer_return_spec.rb +4 -26
  217. data/spec/models/spree/gateway_spec.rb +7 -0
  218. data/spec/models/spree/image_spec.rb +3 -0
  219. data/spec/models/spree/inventory_unit_spec.rb +1 -18
  220. data/spec/models/spree/line_item_spec.rb +78 -18
  221. data/spec/models/spree/option_type_spec.rb +2 -2
  222. data/spec/models/spree/option_value_spec.rb +8 -3
  223. data/spec/models/spree/order/checkout_spec.rb +49 -39
  224. data/spec/models/spree/order/currency_updater_spec.rb +3 -3
  225. data/spec/models/spree/order/finalizing_spec.rb +0 -3
  226. data/spec/models/spree/order/payment_spec.rb +1 -1
  227. data/spec/models/spree/order/state_machine_spec.rb +1 -6
  228. data/spec/models/spree/order/store_credit_spec.rb +423 -0
  229. data/spec/models/spree/order/updating_spec.rb +2 -2
  230. data/spec/models/spree/order_contents_spec.rb +42 -1
  231. data/spec/models/spree/order_inventory_spec.rb +27 -17
  232. data/spec/models/spree/order_spec.rb +65 -52
  233. data/spec/models/spree/payment/gateway_options_spec.rb +10 -2
  234. data/spec/models/spree/payment/store_credit_spec.rb +60 -0
  235. data/spec/models/spree/payment_method/store_credit_spec.rb +291 -0
  236. data/spec/models/spree/payment_method_spec.rb +22 -14
  237. data/spec/models/spree/payment_spec.rb +37 -44
  238. data/spec/models/spree/price_spec.rb +86 -0
  239. data/spec/models/spree/product/scopes_spec.rb +35 -0
  240. data/spec/models/spree/product_option_type_spec.rb +6 -2
  241. data/spec/models/spree/product_promotion_rule_spec.rb +9 -0
  242. data/spec/models/spree/product_property_spec.rb +11 -0
  243. data/spec/models/spree/product_spec.rb +82 -15
  244. data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +1 -1
  245. data/spec/models/spree/promotion/rules/user_spec.rb +8 -0
  246. data/spec/models/spree/promotion_action_spec.rb +1 -1
  247. data/spec/models/spree/promotion_rule_spec.rb +1 -1
  248. data/spec/models/spree/promotion_rule_taxon_spec.rb +9 -0
  249. data/spec/models/spree/promotion_rule_user_spec.rb +9 -0
  250. data/spec/models/spree/promotion_spec.rb +57 -36
  251. data/spec/models/spree/property_prototype_spec.rb +9 -0
  252. data/spec/models/spree/prototype_taxon_spec.rb +9 -0
  253. data/spec/models/spree/refund_reason_spec.rb +7 -0
  254. data/spec/models/spree/reimbursement_spec.rb +3 -30
  255. data/spec/models/spree/reimbursement_tax_calculator_spec.rb +17 -5
  256. data/spec/models/spree/reimbursement_type/store_credit_spec.rb +101 -0
  257. data/spec/models/spree/return_authorization_reason_spec.rb +7 -0
  258. data/spec/models/spree/return_authorization_spec.rb +2 -22
  259. data/spec/models/spree/return_item_spec.rb +50 -1
  260. data/spec/models/spree/returns_calculator_spec.rb +1 -1
  261. data/spec/models/spree/role_spec.rb +7 -0
  262. data/spec/models/spree/shipment_spec.rb +17 -17
  263. data/spec/models/spree/shipping_calculator_spec.rb +2 -2
  264. data/spec/models/spree/shipping_category_spec.rb +14 -0
  265. data/spec/models/spree/shipping_method_spec.rb +9 -2
  266. data/spec/models/spree/shipping_rate_spec.rb +40 -41
  267. data/spec/models/spree/state_spec.rb +12 -1
  268. data/spec/models/spree/stock/content_item_spec.rb +9 -0
  269. data/spec/models/spree/stock/estimator_spec.rb +56 -8
  270. data/spec/models/spree/stock/quantifier_spec.rb +61 -32
  271. data/spec/models/spree/stock_item_spec.rb +19 -1
  272. data/spec/models/spree/store_credit_event_spec.rb +101 -0
  273. data/spec/models/spree/store_credit_spec.rb +786 -0
  274. data/spec/models/spree/store_spec.rb +39 -11
  275. data/spec/models/spree/tax_category_spec.rb +6 -1
  276. data/spec/models/spree/tax_rate_spec.rb +204 -44
  277. data/spec/models/spree/user_spec.rb +105 -38
  278. data/spec/models/spree/variant_spec.rb +281 -9
  279. data/spec/models/spree/zone_member_spec.rb +38 -0
  280. data/spec/models/spree/zone_spec.rb +32 -8
  281. data/spec/spec_helper.rb +3 -0
  282. data/spec/support/concerns/{adjustment_source_spec.rb → adjustment_source.rb} +0 -0
  283. data/spec/support/concerns/{default_price_spec.rb → default_price.rb} +9 -0
  284. data/spec/validators/db_maximum_length_validator_spec.rb +22 -0
  285. data/spree_core.gemspec +5 -6
  286. metadata +99 -36
  287. data/CHANGELOG.md +0 -4
  288. data/app/models/concerns/spree/number_generator.rb +0 -39
  289. data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +0 -24
@@ -0,0 +1,8 @@
1
+ <tr>
2
+ <td class="six sub-columns">
3
+ <%= raw(adjustment.label) %>:
4
+ </td>
5
+ <td class="six sub-columns last right">
6
+ <%= adjustment.display_amount %>
7
+ </td>
8
+ </tr>
@@ -0,0 +1,8 @@
1
+ <tr>
2
+ <td class="six sub-columns">
3
+ <%= Spree.t('order_mailer.subtotal') %>
4
+ </td>
5
+ <td class="six sub-columns last right">
6
+ <%= order.display_item_total %>
7
+ </td>
8
+ </tr>
@@ -0,0 +1,8 @@
1
+ <tr>
2
+ <td class="six sub-columns">
3
+ <strong><%= Spree.t('order_mailer.total') %></strong>
4
+ </td>
5
+ <td class="six sub-columns last right">
6
+ <strong><%= order.display_total %></strong>
7
+ </td>
8
+ </tr>
@@ -1,4 +1,4 @@
1
- <table>
1
+ <table class="row header">
2
2
  <tr>
3
3
  <td>
4
4
  <p class="lede">
@@ -8,35 +8,20 @@
8
8
  <%= Spree.t('order_mailer.cancel_email.instructions') %>
9
9
  </p>
10
10
  <p>
11
- <%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
11
+ <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %>
12
12
  </p>
13
- <table>
14
- <% @order.line_items.each do |item| %>
15
- <tr>
16
- <td><%= item.variant.sku %></td>
17
- <td>
18
- <%= raw(item.variant.product.name) %>
19
- <%= raw(item.variant.options_text) -%>
20
- </td>
21
- <td>(<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %></td>
22
- </tr>
23
- <% end %>
13
+ <table class="container">
24
14
  <tr>
25
- <td></td>
26
- <td><%= Spree.t('order_mailer.cancel_email.subtotal') %></td>
27
- <td><%= @order.display_item_total %></td>
28
- </tr>
29
- <% @order.adjustments.eligible.each do |adjustment| %>
30
- <tr>
31
- <td></td>
32
- <td><%= raw(adjustment.label) %></td>
33
- <td><%= adjustment.display_amount %></td>
34
- </tr>
35
- <% end %>
36
- <tr>
37
- <td></td>
38
- <td><%= Spree.t('order_mailer.cancel_email.total') %></td>
39
- <td><%= @order.display_total %></td>
15
+ <td class="wrapper last">
16
+ <table class="twelve columns">
17
+ <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
18
+ <%= render 'spree/order_mailer/subtotal', order: @order %>
19
+ <% @order.adjustments.eligible.each do |adjustment| %>
20
+ <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
21
+ <% end %>
22
+ <%= render 'spree/order_mailer/total', order: @order %>
23
+ </table>
24
+ </td>
40
25
  </tr>
41
26
  </table>
42
27
  </td>
@@ -3,7 +3,7 @@
3
3
  <%= Spree.t('order_mailer.cancel_email.instructions') %>
4
4
 
5
5
  ============================================================
6
- <%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
6
+ <%= Spree.t('order_mailer.cancel_email.order_summary_canceled', number: @order.number) %>
7
7
  ============================================================
8
8
  <% @order.line_items.each do |item| %>
9
9
  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
@@ -1,4 +1,4 @@
1
- <table>
1
+ <table class="row header">
2
2
  <tr>
3
3
  <td>
4
4
  <p class="lede">
@@ -8,70 +8,56 @@
8
8
  <%= Spree.t('order_mailer.confirm_email.instructions') %>
9
9
  </p>
10
10
  <p>
11
- <%= Spree.t('order_mailer.confirm_email.order_summary') %>
11
+ <%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>
12
12
  </p>
13
- <table>
14
- <% @order.line_items.each do |item| %>
15
- <tr>
16
- <td><%= item.variant.sku %></td>
17
- <td>
18
- <%= raw(item.variant.product.name) %>
19
- <%= raw(item.variant.options_text) -%>
20
- </td>
21
- <td>(<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %></td>
22
- </tr>
23
- <% end %>
13
+ <table class="container">
24
14
  <tr>
25
- <td></td>
26
- <td>
27
- <%= Spree.t('order_mailer.confirm_email.subtotal') %>
28
- </td>
29
- <td>
30
- <%= @order.display_item_total %>
31
- </td>
32
- </tr>
33
- <% if @order.line_item_adjustments.exists? %>
34
- <% if @order.all_adjustments.promotion.eligible.exists? %>
35
- <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
36
- <tr>
37
- <td></td>
38
- <td><%= Spree.t(:promotion) %> <%= label %>:</td>
39
- <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></td>
40
- </tr>
41
- <% end %>
42
- <% end %>
43
- <% end %>
44
- <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
45
- <tr>
46
- <td></td>
47
- <td><%= Spree.t(:shipping) %> <%= name %>:</td>
48
- <td><%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %></td>
49
- </tr>
50
- <% end %>
51
- <% if @order.all_adjustments.eligible.tax.exists? %>
52
- <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
53
- <tr>
54
- <td></td>
55
- <td><%= Spree.t(:tax) %> <%= label %>:</td>
56
- <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></td>
57
- </tr>
58
- <% end %>
59
- <% end %>
60
- <% @order.adjustments.eligible.each do |adjustment| %>
61
- <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
62
- <tr>
63
- <td></td>
64
- <td><%= adjustment.label %>:</td>
65
- <td><%= adjustment.display_amount %></td>
66
- </tr>
67
- <% end %>
68
- <tr>
69
- <td></td>
70
- <td>
71
- <%= Spree.t('order_mailer.confirm_email.total') %>
72
- </td>
73
- <td>
74
- <%= @order.display_total %>
15
+ <td class="wrapper last">
16
+ <table class="twelve columns">
17
+ <%= render collection: @order.line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
18
+ <%= render 'spree/order_mailer/subtotal', order: @order %>
19
+ <% if @order.line_item_adjustments.exists? %>
20
+ <% if @order.all_adjustments.promotion.eligible.exists? %>
21
+ <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
22
+ <tr>
23
+ <td class="six sub-columns">
24
+ <%= Spree.t(:promotion) %> <%= label %>:
25
+ </td>
26
+ <td class="six sub-columns last right">
27
+ <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
28
+ </td>
29
+ </tr>
30
+ <% end %>
31
+ <% end %>
32
+ <% end %>
33
+ <% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
34
+ <tr>
35
+ <td class="six sub-columns">
36
+ <%= Spree.t(:shipping) %> <%= name %>:
37
+ </td>
38
+ <td class="six sub-columns last right">
39
+ <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
40
+ </td>
41
+ </tr>
42
+ <% end %>
43
+ <% if @order.all_adjustments.eligible.tax.exists? %>
44
+ <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
45
+ <tr>
46
+ <td class="six sub-columns">
47
+ <%= Spree.t(:tax) %> <%= label %>:
48
+ </td>
49
+ <td class="six sub-columns last right">
50
+ <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
51
+ </td>
52
+ </tr>
53
+ <% end %>
54
+ <% end %>
55
+ <% @order.adjustments.eligible.each do |adjustment| %>
56
+ <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
57
+ <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
58
+ <% end %>
59
+ <%= render 'spree/order_mailer/total', order: @order %>
60
+ </table>
75
61
  </td>
76
62
  </tr>
77
63
  </table>
@@ -3,7 +3,7 @@
3
3
  <%= Spree.t('order_mailer.confirm_email.instructions') %>
4
4
 
5
5
  ============================================================
6
- <%= Spree.t('order_mailer.confirm_email.order_summary') %>
6
+ <%= Spree.t('order_mailer.confirm_email.order_summary', number: @order.number) %>
7
7
  ============================================================
8
8
  <% @order.line_items.each do |item| %>
9
9
  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) <%= Spree.t('at_symbol') %> <%= item.single_money %> = <%= item.display_amount %>
@@ -1,4 +1,4 @@
1
- <!-- You can override this template to design your own header.
1
+ <!-- You can override this template to design your own header. -->
2
2
  <table class="row header">
3
3
  <tr>
4
4
  <td class="center" align="center">
@@ -10,11 +10,10 @@
10
10
 
11
11
  <table class="twelve columns">
12
12
  <tr>
13
- <td class="six sub-columns">
14
- <%= image_tag(Spree::Config.logo) %>
15
- </td>
16
- <td class="six sub-columns last" style="text-align:right; vertical-align:middle;">
17
- <span class="template-label"><%= Spree::Store.current.name %></span>
13
+ <td class="twelve sub-columns last">
14
+ <%= link_to spree.root_url, class: 'template-label' do %>
15
+ <%= image_tag Spree::Config.logo, class: 'logo', alt: Spree::Store.current.name, title: Spree::Store.current.name %>
16
+ <% end %>
18
17
  </td>
19
18
  <td class="expander"></td>
20
19
  </tr>
@@ -28,4 +27,3 @@
28
27
  </td>
29
28
  </tr>
30
29
  </table>
31
- -->
@@ -0,0 +1,777 @@
1
+ <style>
2
+ /**********************************************
3
+ * Ink v1.0.5 - Copyright 2013 ZURB Inc *
4
+ **********************************************/
5
+
6
+ /* Client-specific Styles and Reset */
7
+
8
+ #outlook a {
9
+ padding:0;
10
+ }
11
+
12
+ body{
13
+ width:100% !important;
14
+ min-width: 100%;
15
+ -webkit-text-size-adjust:100%;
16
+ -ms-text-size-adjust:100%;
17
+ margin:0;
18
+ padding:0;
19
+ }
20
+
21
+ /* .ExternalClass applies to Outlook.com (the artist formerly known as Hotmail) */
22
+
23
+ .ExternalClass {
24
+ width:100%;
25
+ }
26
+
27
+ .ExternalClass,
28
+ .ExternalClass p,
29
+ .ExternalClass span,
30
+ .ExternalClass font,
31
+ .ExternalClass td,
32
+ .ExternalClass div {
33
+ line-height: 100%;
34
+ }
35
+
36
+ #backgroundTable {
37
+ margin:0;
38
+ padding:0;
39
+ width:100% !important;
40
+ line-height: 100% !important;
41
+ }
42
+
43
+ img {
44
+ outline:none;
45
+ text-decoration:none;
46
+ -ms-interpolation-mode: bicubic;
47
+ width: auto;
48
+ max-width: 100%;
49
+ float: left;
50
+ clear: both;
51
+ display: block;
52
+ }
53
+
54
+ center {
55
+ width: 100%;
56
+ min-width: 580px;
57
+ }
58
+
59
+ a img {
60
+ border: none;
61
+ }
62
+
63
+ p {
64
+ margin: 0 0 0 10px;
65
+ }
66
+
67
+ table {
68
+ border-spacing: 0;
69
+ border-collapse: collapse;
70
+ }
71
+
72
+ td {
73
+ word-break: break-word;
74
+ -webkit-hyphens: none;
75
+ -moz-hyphens: none;
76
+ hyphens: none;
77
+ border-collapse: collapse !important;
78
+ }
79
+
80
+ table, tr, td {
81
+ padding: 0;
82
+ vertical-align: top;
83
+ text-align: left;
84
+ }
85
+
86
+ hr {
87
+ color: #d9d9d9;
88
+ background-color: #d9d9d9;
89
+ height: 1px;
90
+ border: none;
91
+ }
92
+
93
+ /* Responsive Grid */
94
+
95
+ table.body {
96
+ height: 100%;
97
+ width: 100%;
98
+ }
99
+
100
+ table.container {
101
+ width: 580px;
102
+ margin: 0 auto;
103
+ text-align: inherit;
104
+ }
105
+
106
+ table.row {
107
+ padding: 0px;
108
+ width: 100%;
109
+ position: relative;
110
+ }
111
+
112
+ table.container table.row {
113
+ display: block;
114
+ }
115
+
116
+ td.wrapper {
117
+ padding: 10px 20px 0px 0px;
118
+ position: relative;
119
+ }
120
+
121
+ table.columns,
122
+ table.column {
123
+ margin: 0 auto;
124
+ }
125
+
126
+ table.columns td,
127
+ table.column td {
128
+ padding: 0px 0px 10px;
129
+ }
130
+
131
+ table.columns td.sub-columns,
132
+ table.column td.sub-columns,
133
+ table.columns td.sub-column,
134
+ table.column td.sub-column {
135
+ padding-right: 10px;
136
+ }
137
+
138
+ td.sub-column, td.sub-columns {
139
+ min-width: 0px;
140
+ }
141
+
142
+ table.row td.last,
143
+ table.container td.last {
144
+ padding-right: 0px;
145
+ }
146
+
147
+ table.one { width: 30px; }
148
+ table.two { width: 80px; }
149
+ table.three { width: 130px; }
150
+ table.four { width: 180px; }
151
+ table.five { width: 230px; }
152
+ table.six { width: 280px; }
153
+ table.seven { width: 330px; }
154
+ table.eight { width: 380px; }
155
+ table.nine { width: 430px; }
156
+ table.ten { width: 480px; }
157
+ table.eleven { width: 530px; }
158
+ table.twelve { width: 580px; }
159
+
160
+ table.one center { min-width: 30px; }
161
+ table.two center { min-width: 80px; }
162
+ table.three center { min-width: 130px; }
163
+ table.four center { min-width: 180px; }
164
+ table.five center { min-width: 230px; }
165
+ table.six center { min-width: 280px; }
166
+ table.seven center { min-width: 330px; }
167
+ table.eight center { min-width: 380px; }
168
+ table.nine center { min-width: 430px; }
169
+ table.ten center { min-width: 480px; }
170
+ table.eleven center { min-width: 530px; }
171
+ table.twelve center { min-width: 580px; }
172
+
173
+ table.one .panel center { min-width: 10px; }
174
+ table.two .panel center { min-width: 60px; }
175
+ table.three .panel center { min-width: 110px; }
176
+ table.four .panel center { min-width: 160px; }
177
+ table.five .panel center { min-width: 210px; }
178
+ table.six .panel center { min-width: 260px; }
179
+ table.seven .panel center { min-width: 310px; }
180
+ table.eight .panel center { min-width: 360px; }
181
+ table.nine .panel center { min-width: 410px; }
182
+ table.ten .panel center { min-width: 460px; }
183
+ table.eleven .panel center { min-width: 510px; }
184
+ table.twelve .panel center { min-width: 560px; }
185
+
186
+ .body .columns td.one,
187
+ .body .column td.one { width: 8.333333%; }
188
+ .body .columns td.two,
189
+ .body .column td.two { width: 16.666666%; }
190
+ .body .columns td.three,
191
+ .body .column td.three { width: 25%; }
192
+ .body .columns td.four,
193
+ .body .column td.four { width: 33.333333%; }
194
+ .body .columns td.five,
195
+ .body .column td.five { width: 41.666666%; }
196
+ .body .columns td.six,
197
+ .body .column td.six { width: 50%; }
198
+ .body .columns td.seven,
199
+ .body .column td.seven { width: 58.333333%; }
200
+ .body .columns td.eight,
201
+ .body .column td.eight { width: 66.666666%; }
202
+ .body .columns td.nine,
203
+ .body .column td.nine { width: 75%; }
204
+ .body .columns td.ten,
205
+ .body .column td.ten { width: 83.333333%; }
206
+ .body .columns td.eleven,
207
+ .body .column td.eleven { width: 91.666666%; }
208
+ .body .columns td.twelve,
209
+ .body .column td.twelve { width: 100%; }
210
+
211
+ td.offset-by-one { padding-left: 50px; }
212
+ td.offset-by-two { padding-left: 100px; }
213
+ td.offset-by-three { padding-left: 150px; }
214
+ td.offset-by-four { padding-left: 200px; }
215
+ td.offset-by-five { padding-left: 250px; }
216
+ td.offset-by-six { padding-left: 300px; }
217
+ td.offset-by-seven { padding-left: 350px; }
218
+ td.offset-by-eight { padding-left: 400px; }
219
+ td.offset-by-nine { padding-left: 450px; }
220
+ td.offset-by-ten { padding-left: 500px; }
221
+ td.offset-by-eleven { padding-left: 550px; }
222
+
223
+ td.expander {
224
+ visibility: hidden;
225
+ width: 0px;
226
+ padding: 0 !important;
227
+ }
228
+
229
+ table.columns .text-pad,
230
+ table.column .text-pad {
231
+ padding-left: 10px;
232
+ padding-right: 10px;
233
+ }
234
+
235
+ table.columns .left-text-pad,
236
+ table.columns .text-pad-left,
237
+ table.column .left-text-pad,
238
+ table.column .text-pad-left {
239
+ padding-left: 10px;
240
+ }
241
+
242
+ table.columns .right-text-pad,
243
+ table.columns .text-pad-right,
244
+ table.column .right-text-pad,
245
+ table.column .text-pad-right {
246
+ padding-right: 10px;
247
+ }
248
+
249
+ /* Block Grid */
250
+
251
+ .block-grid {
252
+ width: 100%;
253
+ max-width: 580px;
254
+ }
255
+
256
+ .block-grid td {
257
+ display: inline-block;
258
+ padding:10px;
259
+ }
260
+
261
+ .two-up td {
262
+ width:270px;
263
+ }
264
+
265
+ .three-up td {
266
+ width:173px;
267
+ }
268
+
269
+ .four-up td {
270
+ width:125px;
271
+ }
272
+
273
+ .five-up td {
274
+ width:96px;
275
+ }
276
+
277
+ .six-up td {
278
+ width:76px;
279
+ }
280
+
281
+ .seven-up td {
282
+ width:62px;
283
+ }
284
+
285
+ .eight-up td {
286
+ width:52px;
287
+ }
288
+
289
+ /* Alignment and Visibility Classes */
290
+
291
+ table.center, td.center {
292
+ text-align: center;
293
+ }
294
+
295
+ h1.center,
296
+ h2.center,
297
+ h3.center,
298
+ h4.center,
299
+ h5.center,
300
+ h6.center,
301
+ p.center {
302
+ text-align: center;
303
+ }
304
+
305
+ span.center {
306
+ display: block;
307
+ width: 100%;
308
+ text-align: center;
309
+ }
310
+
311
+ img.center {
312
+ margin: 0 auto;
313
+ float: none;
314
+ }
315
+
316
+ .show-for-small,
317
+ .hide-for-desktop {
318
+ display: none;
319
+ width:0;
320
+ mso-hide:all;
321
+ overflow:hidden;
322
+ }
323
+
324
+ .show-for-small *,
325
+ .hide-for-desktop * {
326
+ mso-hide:all;
327
+ }
328
+
329
+ /* Typography */
330
+
331
+ body, table.body, h1, h2, h3, h4, h5, h6, p, td {
332
+ color: #222222;
333
+ font-family: Helvetica, Arial, sans-serif;
334
+ font-weight: normal;
335
+ padding:0;
336
+ margin: 0;
337
+ text-align: left;
338
+ line-height: 1.3;
339
+ }
340
+
341
+ h1, h2, h3, h4, h5, h6 {
342
+ word-break: normal;
343
+ }
344
+
345
+ h1 {font-size: 40px;}
346
+ h2 {font-size: 36px;}
347
+ h3 {font-size: 32px;}
348
+ h4 {font-size: 28px;}
349
+ h5 {font-size: 24px;}
350
+ h6 {font-size: 20px;}
351
+ body, table.body, p, td {font-size: 14px;line-height:19px;}
352
+
353
+ p.lead, p.lede, p.leed {
354
+ font-size: 18px;
355
+ line-height:21px;
356
+ }
357
+
358
+ p {
359
+ margin-bottom: 10px;
360
+ }
361
+
362
+ small {
363
+ font-size: 10px;
364
+ }
365
+
366
+ a {
367
+ color: #2ba6cb;
368
+ text-decoration: none;
369
+ }
370
+
371
+ a:hover {
372
+ color: #2795b6 !important;
373
+ }
374
+
375
+ a:active {
376
+ color: #2795b6 !important;
377
+ }
378
+
379
+ a:visited {
380
+ color: #2ba6cb !important;
381
+ }
382
+
383
+ h1 a,
384
+ h2 a,
385
+ h3 a,
386
+ h4 a,
387
+ h5 a,
388
+ h6 a {
389
+ color: #2ba6cb;
390
+ }
391
+
392
+ h1 a:active,
393
+ h2 a:active,
394
+ h3 a:active,
395
+ h4 a:active,
396
+ h5 a:active,
397
+ h6 a:active {
398
+ color: #2ba6cb !important;
399
+ }
400
+
401
+ h1 a:visited,
402
+ h2 a:visited,
403
+ h3 a:visited,
404
+ h4 a:visited,
405
+ h5 a:visited,
406
+ h6 a:visited {
407
+ color: #2ba6cb !important;
408
+ }
409
+
410
+ /* Panels */
411
+
412
+ .panel {
413
+ background: #f2f2f2;
414
+ border: 1px solid #d9d9d9;
415
+ padding: 10px !important;
416
+ }
417
+
418
+ .sub-grid table {
419
+ width: 100%;
420
+ }
421
+
422
+ .sub-grid td.sub-columns {
423
+ padding-bottom: 0;
424
+ }
425
+
426
+ /* Buttons */
427
+
428
+ table.button,
429
+ table.tiny-button,
430
+ table.small-button,
431
+ table.medium-button,
432
+ table.large-button {
433
+ width: 100%;
434
+ overflow: hidden;
435
+ }
436
+
437
+ table.button td,
438
+ table.tiny-button td,
439
+ table.small-button td,
440
+ table.medium-button td,
441
+ table.large-button td {
442
+ box-sizing:border-box;
443
+ -moz-box-sizing:border-box;
444
+ -webkit-box-sizing:border-box;
445
+ display: block;
446
+ width: auto !important;
447
+ text-align: center;
448
+ background: #2ba6cb;
449
+ border: 1px solid #2284a1;
450
+ color: #ffffff;
451
+ padding: 8px 0;
452
+ line-height: initial !important;
453
+ }
454
+
455
+ table.tiny-button td {
456
+ padding: 5px 0;
457
+ }
458
+
459
+ table.small-button td {
460
+ padding: 8px 0;
461
+ }
462
+
463
+ table.medium-button td {
464
+ padding: 12px 0;
465
+ }
466
+
467
+ table.large-button td {
468
+ padding: 21px 0;
469
+ }
470
+
471
+ table.button td a,
472
+ table.tiny-button td a,
473
+ table.small-button td a,
474
+ table.medium-button td a,
475
+ table.large-button td a {
476
+ font-weight: bold;
477
+ text-decoration: none;
478
+ font-family: Helvetica, Arial, sans-serif;
479
+ color: #ffffff;
480
+ font-size: 16px;
481
+ display: block;
482
+ height: 100%;
483
+ width: 100%;
484
+ }
485
+
486
+ table.tiny-button td a {
487
+ font-size: 12px;
488
+ font-weight: normal;
489
+ }
490
+
491
+ table.small-button td a {
492
+ font-size: 16px;
493
+ }
494
+
495
+ table.medium-button td a {
496
+ font-size: 20px;
497
+ }
498
+
499
+ table.large-button td a {
500
+ font-size: 24px;
501
+ }
502
+
503
+ table.button:hover td,
504
+ table.button:visited td,
505
+ table.button:active td {
506
+ background: #2795b6 !important;
507
+ }
508
+
509
+ table.button:hover td a,
510
+ table.button:visited td a,
511
+ table.button:active td a {
512
+ color: #ffffff !important;
513
+ }
514
+
515
+ table.button:hover td,
516
+ table.tiny-button:hover td,
517
+ table.small-button:hover td,
518
+ table.medium-button:hover td,
519
+ table.large-button:hover td {
520
+ background: #2795b6 !important;
521
+ }
522
+
523
+ table.button:hover td a,
524
+ table.button:active td a,
525
+ table.button td a:visited,
526
+ table.tiny-button:hover td a,
527
+ table.tiny-button:active td a,
528
+ table.tiny-button td a:visited,
529
+ table.small-button:hover td a,
530
+ table.small-button:active td a,
531
+ table.small-button td a:visited,
532
+ table.medium-button:hover td a,
533
+ table.medium-button:active td a,
534
+ table.medium-button td a:visited,
535
+ table.large-button:hover td a,
536
+ table.large-button:active td a,
537
+ table.large-button td a:visited {
538
+ color: #ffffff !important;
539
+ }
540
+
541
+ table.secondary td {
542
+ background: #e9e9e9;
543
+ border-color: #d0d0d0;
544
+ color: #555555;
545
+ }
546
+
547
+ table.secondary td a {
548
+ color: #555555;
549
+ }
550
+
551
+ table.secondary:hover td {
552
+ background: #d0d0d0 !important;
553
+ color: #555555;
554
+ }
555
+
556
+ table.secondary:hover td a,
557
+ table.secondary td a:visited,
558
+ table.secondary:active td a {
559
+ color: #555555 !important;
560
+ }
561
+
562
+ table.success td {
563
+ background: #5da423;
564
+ border-color: #457a1a;
565
+ }
566
+
567
+ table.success:hover td {
568
+ background: #457a1a !important;
569
+ }
570
+
571
+ table.alert td {
572
+ background: #c60f13;
573
+ border-color: #970b0e;
574
+ }
575
+
576
+ table.alert:hover td {
577
+ background: #970b0e !important;
578
+ }
579
+
580
+ table.radius td {
581
+ -webkit-border-radius: 3px;
582
+ -moz-border-radius: 3px;
583
+ border-radius: 3px;
584
+ }
585
+
586
+ table.round td {
587
+ -webkit-border-radius: 500px;
588
+ -moz-border-radius: 500px;
589
+ border-radius: 500px;
590
+ }
591
+
592
+ /* Outlook First */
593
+
594
+ body.outlook p {
595
+ display: inline !important;
596
+ }
597
+
598
+ /* Media Queries */
599
+
600
+ @media only screen and (max-width: 600px) {
601
+
602
+ table[class="body"] img {
603
+ max-width: auto !important;
604
+ max-height: auto !important;
605
+ }
606
+
607
+ table[class="body"] center {
608
+ min-width: 0 !important;
609
+ }
610
+
611
+ table[class="body"] .container {
612
+ width: 95% !important;
613
+ }
614
+
615
+ table[class="body"] .row {
616
+ width: 100% !important;
617
+ display: block !important;
618
+ }
619
+
620
+ table[class="body"] .wrapper {
621
+ display: block !important;
622
+ padding-right: 0 !important;
623
+ }
624
+
625
+ table[class="body"] .columns,
626
+ table[class="body"] .column {
627
+ table-layout: fixed !important;
628
+ float: none !important;
629
+ width: 100% !important;
630
+ padding-right: 0px !important;
631
+ padding-left: 0px !important;
632
+ display: block !important;
633
+ }
634
+
635
+ table[class="body"] .wrapper.first .columns,
636
+ table[class="body"] .wrapper.first .column {
637
+ display: table !important;
638
+ }
639
+
640
+ table[class="body"] table.columns td,
641
+ table[class="body"] table.column td {
642
+ width: 100% !important;
643
+ }
644
+
645
+ table[class="body"] .columns td.one,
646
+ table[class="body"] .column td.one { width: 8.333333% !important; }
647
+ table[class="body"] .columns td.two,
648
+ table[class="body"] .column td.two { width: 16.666666% !important; }
649
+ table[class="body"] .columns td.three,
650
+ table[class="body"] .column td.three { width: 25% !important; }
651
+ table[class="body"] .columns td.four,
652
+ table[class="body"] .column td.four { width: 33.333333% !important; }
653
+ table[class="body"] .columns td.five,
654
+ table[class="body"] .column td.five { width: 41.666666% !important; }
655
+ table[class="body"] .columns td.six,
656
+ table[class="body"] .column td.six { width: 50% !important; }
657
+ table[class="body"] .columns td.seven,
658
+ table[class="body"] .column td.seven { width: 58.333333% !important; }
659
+ table[class="body"] .columns td.eight,
660
+ table[class="body"] .column td.eight { width: 66.666666% !important; }
661
+ table[class="body"] .columns td.nine,
662
+ table[class="body"] .column td.nine { width: 75% !important; }
663
+ table[class="body"] .columns td.ten,
664
+ table[class="body"] .column td.ten { width: 83.333333% !important; }
665
+ table[class="body"] .columns td.eleven,
666
+ table[class="body"] .column td.eleven { width: 91.666666% !important; }
667
+ table[class="body"] .columns td.twelve,
668
+ table[class="body"] .column td.twelve { width: 100% !important; }
669
+
670
+ table[class="body"] td.offset-by-one,
671
+ table[class="body"] td.offset-by-two,
672
+ table[class="body"] td.offset-by-three,
673
+ table[class="body"] td.offset-by-four,
674
+ table[class="body"] td.offset-by-five,
675
+ table[class="body"] td.offset-by-six,
676
+ table[class="body"] td.offset-by-seven,
677
+ table[class="body"] td.offset-by-eight,
678
+ table[class="body"] td.offset-by-nine,
679
+ table[class="body"] td.offset-by-ten,
680
+ table[class="body"] td.offset-by-eleven {
681
+ padding-left: 0 !important;
682
+ }
683
+
684
+ table[class="body"] table.columns td.expander {
685
+ width: 1px !important;
686
+ }
687
+
688
+ table[class="body"] .right-text-pad,
689
+ table[class="body"] .text-pad-right {
690
+ padding-left: 10px !important;
691
+ }
692
+
693
+ table[class="body"] .left-text-pad,
694
+ table[class="body"] .text-pad-left {
695
+ padding-right: 10px !important;
696
+ }
697
+
698
+ table[class="body"] .hide-for-small,
699
+ table[class="body"] .show-for-desktop {
700
+ display: none !important;
701
+ }
702
+
703
+ table[class="body"] .show-for-small,
704
+ table[class="body"] .hide-for-desktop {
705
+ display : block !important;
706
+ width : auto !important;
707
+ overflow : visible !important;
708
+ }
709
+ }
710
+ </style>
711
+
712
+ <style>
713
+
714
+ table[class="body"] {
715
+ margin-top: 20px;
716
+ }
717
+
718
+ .template-label {
719
+ font-weight: bold;
720
+ font-size: 11px;
721
+ }
722
+
723
+ .callout .wrapper {
724
+ padding-bottom: 20px;
725
+ }
726
+
727
+ .callout .panel {
728
+ background: #ECF8FF;
729
+ border-color: #b9e5ff;
730
+ }
731
+
732
+ .header {
733
+ background: #fff;
734
+ }
735
+
736
+ .footer .wrapper {
737
+ background: #ebebeb;
738
+ }
739
+
740
+ .footer h5 {
741
+ padding-bottom: 10px;
742
+ }
743
+
744
+ table.columns .text-pad {
745
+ padding-left: 10px;
746
+ padding-right: 10px;
747
+ }
748
+
749
+ table.columns .left-text-pad {
750
+ padding-left: 10px;
751
+ }
752
+
753
+ table.columns .right-text-pad {
754
+ padding-right: 10px;
755
+ }
756
+
757
+ td.right {
758
+ text-align: right;
759
+ }
760
+
761
+ @media only screen and (max-width: 600px) {
762
+
763
+ table[class="body"] .right-text-pad {
764
+ padding-left: 10px !important;
765
+ }
766
+
767
+ table[class="body"] .left-text-pad {
768
+ padding-right: 10px !important;
769
+ }
770
+
771
+ .logo {
772
+ margin-left: auto;
773
+ margin-right: auto;
774
+ float: none !important;
775
+ }
776
+ }
777
+ </style>