caboose-cms 0.9.24 → 0.9.25
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1c76cc4d051c4c5728a3de82a4bd26538dc2d543
|
4
|
+
data.tar.gz: 5730fc257cb7dc80e2992165264cb9609666a8a6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f66f9175c5e7d4519e966884621f20c5a4a5a919acd1b0a4f61dd16d4ab2e6c516bb44c4f106da56b543b1c369286bb2d2a26efb3fcf2e41aa91f5c23a8161b2
|
7
|
+
data.tar.gz: 1f960d2ed8ce16d6233c67dad36f79f452b037ed02c4b4f83b9c31282b5972440ec4ce73ec574ff0e37793b47b05f08e66b65b02dcf123d08337fd77e75477d4
|
@@ -35,7 +35,9 @@ ShippingAddressController.prototype = {
|
|
35
35
|
var name = sa ? sa.first_name + ' ' + sa.last_name : '';
|
36
36
|
if (name.length == 0) name = '[Empty name]';
|
37
37
|
var address = sa && sa.address1.length > 0 ? sa.address1 : '[Empty address]'
|
38
|
-
var city_state_zip = sa ? (sa.city
|
38
|
+
var city_state_zip = sa ? (sa.city && sa.city.length > 0 ? sa.city : '[Empty city]') + ', ' +
|
39
|
+
(sa.state && sa.state.length > 0 ? sa.state : '[Empty state]') + ' ' +
|
40
|
+
(sa.zip && sa.zip.length > 0 ? sa.zip : '[Empty zip]') : '';
|
39
41
|
|
40
42
|
div.append($('<span/>').addClass('name' ).html(name )).append($('<br/>'));
|
41
43
|
if (sa && sa.company && sa.company.length > 0) div.append($('<span/>').addClass('company' ).html(sa.company )).append($('<br/>'));
|
data/lib/caboose/version.rb
CHANGED