caboose-cms 0.5.180 → 0.5.181

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzkxMDQwNTU4NjM2ODY0MGUwNzMxZDhiNzVlMDEwZDEyNDM0NjU4Yw==
+    MjEwZDBiYWFlZjVhMGI0MTk1YzQyZWE1NDdhZTVjNzdhNzU4ZDE1Yg==
   data.tar.gz: !binary |-
-    MzhiYTRkOTJkY2NiOTlhYmU1NmJiNGNkNmE2M2U0ZjI4YTY5MTRkNw==
+    N2E3NWNjYTEwZjIyOWEwMmUxYzk0OWI1ZjYxM2E4OWNlMWZkODBhMw==
 SHA512:
   metadata.gz: !binary |-
-    YjgyNWY5NzdjNzU1NzliYTQyNmE2OWY5ZGY2NzdkMWM4ZGQ0Yzk2YWVkYWI3
-    NmFkZmY2ZTBmZGIzMGRmNmE2ZTAzNGU5ODM1NTM5YjhhYjc3NTZjMjE4MmU3
-    YzgzMGVhMDZlMDBjNjk0Yjc2M2Y5NzYwNjA1NTVkZmY5YmUwMTY=
+    ZTg3MzQxNDlkZmVmYmU1M2E1NmIzMDUxZDRlZjZhZmZhMWRkNGY3YzExMDlj
+    Y2EyZGYxYmZjZTVhNTc0OGE1Yzg0NWRjNWJkOWY3MTc1N2JiNzdkZWZmZTli
+    MmE2NjkxODYyN2U5OTE2MGIwOWM4YThiM2JhNmMxMWQwM2E1YWY=
   data.tar.gz: !binary |-
-    ZmExMzQ0NzA1ZmFjODY3NWJjMDRlYzc2MWExMzMyOGI5OGJmMjE1YjRkYmUy
-    MWMzYjJiMDdkMDU0MGY2NWI5MGJmNzhkYmJjZmUzNjg1YWU4ZTYyNjEyODI0
-    OGUxZDc2MGNmZDk2YTUzNDJjOTFkMTZjMDZhYmRiN2Q3MWY3OWU=
+    MjA5OTM5MmNmZDE4NDQyYzgzZGRiMGMxMDRiYjkxYzlhZDZiOTkzZGE3OGQy
+    YjViZTBkNDU5MDNmOGZlZWE1Y2JlZjBhM2U5ODY2ZjQyZTRmNzk5NjBhMDY0
+    ZmE0NmJjODU3YjgxNjRkOTYxZjQ5NWY3MTc2NWM0YTY5ZDM4OTY=

data/app/assets/javascripts/caboose/admin_edit_order.js

@@ -204,9 +204,10 @@ OrderController.prototype = {
 
 /******************************************************************************/
 
-  print_order: function(order_id)
+  print_order: function()
   {
-    window.open('/admin/orders/' + order_id + '/print');
+    var that = this;
+    window.open('/admin/orders/' + that.order.id + '/print');
   },  
     
   line_items_for_order_package: function(order_package_id)

data/app/controllers/caboose/pages_controller.rb

@@ -28,7 +28,7 @@ module Caboose
       # See if we're on a forwarding domain
       elsif d.primary == false && d.forward_to_primary == true
         pd = d.site.primary_domain
-        if pd
+        if pd && pd.domain != request.host
           url = "#{request.protocol}#{pd.domain}"
           if request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
             url << request.fullpath

data/app/models/caboose/order_pdf.rb

@@ -74,41 +74,21 @@ module Caboose
 
       # #{self.card_type} ending in #{self.card_number
       ba = order.billing_address
-      billed_to = []
-      billed_to << [
-        { :content => "Name", :border_width => 0 },
-        { :content => "#{ba.first_name} #{ba.last_name}", :border_width => 0}
-      ]
-      billed_to << [
-        { :content => "Address", :border_width => 0 },
-        { :content => "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}", :border_width => 0}
-      ]
-      billed_to << [
-        { :content => "Email", :border_width => 0 },
-        { :content => "#{c.email}", :border_width => 0}
-      ]
-      billed_to << [
-        { :content => "Phone", :border_width => 0 },
-        { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
+      ba_address = "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}"
+      billed_to = [
+        [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => "#{ba.first_name} #{ba.last_name}" , :border_width => 0, :width => 200 }],
+        [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => ba_address                         , :border_width => 0, :width => 200 }],
+        [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }],
+        [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]
       ]
       
       sa = order.shipping_address
-      shipped_to = []
-      shipped_to << [
-        { :content => "Name", :border_width => 0 },
-        { :content => "#{sa.first_name} #{sa.last_name}", :border_width => 0}
-      ]
-      shipped_to << [
-        { :content => "Address", :border_width => 0 },
-        { :content => "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}", :border_width => 0}
-      ]
-      shipped_to << [
-        { :content => "Email", :border_width => 0 },
-        { :content => "#{c.email}", :border_width => 0}
-      ]
-      shipped_to << [
-        { :content => "Phone", :border_width => 0 },
-        { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
+      sa_address = "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}"
+      shipped_to = [
+        [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => "#{sa.first_name} #{sa.last_name}" , :border_width => 0, :width => 200 }],
+        [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => sa_address                         , :border_width => 0, :width => 200 }],
+        [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }],
+        [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]
       ]
 
       tbl = []
@@ -129,12 +109,12 @@ module Caboose
       
       tbl = []
       tbl << [
-        { :content => "Package"            , :align => :left, :valign => :bottom },
-        { :content => "Product"            , :align => :left, :valign => :bottom, :colspan => 2 },
-        { :content => "Attributes" , :align => :left, :valign => :bottom },
-         { :content => "Quantity"        , :align => :right, :valign => :bottom },        
-        { :content => "Price"      , :align => :right, :valign => :bottom },
-        { :content => "Amount"        , :align => :right, :valign => :bottom }
+        { :content => "Package"    , :align => :left  , :valign => :bottom },
+        { :content => "Product"    , :align => :left  , :valign => :bottom, :colspan => 2 },
+        { :content => "Attributes" , :align => :left  , :valign => :bottom },
+        { :content => "Quantity"   , :align => :right , :valign => :bottom },        
+        { :content => "Price"      , :align => :right , :valign => :bottom },
+        { :content => "Amount"     , :align => :right , :valign => :bottom }
       ]
 
       order.calculate
@@ -212,33 +192,14 @@ module Caboose
       tbl2 = []
       tbl3 = []
 
-      tbl2 << [
-        { :content => "Card Type", :width => 127, :border_width => 0 },
-        { :content => self.card_type, :width => 128, :border_width => 0 }
-      ]
-      tbl2 << [
-        { :content => "Transaction ID", :width => 127, :border_width => 0 },
-        { :content => trans.transaction_id.to_s, :width => 128, :border_width => 0 }
-      ]
-      tbl2 << [
-        { :content => "Gateway Response", :width => 127, :border_width => 0},
-        { :content => trans.response_code.to_s, :width => 128, :border_width => 0  }
-      ]
-      tbl3 << [
-        { :content => "Card Number", :width => 127, :border_width => 0},
-        { :content => "XXXX XXXX XXXX " + self.card_number, :width => 128, :border_width => 0 }
-      ]
-      tbl3 << [
-        { :content => "Transaction Time", :width => 127, :border_width => 0},
-        { :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p"), :width => 128, :border_width => 0  }
-      ]
-      tbl3 << [
-        { :content => "Payment Process", :width => 127, :border_width => 0},
-        { :content => trans.success ? "Successful" : "Failed", :width => 128, :border_width => 0  }
-      ]
-      tbl << [
-        { :content => "Authorization Details", :colspan => 2, :font_style => :bold }
-      ]
+      tbl2 << [{ :content => "Card Type"        , :width => 127, :border_width => 0 },{ :content => self.card_type                                        , :width => 128, :border_width => 0 }]
+      tbl2 << [{ :content => "Transaction ID"   , :width => 127, :border_width => 0 },{ :content => trans.transaction_id.to_s                             , :width => 128, :border_width => 0 }]
+      tbl2 << [{ :content => "Gateway Response" , :width => 127, :border_width => 0 },{ :content => trans.response_code.to_s                              , :width => 128, :border_width => 0 }]
+      tbl3 << [{ :content => "Card Number"      , :width => 127, :border_width => 0 },{ :content => "XXXX XXXX XXXX " + self.card_number                  , :width => 128, :border_width => 0 }]
+      tbl3 << [{ :content => "Transaction Time" , :width => 127, :border_width => 0 },{ :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p") , :width => 128, :border_width => 0 }]
+      tbl3 << [{ :content => "Payment Process"  , :width => 127, :border_width => 0 },{ :content => trans.success ? "Successful" : "Failed"               , :width => 128, :border_width => 0 }]
+      
+      tbl << [{ :content => "Authorization Details", :colspan => 2, :font_style => :bold }]
       tbl << [
         { :content => tbl2, :width => 255 },
         { :content => tbl3, :width => 255 }

data/app/models/caboose/pending_orders_pdf.rb

@@ -67,22 +67,11 @@ module Caboose
       ba = order.billing_address
       billed_to = []
       if ba
-        billed_to << [
-          { :content => "Name", :border_width => 0 },
-          { :content => "#{ba.first_name} #{ba.last_name}", :border_width => 0}
-        ]
-        billed_to << [
-          { :content => "Address", :border_width => 0 },
-          { :content => "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}", :border_width => 0}
-        ]
-        billed_to << [
-          { :content => "Email", :border_width => 0 },
-          { :content => "#{c.email}", :border_width => 0}
-        ]
-        billed_to << [
-          { :content => "Phone", :border_width => 0 },
-          { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
-        ]
+        ba_address = "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}"
+        billed_to << [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => "#{ba.first_name} #{ba.last_name}" , :border_width => 0, :width => 200 }]
+        billed_to << [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => ba_address                         , :border_width => 0, :width => 200 }]
+        billed_to << [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }]
+        billed_to << [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]
       else
         billed_to << [{ :content => "Name"    , :border_width => 0 }]
         billed_to << [{ :content => "Address" , :border_width => 0 }]
@@ -93,22 +82,11 @@ module Caboose
       sa = order.shipping_address
       shipped_to = []
       if sa
-        shipped_to << [
-          { :content => "Name", :border_width => 0 },
-          { :content => "#{sa.first_name} #{sa.last_name}", :border_width => 0}
-        ]
-        shipped_to << [
-          { :content => "Address", :border_width => 0 },
-          { :content => "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}", :border_width => 0}
-        ]
-        shipped_to << [
-          { :content => "Email", :border_width => 0 },
-          { :content => "#{c.email}", :border_width => 0}
-        ]
-        shipped_to << [
-          { :content => "Phone", :border_width => 0 },
-          { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
-        ]
+        sa_address = "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}"
+        shipped_to << [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => "#{sa.first_name} #{sa.last_name}" , :border_width => 0, :width => 200 }]
+        shipped_to << [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => sa_address                         , :border_width => 0, :width => 200 }]
+        shipped_to << [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }]
+        shipped_to << [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]
       else
         shipped_to << [{ :content => "Name"    , :border_width => 0 }]
         shipped_to << [{ :content => "Address" , :border_width => 0 }]
@@ -134,15 +112,15 @@ module Caboose
       
       tbl = []
       tbl << [
-        { :content => "Package"            , :align => :left, :valign => :bottom },
-        { :content => "Product"            , :align => :left, :valign => :bottom, :colspan => 2 },
-        { :content => "Attributes" , :align => :left, :valign => :bottom },
-         { :content => "Quantity"        , :align => :right, :valign => :bottom },        
-        { :content => "Price"      , :align => :right, :valign => :bottom },
-        { :content => "Amount"        , :align => :right, :valign => :bottom }
+        { :content => "Package"    , :align => :left  , :valign => :bottom },
+        { :content => "Product"    , :align => :left  , :valign => :bottom , :colspan => 2 },
+        { :content => "Attributes" , :align => :left  , :valign => :bottom },
+        { :content => "Quantity"   , :align => :right , :valign => :bottom },        
+        { :content => "Price"      , :align => :right , :valign => :bottom },
+        { :content => "Amount"     , :align => :right , :valign => :bottom }
       ]
 
-      order.calculate
+      #order.calculate
       
       order.order_packages.all.each do |pk|
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.180'
+  VERSION = '0.5.181'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.180
+  version: 0.5.181
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg