caboose-cms 0.7.45 → 0.7.46
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.
- checksums.yaml +4 -4
- data/app/controllers/caboose/variants_controller.rb +3 -0
- data/app/models/caboose/schema.rb +1 -0
- data/app/models/caboose/variant.rb +1 -0
- data/app/views/caboose/variants/admin_edit.html.erb +3 -1
- data/app/views/caboose/variants/admin_index.html.erb +2 -1
- data/lib/caboose/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 886ac376765988b984868dce363f22e9b9b052ab
|
|
4
|
+
data.tar.gz: 275663e37010387c36431a065692b4af6c4e63fc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 971bbf0b06002f79cc7014db7bd37791bb11cab68ae7386adc287b8067fc6f2f831068e5a9d6e03e0e3fa7b4e8e58bcb5a7e5ba9700f653d1ab0d96c414f5283
|
|
7
|
+
data.tar.gz: 6096afa69d336978603055de68544e5154a0fd87b9186d1bbff025084fbc50e339925a0283ca56c0f32c412cb0a289cf24b7cad12c7a5a52d636074298c5420e
|
|
@@ -129,6 +129,7 @@ module Caboose
|
|
|
129
129
|
when 'ignore_quantity' then v.ignore_quantity = value
|
|
130
130
|
when 'allow_backorder' then v.allow_backorder = value
|
|
131
131
|
when 'clearance' then v.clearance = value
|
|
132
|
+
when 'clearance_price' then v.clearance_price = value
|
|
132
133
|
when 'status' then v.status = value
|
|
133
134
|
when 'weight' then v.weight = value
|
|
134
135
|
when 'length' then v.length = value
|
|
@@ -443,6 +444,8 @@ module Caboose
|
|
|
443
444
|
when 'quantity_in_stock' then variants.each { |v| v.quantity_in_stock = value }
|
|
444
445
|
when 'ignore_quantity' then variants.each { |v| v.ignore_quantity = value }
|
|
445
446
|
when 'allow_backorder' then variants.each { |v| v.allow_backorder = value }
|
|
447
|
+
when 'clearance' then variants.each { |v| v.clearance = value }
|
|
448
|
+
when 'clearance_price' then variants.each { |v| v.clearance_price = value }
|
|
446
449
|
when 'status' then variants.each { |v| v.status = value }
|
|
447
450
|
when 'weight' then variants.each { |v| v.weight = value }
|
|
448
451
|
when 'length' then variants.each { |v| v.length = value }
|
|
@@ -809,6 +809,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
|
|
|
809
809
|
[ :date_sale_ends , :datetime ],
|
|
810
810
|
[ :date_sale_end , :datetime ],
|
|
811
811
|
[ :clearance , :boolean , { :default => false }],
|
|
812
|
+
[ :clearance_price , :decimal , { :precision => 8, :scale => 2 }],
|
|
812
813
|
[ :available , :boolean , { :default => true }],
|
|
813
814
|
[ :quantity_in_stock , :integer , { :default => 0 }],
|
|
814
815
|
[ :ignore_quantity , :boolean , { :default => false }],
|
|
@@ -40,6 +40,7 @@ v = @variant
|
|
|
40
40
|
<div id='variant_<%= v.id %>_date_sale_ends' ></div>
|
|
41
41
|
<div id='variant_<%= v.id %>_time_sale_ends' ></div>
|
|
42
42
|
<div id='variant_<%= v.id %>_clearance' ></div>
|
|
43
|
+
<div id='variant_<%= v.id %>_clearance_price' ></div>
|
|
43
44
|
</td>
|
|
44
45
|
<td valign='top' colspan='4'4>
|
|
45
46
|
<h2>Flat Rate Shipping</h2>
|
|
@@ -83,7 +84,8 @@ $(document).ready(function() {
|
|
|
83
84
|
{ name: 'sale_price' , nice_name: 'Sale price' , type: 'text' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.sale_price ) %> },
|
|
84
85
|
{ name: 'date_sale_starts' , nice_name: 'Sale starts' , type: 'datetime' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.date_sale_starts ? v.date_sale_starts.in_time_zone(@logged_in_user.timezone).strftime('%m/%d/%Y %I:%M %P') : '') %> },
|
|
85
86
|
{ name: 'date_sale_ends' , nice_name: 'Sale ends' , type: 'datetime' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.date_sale_ends ? v.date_sale_ends.in_time_zone(@logged_in_user.timezone).strftime('%m/%d/%Y %I:%M %P') : '') %> },
|
|
86
|
-
{ name: 'clearance' , nice_name: 'On Clearance' , type: 'checkbox' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.clearance ) %> },
|
|
87
|
+
{ name: 'clearance' , nice_name: 'On Clearance' , type: 'checkbox' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.clearance ) %> },
|
|
88
|
+
{ name: 'clearance_price' , nice_name: 'Clearance price' , type: 'text' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.clearance_price ) %> },
|
|
87
89
|
{ name: 'quantity_in_stock' , nice_name: 'Quantity' , type: 'text' , align: 'right' , width: 250, value: <%= raw Caboose.json(v.quantity_in_stock ) %> },
|
|
88
90
|
{ name: 'ignore_quantity' , nice_name: 'Ignore Quantity' , type: 'checkbox' , align: 'right' , width: 250, value: <%= raw Caboose.json(v.ignore_quantity ) %> },
|
|
89
91
|
{ name: 'weight' , nice_name: 'Weight (<%= sc.weight_unit %>)' , type: 'text' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.weight ) %> },
|
|
@@ -78,7 +78,8 @@ $(document).ready(function() {
|
|
|
78
78
|
{ show: true , name: 'sale_price' , nice_name: 'Sale price' , sort: 'sale_price' , type: 'text' , value: function(v) { return v.sale_price }, width: 75, align: 'right' , bulk_edit: true },
|
|
79
79
|
{ show: false , name: 'date_sale_starts' , nice_name: 'Sale starts' , sort: 'date_sale_starts' , type: 'datetime' , value: function(v) { return v.date_sale_starts }, width: 75, align: 'left' , bulk_edit: true },
|
|
80
80
|
{ show: false , name: 'date_sale_ends' , nice_name: 'Sale ends' , sort: 'date_sale_ends' , type: 'datetime' , value: function(v) { return v.date_sale_ends }, width: 75, align: 'left' , bulk_edit: true },
|
|
81
|
-
{ show: false , name: 'clearance' , nice_name: 'On Clearance' , sort: 'clearance' , type: 'checkbox' , value: function(v) { return v.clearance }, text: function(v) { return v.clearance ? 'Yes' : 'No' }, width: 50, align: 'center' , bulk_edit: true },
|
|
81
|
+
{ show: false , name: 'clearance' , nice_name: 'On Clearance' , sort: 'clearance' , type: 'checkbox' , value: function(v) { return v.clearance }, text: function(v) { return v.clearance ? 'Yes' : 'No' }, width: 50, align: 'center' , bulk_edit: true },
|
|
82
|
+
{ show: true , name: 'clearance_price' , nice_name: 'Clearance price' , sort: 'clearance_price' , type: 'text' , value: function(v) { return v.clearance_price }, width: 75, align: 'right' , bulk_edit: true },
|
|
82
83
|
{ show: true , name: 'quantity_in_stock' , nice_name: 'Quantity' , sort: 'quantity_in_stock' , type: 'text' , value: function(v) { return v.quantity_in_stock }, width: 50, align: 'right' , bulk_edit: true },
|
|
83
84
|
{ show: false , name: 'weight' , nice_name: 'Weight (<%= sc.weight_unit %>)' , sort: 'weight' , type: 'text' , value: function(v) { return v.weight }, width: 50, align: 'right' , bulk_edit: true },
|
|
84
85
|
{ show: false , name: 'length' , nice_name: 'Length (<%= sc.length_unit %>)' , sort: 'length' , type: 'text' , value: function(v) { return v.length }, width: 50, align: 'right' , bulk_edit: true },
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: caboose-cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.46
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- William Barry
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-01-
|
|
11
|
+
date: 2016-01-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pg
|