Updated packing slip and invoice to not display company if not availa…

…ble. Updated to newest database schema.
gerwinbrunner · Jun 5, 2009 · cb10ed4 · cb10ed4
1 parent 16be16d
commit cb10ed4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/db/printing/invoice.liquid b/db/printing/invoice.liquid
@@ -46,7 +46,9 @@
 
 <div style="padding: 8px; border: 2px solid #ccc;">
   {{ shipping_address.name }}<br/>
-  {{ shipping_address.company }}<br/>
+  {% if shipping_address.company %}
+    {{ shipping_address.company }}<br/>
+  {% endif %}
   {{ shipping_address.street }}<br/>
   {{ shipping_address.city }}
   {{ shipping_address.province }}

diff --git a/db/printing/packing_slip.liquid b/db/printing/packing_slip.liquid
@@ -13,7 +13,9 @@
 <div style="font-size: 120%; padding: 8px; border: 2px solid #ccc; margin: 20px">
   <h3>Recipient</h3>
   {{ shipping_address.name }}<br/>
-  {{ shipping_address.company }}<br/>
+  {% if shipping_address.company %}
+    {{ shipping_address.company }}<br/>
+  {% endif %}
   {{ shipping_address.street }}<br/>
   {{ shipping_address.city }}
   {{ shipping_address.province }}

diff --git a/db/schema.rb b/db/schema.rb
@@ -9,7 +9,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090529202856) do
+ActiveRecord::Schema.define(:version => 20090605160611) do
+
+  create_table "print_template_versions", :force => true do |t|
+    t.integer  "print_template_id"
+    t.text     "body"
+    t.datetime "created_at"
+    t.integer  "version",           :default => 0
+    t.string   "snapshot"
+  end
 
   create_table "print_templates", :force => true do |t|
     t.integer  "shop_id"