caboose-cms 0.5.103 → 0.5.104

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTFkNzMxNWUxMjkyZGUzOTY0NmRkNmNjZDcwYjBiOTkzYjI2MWQ1ZA==
+    NTc4MzdjM2Q1ZDYwZmFmODU1ODNjZDkzMGQ0MGNhMTBjOTE4N2VkMQ==
   data.tar.gz: !binary |-
-    N2YxNDcwMmNlZmIwNjU4MzAwMDljNmQ0ODVlNThkMWVkMmFhZGYyMw==
+    OTE2MzIwNTY0ZGE4ODE2ZWJlOGFiMTg3OGU3MzBmMGE3MzJhMGU3Nw==
 SHA512:
   metadata.gz: !binary |-
-    OTM5MzRhNDNhMmRmYjI4YzVkMTUyYWRlZmI2YmUyNWQxNmYyMTdmMzRiZmM5
-    ODM4Y2MwZTk4ZDQ4ZTI5Mjc2OWY0ODA4MjU1OTYyNzU2Mzk5NDcyN2UyZmM4
-    YzFjZTJmMWI5NjgyMGQ1OTUzNTU4ZDRiZWQ3NTgwOTcwZjEzYTQ=
+    YjMwYTFiNmJhMzY0YWJiNmYzMjJiNTI3ZDUwMGZiNTczNDE5YWUyMzE1Y2Qy
+    MmMwN2NmZjc3YzlkNWZkZGMxMDI1NjAyMzIwNzk4NDZmY2ZlNzU0ZWFmOTU3
+    NTFhMTY5N2MwYWNmMGI1NjU4NWFhMjhhNjFjN2ZlMTg2MzQ4N2E=
   data.tar.gz: !binary |-
-    NGZmMGFiNTdlMTY1M2I3M2ZjNjJmMmU1ZGQwZDYxMzU1MGJlOTRiYzhhMDIy
-    ZTZlNzk2NmM2ZDJlMjhmMGIyZGVhMzQ2MDc0YzA3YmU2MjliZmFhNzBjMWUz
-    ZDEzMjZhYjc4NmMyMWYyZjQ1MzkzZWU5NTQ2NTAwMzA4ODQwNWI=
+    MzlhZjhmNjBiZmJkMGI2MzYwYzUzNDY5NDYzOThkODM3ZjMwZTk2NTM4Njdk
+    NzNlMTFmNTdjNWFkNzljZTg1NzhkODVkNmM3ZTkzODJkNmJiN2JiMTdlNTJj
+    MjI4MGViOWQ1OTVmNWJjYjFhY2E2MjhiZDI4ZmM3MmE5ZGFjNDk=

data/app/models/caboose/#Untitled-1#

@@ -0,0 +1,32 @@
+
+      Caboose::Discount => [
+        [ :amount       , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }]        
+      ],
+      Caboose::GiftCard => [
+        [ :total           , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :balance         , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :min_order_total , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],        
+      ],      
+      Caboose::LineItem => [        
+        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+      ],
+      Caboose::OrderTransaction => [
+        [ :amount                , :decimal   , { :precision => 8, :scale => 2, :default => 0 }],        
+      ],
+      Caboose::OrderPackage => [
+        [ :total                , :decimal , { :default => 0.0 }]
+      ],
+      Caboose::Order => [
+        [ :subtotal              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :tax                   , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :shipping              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :handling              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :custom_discount       , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :discount              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :total                 , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :auth_amount           , :decimal  , { :precision => 8, :scale => 2 }]
+      ],      
+      Caboose::Variant => [
+        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :sale_price            , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+      ],

data/app/models/caboose/schema.rb

@@ -54,7 +54,27 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :repeat_start  , 
         :repeat_end        
       ],
-      Caboose::Order => [:shipping_method, :shipping_method_code],      
+      Caboose::Order => [
+        :shipping_method       , 
+        :shipping_method_code  ,
+        :email                 ,
+        :order_number          ,
+        :payment_id            ,
+        :gateway_id            ,
+        :date_authorized       ,
+        :date_captured         ,
+        :date_cancelled        ,                
+        :shipping_carrier      ,
+        :shipping_service_code ,
+        :shipping_service_name ,        
+        :transaction_id        ,
+        :transaction_id        ,
+        :transaction_service   ,
+        :amount_discounted     ,
+        :auth_code             ,                
+        :date_shipped          ,                        
+        :decremented           
+      ],        
       #Caboose::PageCache => [:block],
       Caboose::ShippingPackage => [:price, :carrier, :service_code, :service_name, :shipping_method_id, :length, :width, :height],
       Caboose::Site => [:shipping_cost_function],
@@ -237,7 +257,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Discount => [
         [ :gift_card_id , :integer  ],
         [ :order_id     , :integer  ],                
-        [ :amount       , :numeric  , { :default => 0.0 }]        
+        [ :amount       , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }]        
       ],
       Caboose::Domain => [
         [ :site_id            , :integer ],
@@ -250,9 +270,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name            , :string   ],
         [ :code            , :string   ],
         [ :card_type       , :string   ],
-        [ :total           , :numeric  , { :default => 0.0 }],
-        [ :balance         , :numeric  , { :default => 0.0 }],
-        [ :min_order_total , :numeric , { :default => 0.0 }],        
+        [ :total           , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :balance         , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :min_order_total , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],        
         [ :date_available  , :datetime ],
         [ :date_expires    , :datetime ],
         [ :status          , :string   ]                                
@@ -265,7 +285,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :quantity              , :integer   , :default => 0 ],
         [ :status                , :string   ],
         [ :tracking_number       , :string   ],        
-        [ :price                 , :numeric   , :default => 0 ],
+        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
         [ :notes                 , :text     ],
         [ :custom1               , :string   ],
         [ :custom2               , :string   ],
@@ -292,7 +312,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :order_id              , :integer  ],
         [ :date_processed        , :datetime ],
         [ :transaction_type      , :string   ],
-        [ :amount                , :numeric   , :default => 0 ],        
+        [ :amount                , :decimal   , { :precision => 8, :scale => 2, :default => 0 }],        
         [ :transaction_id        , :string   ],
         [ :auth_code             , :string   ],
         [ :response_code         , :string   ],
@@ -308,18 +328,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :shipping_package_id  , :integer ],
         [ :status               , :string  ],
         [ :tracking_number      , :string  ],
-        [ :total                , :decimal , { :default => 0.0 }]
+        [ :total                , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }]
       ],
       Caboose::Order => [
         [ :site_id               , :integer  ],
         [ :alternate_id          , :integer  ],        
-        [ :subtotal              , :numeric   , :default => 0.00 ],
-        [ :tax                   , :numeric   , :default => 0.00 ],
-        [ :shipping              , :numeric   , :default => 0.00 ],
-        [ :handling              , :numeric   , :default => 0.00 ],
-        [ :custom_discount       , :numeric   , :default => 0.00 ],
-        [ :discount              , :numeric   , :default => 0.00 ],
-        [ :total                 , :numeric   , :default => 0.00 ],
+        [ :subtotal              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :tax                   , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :shipping              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :handling              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :custom_discount       , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :discount              , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :total                 , :decimal  , { :precision => 8, :scale => 2, :default => 0.00 }],
         [ :customer_id           , :integer  ],
         [ :financial_status      , :string   ],
         [ :shipping_address_id   , :integer  ],
@@ -330,7 +350,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
         [ :landing_page_ref      , :string   ],
-        [ :auth_amount           , :numeric  ]
+        [ :auth_amount           , :decimal  , { :precision => 8, :scale => 2 }]
         
         #[ :email                 , :string   ],
         #[ :order_number          , :string   ],
@@ -624,8 +644,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :alternate_id          , :string   ],
         [ :sku                   , :string   ],
         [ :barcode               , :string   ],
-        [ :price                 , :numeric   , :default => 0.00 ],
-        [ :sale_price            , :numeric   , :default => 0.00 ],
+        [ :price                 , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
+        [ :sale_price            , :decimal   , { :precision => 8, :scale => 2, :default => 0.00 }],
         [ :date_sale_starts      , :datetime ],
         [ :date_sale_end         , :datetime ],
         [ :available             , :boolean  ],
@@ -645,10 +665,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :taxable               , :boolean  ],        
         [ :shipping_unit_value   , :numeric  ],        
         [ :status                , :string   ],
-        [ :option1_sort_order    , :integer  , { :defult => 0 }],
-        [ :option2_sort_order    , :integer  , { :defult => 0 }],
-        [ :option3_sort_order    , :integer  , { :defult => 0 }],
-        [ :sort_order            , :integer  , { :defult => 0 }]
+        [ :option1_sort_order    , :integer  , { :default => 0 }],
+        [ :option2_sort_order    , :integer  , { :default => 0 }],
+        [ :option3_sort_order    , :integer  , { :default => 0 }],
+        [ :sort_order            , :integer  , { :default => 0 }]
       ],
       Caboose::Vendor => [
         [ :site_id      , :integer    ],

data/app/views/caboose/blocks/#_checkbox.html.erb#

@@ -0,0 +1,10 @@
+<%
+checked = block.value
+checked = 0 if checked.nil?
+checked = checked == 1 || checked == '1' ? true : false
+%>
+<% if editing %>
+  <div id='block_<%= block.id %>'><%= raw block.block_type.description %> = <%= (checked ? "Yes" : "No") %></div>
+<% else %>
+  <%= raw block.block_type.description %>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.103'
+  VERSION = '0.5.104'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.103
+  version: 0.5.104
 platform: ruby
 authors:
 - William Barry
@@ -544,6 +544,7 @@ files:
 - app/helpers/caboose/products_helper.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
+- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb
@@ -649,8 +650,9 @@ files:
 - app/views/caboose/block_types/admin_edit_icon.html.erb
 - app/views/caboose/block_types/admin_index.html.erb
 - app/views/caboose/block_types/admin_new.html.erb
+- app/views/caboose/blocks/#Untitled-2#
+- app/views/caboose/blocks/#_checkbox.html.erb#
 - app/views/caboose/blocks/_block.html.erb
-- app/views/caboose/blocks/_checkbox.html.erb
 - app/views/caboose/blocks/_controller_view_content.html.erb
 - app/views/caboose/blocks/_file.html.erb
 - app/views/caboose/blocks/_heading.html.erb