caboose-cms 0.5.169 → 0.5.170
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 +8 -8
- data/app/assets/javascripts/caboose/my_account_edit_order.js +11 -4
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
NzAwYTBkNTk5NjJjYzI1ZTM2ODFlYTk3YWE5NDBhMDRiNzEzMjg4ZQ==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
YTM3YTc5ZGQ4MDk2OTdhZGQ5YWFjYmMzZDFmMWZiY2RmNzA3MGUxOQ==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
MWRlZTYxMjU2OTBmMjUwZDAwZDg2MjYyMDM1ZGY5ZjM4NDhlODEzZjY3MDlm
|
|
10
|
+
MDhiNGI0NjZkNzdhZDc0OGM3YzQ5ZjM0MTFhYTNhMTJmMjEwMzU2NmVkMzgw
|
|
11
|
+
NzlmMGM0Y2I4NzhhMWQ0ZTgzYzUzOWMzN2IwN2QxNzU1NTZiMWE=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
NWM1YWY5NDVmZDc0ZjYzOTUwMDRmYmE0NmQ0Y2RlNWMyNzU1ZDVmYjg0NmM0
|
|
14
|
+
MTZiZmQ4OGY0ZWFlZDkxMDhmNjUyZDRjNjkwNjhhN2FmNjNiZGU1MDgyZjM5
|
|
15
|
+
MmU2N2MxYWJkZWY2NTcxMTE5YWE5MjAwMDg5NGU1NzY5Njc2NmY=
|
|
@@ -17,12 +17,13 @@ MyAccountOrderController.prototype = {
|
|
|
17
17
|
$(document).ready(function() { that.refresh(); });
|
|
18
18
|
},
|
|
19
19
|
|
|
20
|
-
refresh: function()
|
|
20
|
+
refresh: function(after)
|
|
21
21
|
{
|
|
22
22
|
var that = this;
|
|
23
23
|
that.refresh_order(function() {
|
|
24
24
|
$('#order_table').html("<p class='loading'>Getting order...</p>");
|
|
25
|
-
that.print();
|
|
25
|
+
that.print();
|
|
26
|
+
if (after) after();
|
|
26
27
|
});
|
|
27
28
|
},
|
|
28
29
|
|
|
@@ -110,7 +111,7 @@ MyAccountOrderController.prototype = {
|
|
|
110
111
|
.append($('<td/>').attr('valign', 'top').attr('id', 'shipping_address' ).append(that.noneditable_shipping_address()))
|
|
111
112
|
.append($('<td/>').attr('valign', 'top').attr('id', 'billing_address' ).append(that.noneditable_billing_address()))
|
|
112
113
|
.append($('<td/>').attr('valign', 'top').attr('align', 'center').append($('<p/>').html(capitalize_first_letter(that.order.status))))
|
|
113
|
-
.append($('<td/>').attr('valign', 'top').attr('align', 'center').append(fstatus))
|
|
114
|
+
.append($('<td/>').attr('valign', 'top').attr('id', 'financial_status' ).attr('align', 'center').append(fstatus))
|
|
114
115
|
);
|
|
115
116
|
return table;
|
|
116
117
|
},
|
|
@@ -447,10 +448,16 @@ MyAccountOrderController.prototype = {
|
|
|
447
448
|
|
|
448
449
|
payment_relay_handler: function(resp)
|
|
449
450
|
{
|
|
451
|
+
var that = this;
|
|
450
452
|
console.log('RELAY');
|
|
451
453
|
console.log(resp);
|
|
452
454
|
if (resp.success == true)
|
|
453
|
-
|
|
455
|
+
{
|
|
456
|
+
$('#payment_form').empty();
|
|
457
|
+
$('#payment_message').empty().html("<p class='success'>Your payment has been processed successfully.</p>");
|
|
458
|
+
setTimeout(function() { $('#payment_message').empty() }, 5000);
|
|
459
|
+
that.refresh();
|
|
460
|
+
}
|
|
454
461
|
else if (resp.error)
|
|
455
462
|
$('#payment_message').html("<p class='note error'>" + resp.error + "</p>");
|
|
456
463
|
else
|
data/lib/caboose/version.rb
CHANGED