caboose-cms 0.5.103 → 0.5.104

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +8 -8
  2. data/app/models/caboose/#Untitled-1# +32 -0
  3. data/app/models/caboose/schema.rb +42 -22
  4. data/app/views/caboose/blocks/{_checkbox.html.erb → #Untitled-2#} +0 -0
  5. data/app/views/caboose/blocks/#_checkbox.html.erb# +10 -0
  6. data/lib/caboose/version.rb +1 -1
  7. metadata +4 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NTFkNzMxNWUxMjkyZGUzOTY0NmRkNmNjZDcwYjBiOTkzYjI2MWQ1ZA==
4
+ NTc4MzdjM2Q1ZDYwZmFmODU1ODNjZDkzMGQ0MGNhMTBjOTE4N2VkMQ==
5
5
  data.tar.gz: !binary |-
6
- N2YxNDcwMmNlZmIwNjU4MzAwMDljNmQ0ODVlNThkMWVkMmFhZGYyMw==
6
+ OTE2MzIwNTY0ZGE4ODE2ZWJlOGFiMTg3OGU3MzBmMGE3MzJhMGU3Nw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- OTM5MzRhNDNhMmRmYjI4YzVkMTUyYWRlZmI2YmUyNWQxNmYyMTdmMzRiZmM5
10
- ODM4Y2MwZTk4ZDQ4ZTI5Mjc2OWY0ODA4MjU1OTYyNzU2Mzk5NDcyN2UyZmM4
11
- YzFjZTJmMWI5NjgyMGQ1OTUzNTU4ZDRiZWQ3NTgwOTcwZjEzYTQ=
9
+ YjMwYTFiNmJhMzY0YWJiNmYzMjJiNTI3ZDUwMGZiNTczNDE5YWUyMzE1Y2Qy
10
+ MmMwN2NmZjc3YzlkNWZkZGMxMDI1NjAyMzIwNzk4NDZmY2ZlNzU0ZWFmOTU3
11
+ NTFhMTY5N2MwYWNmMGI1NjU4NWFhMjhhNjFjN2ZlMTg2MzQ4N2E=
12
12
  data.tar.gz: !binary |-
13
- NGZmMGFiNTdlMTY1M2I3M2ZjNjJmMmU1ZGQwZDYxMzU1MGJlOTRiYzhhMDIy
14
- ZTZlNzk2NmM2ZDJlMjhmMGIyZGVhMzQ2MDc0YzA3YmU2MjliZmFhNzBjMWUz
15
- ZDEzMjZhYjc4NmMyMWYyZjQ1MzkzZWU5NTQ2NTAwMzA4ODQwNWI=
13
+ MzlhZjhmNjBiZmJkMGI2MzYwYzUzNDY5NDYzOThkODM3ZjMwZTk2NTM4Njdk
14
+ NzNlMTFmNTdjNWFkNzljZTg1NzhkODVkNmM3ZTkzODJkNmJiN2JiMTdlNTJj
15
+ MjI4MGViOWQ1OTVmNWJjYjFhY2E2MjhiZDI4ZmM3MmE5ZGFjNDk=
data/app/models/caboose/#Untitled-1# ADDED
@@ -0,0 +1,32 @@
1
+
2
+ Caboose::Discount => [
3
+ [ :amount , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }]
4
+ ],
5
+ Caboose::GiftCard => [
6
+ [ :total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
7
+ [ :balance , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
8
+ [ :min_order_total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
9
+ ],
10
+ Caboose::LineItem => [
11
+ [ :price , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
12
+ ],
13
+ Caboose::OrderTransaction => [
14
+ [ :amount , :decimal , { :precision => 8, :scale => 2, :default => 0 }],
15
+ ],
16
+ Caboose::OrderPackage => [
17
+ [ :total , :decimal , { :default => 0.0 }]
18
+ ],
19
+ Caboose::Order => [
20
+ [ :subtotal , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
21
+ [ :tax , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
22
+ [ :shipping , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
23
+ [ :handling , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
24
+ [ :custom_discount , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
25
+ [ :discount , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
26
+ [ :total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
27
+ [ :auth_amount , :decimal , { :precision => 8, :scale => 2 }]
28
+ ],
29
+ Caboose::Variant => [
30
+ [ :price , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
31
+ [ :sale_price , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
32
+ ],
data/app/models/caboose/schema.rb CHANGED
@@ -54,7 +54,27 @@ class Caboose::Schema < Caboose::Utilities::Schema
54
54
  :repeat_start ,
55
55
  :repeat_end
56
56
  ],
57
- Caboose::Order => [:shipping_method, :shipping_method_code],
57
+ Caboose::Order => [
58
+ :shipping_method ,
59
+ :shipping_method_code ,
60
+ :email ,
61
+ :order_number ,
62
+ :payment_id ,
63
+ :gateway_id ,
64
+ :date_authorized ,
65
+ :date_captured ,
66
+ :date_cancelled ,
67
+ :shipping_carrier ,
68
+ :shipping_service_code ,
69
+ :shipping_service_name ,
70
+ :transaction_id ,
71
+ :transaction_id ,
72
+ :transaction_service ,
73
+ :amount_discounted ,
74
+ :auth_code ,
75
+ :date_shipped ,
76
+ :decremented
77
+ ],
58
78
  #Caboose::PageCache => [:block],
59
79
  Caboose::ShippingPackage => [:price, :carrier, :service_code, :service_name, :shipping_method_id, :length, :width, :height],
60
80
  Caboose::Site => [:shipping_cost_function],
@@ -237,7 +257,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
237
257
  Caboose::Discount => [
238
258
  [ :gift_card_id , :integer ],
239
259
  [ :order_id , :integer ],
240
- [ :amount , :numeric , { :default => 0.0 }]
260
+ [ :amount , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }]
241
261
  ],
242
262
  Caboose::Domain => [
243
263
  [ :site_id , :integer ],
@@ -250,9 +270,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
250
270
  [ :name , :string ],
251
271
  [ :code , :string ],
252
272
  [ :card_type , :string ],
253
- [ :total , :numeric , { :default => 0.0 }],
254
- [ :balance , :numeric , { :default => 0.0 }],
255
- [ :min_order_total , :numeric , { :default => 0.0 }],
273
+ [ :total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
274
+ [ :balance , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
275
+ [ :min_order_total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
256
276
  [ :date_available , :datetime ],
257
277
  [ :date_expires , :datetime ],
258
278
  [ :status , :string ]
@@ -265,7 +285,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
265
285
  [ :quantity , :integer , :default => 0 ],
266
286
  [ :status , :string ],
267
287
  [ :tracking_number , :string ],
268
- [ :price , :numeric , :default => 0 ],
288
+ [ :price , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
269
289
  [ :notes , :text ],
270
290
  [ :custom1 , :string ],
271
291
  [ :custom2 , :string ],
@@ -292,7 +312,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
292
312
  [ :order_id , :integer ],
293
313
  [ :date_processed , :datetime ],
294
314
  [ :transaction_type , :string ],
295
- [ :amount , :numeric , :default => 0 ],
315
+ [ :amount , :decimal , { :precision => 8, :scale => 2, :default => 0 }],
296
316
  [ :transaction_id , :string ],
297
317
  [ :auth_code , :string ],
298
318
  [ :response_code , :string ],
@@ -308,18 +328,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
308
328
  [ :shipping_package_id , :integer ],
309
329
  [ :status , :string ],
310
330
  [ :tracking_number , :string ],
311
- [ :total , :decimal , { :default => 0.0 }]
331
+ [ :total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }]
312
332
  ],
313
333
  Caboose::Order => [
314
334
  [ :site_id , :integer ],
315
335
  [ :alternate_id , :integer ],
316
- [ :subtotal , :numeric , :default => 0.00 ],
317
- [ :tax , :numeric , :default => 0.00 ],
318
- [ :shipping , :numeric , :default => 0.00 ],
319
- [ :handling , :numeric , :default => 0.00 ],
320
- [ :custom_discount , :numeric , :default => 0.00 ],
321
- [ :discount , :numeric , :default => 0.00 ],
322
- [ :total , :numeric , :default => 0.00 ],
336
+ [ :subtotal , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
337
+ [ :tax , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
338
+ [ :shipping , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
339
+ [ :handling , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
340
+ [ :custom_discount , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
341
+ [ :discount , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
342
+ [ :total , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
323
343
  [ :customer_id , :integer ],
324
344
  [ :financial_status , :string ],
325
345
  [ :shipping_address_id , :integer ],
@@ -330,7 +350,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
330
350
  [ :referring_site , :text ],
331
351
  [ :landing_page , :string ],
332
352
  [ :landing_page_ref , :string ],
333
- [ :auth_amount , :numeric ]
353
+ [ :auth_amount , :decimal , { :precision => 8, :scale => 2 }]
334
354
 
335
355
  #[ :email , :string ],
336
356
  #[ :order_number , :string ],
@@ -624,8 +644,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
624
644
  [ :alternate_id , :string ],
625
645
  [ :sku , :string ],
626
646
  [ :barcode , :string ],
627
- [ :price , :numeric , :default => 0.00 ],
628
- [ :sale_price , :numeric , :default => 0.00 ],
647
+ [ :price , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
648
+ [ :sale_price , :decimal , { :precision => 8, :scale => 2, :default => 0.00 }],
629
649
  [ :date_sale_starts , :datetime ],
630
650
  [ :date_sale_end , :datetime ],
631
651
  [ :available , :boolean ],
@@ -645,10 +665,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
645
665
  [ :taxable , :boolean ],
646
666
  [ :shipping_unit_value , :numeric ],
647
667
  [ :status , :string ],
648
- [ :option1_sort_order , :integer , { :defult => 0 }],
649
- [ :option2_sort_order , :integer , { :defult => 0 }],
650
- [ :option3_sort_order , :integer , { :defult => 0 }],
651
- [ :sort_order , :integer , { :defult => 0 }]
668
+ [ :option1_sort_order , :integer , { :default => 0 }],
669
+ [ :option2_sort_order , :integer , { :default => 0 }],
670
+ [ :option3_sort_order , :integer , { :default => 0 }],
671
+ [ :sort_order , :integer , { :default => 0 }]
652
672
  ],
653
673
  Caboose::Vendor => [
654
674
  [ :site_id , :integer ],
data/app/views/caboose/blocks/#_checkbox.html.erb# ADDED
@@ -0,0 +1,10 @@
1
+ <%
2
+ checked = block.value
3
+ checked = 0 if checked.nil?
4
+ checked = checked == 1 || checked == '1' ? true : false
5
+ %>
6
+ <% if editing %>
7
+ <div id='block_<%= block.id %>'><%= raw block.block_type.description %> = <%= (checked ? "Yes" : "No") %></div>
8
+ <% else %>
9
+ <%= raw block.block_type.description %>
10
+ <% end %>
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.5.103'
2
+ VERSION = '0.5.104'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.103
4
+ version: 0.5.104
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
@@ -544,6 +544,7 @@ files:
544
544
  - app/helpers/caboose/products_helper.rb
545
545
  - app/mailers/caboose/login_mailer.rb
546
546
  - app/mailers/caboose/orders_mailer.rb
547
+ - app/models/caboose/#Untitled-1#
547
548
  - app/models/caboose/ab_option.rb
548
549
  - app/models/caboose/ab_testing.rb
549
550
  - app/models/caboose/ab_value.rb
@@ -649,8 +650,9 @@ files:
649
650
  - app/views/caboose/block_types/admin_edit_icon.html.erb
650
651
  - app/views/caboose/block_types/admin_index.html.erb
651
652
  - app/views/caboose/block_types/admin_new.html.erb
653
+ - app/views/caboose/blocks/#Untitled-2#
654
+ - app/views/caboose/blocks/#_checkbox.html.erb#
652
655
  - app/views/caboose/blocks/_block.html.erb
653
- - app/views/caboose/blocks/_checkbox.html.erb
654
656
  - app/views/caboose/blocks/_controller_view_content.html.erb
655
657
  - app/views/caboose/blocks/_file.html.erb
656
658
  - app/views/caboose/blocks/_heading.html.erb