caboose-cms 0.9.33 → 0.9.34

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3fecd24dc788cf43a5134960c9bb8a3f35141626
4
- data.tar.gz: c1565edd471b617bc2f3e7fee837af277498df99
3
+ metadata.gz: 2d9ac08cdca0e00187c69413fdeee6d9d00e2c0b
4
+ data.tar.gz: b20ab6d1168515bb64882f0e598764e498b6ba96
5
5
  SHA512:
6
- metadata.gz: c421c9b315a7ea0fdc6d2e8d0ae9fdd063d10c66cf01a25e72e9ff5830a68b6add1a5c146671611ae0ec85e7e1073d6fa53c933b4c33f7301db1944339037596
7
- data.tar.gz: b4615b0f348ef74c331101f6e33fbd6ce43a73581c67d6ee36cbaba2c403bb7355e4ea816fc12268be8ea2c41dca7dc64bb7f69f259df775093847098986f04f
6
+ metadata.gz: 30cd9b1fd883e91ce40102ca07cf9142aa00a6ff35b52d2c3afe6db85f194fcd3c69bb3ef7d02b358423ed35ec29405f3d92b3f3f709ddad5ad8459f7c15ea39
7
+ data.tar.gz: 5efa962ce01c0bc08f90b0ead4cada55b36a493ea3243682c11ec5cf1900d039343016d11def827ce693bf81749729d59544b5b08033c2d14b8eccef32ddd01e
@@ -3,19 +3,23 @@ store_config = @invoice.site.store_config
3
3
  %>
4
4
  <h1>Invoice #<%= @invoice.invoice_number %></h1>
5
5
 
6
- <div id='overview_table'></div>
7
- <% if @invoice.financial_status == Caboose::Invoice::FINANCIAL_STATUS_PENDING %>
8
- <div id='payment_form'></div>
9
- <div id='payment_message'></div>
10
- <iframe id="relay" name="relay" style='<% if @show_relay %>display: block; width: 800px; height: 400px; border: #000 1px solid;<% else %>display: none;<% end %>'></iframe>
6
+ <% if @invoice.status == Caboose::Invoice::STATUS_CART %>
7
+ <p class='note error'>This invoice is still in cart status. Please <a href='/checkout'>checkout</a> to view this invoice.</p>
8
+ <p><input type='button' value='< Back' class='btn' onclick="window.location='/my-account/invoices';" /></p>
9
+ <% else %>
10
+ <div id='overview_table'></div>
11
+ <% if @invoice.financial_status == Caboose::Invoice::FINANCIAL_STATUS_PENDING %>
12
+ <div id='payment_form'></div>
13
+ <div id='payment_message'></div>
14
+ <iframe id="relay" name="relay" style='<% if @show_relay %>display: block; width: 800px; height: 400px; border: #000 1px solid;<% else %>display: none;<% end %>'></iframe>
15
+ <% end %>
16
+ <div id='invoice_table'></div>
17
+ <div id='message'></div>
18
+ <p>
19
+ <p><input type='button' value='< Back' class='btn' onclick="window.location='/my-account/invoices';" /></p>
20
+ <input type='button' value='Print Invoice' class='btn' onclick='window.location="/my-account/invoices/<%= @invoice.id %>/print";' />
21
+ </p>
11
22
  <% end %>
12
- <div id='invoice_table'></div>
13
- <div id='message'></div>
14
-
15
- <p>
16
- <input type='button' value='< Back' class='btn' onclick="window.location='/my-account/invoices';" />
17
- <input type='button' value='Print Invoice' class='btn' onclick='window.location="/my-account/invoices/<%= @invoice.id %>/print";' />
18
- </p>
19
23
 
20
24
  <% content_for :caboose_js do %>
21
25
  <%= javascript_include_tag 'https://js.stripe.com/v2/' %>
@@ -25,6 +29,7 @@ store_config = @invoice.site.store_config
25
29
  <%= javascript_include_tag 'caboose/my_account_payment_method_controller' %>
26
30
  <script type='text/javascript'>
27
31
 
32
+ <% if @invoice.status != Caboose::Invoice::STATUS_CART %>
28
33
  var controller = false;
29
34
  $(document).ready(function() {
30
35
  controller = new MyAccountInvoiceController({
@@ -32,6 +37,7 @@ $(document).ready(function() {
32
37
  authenticity_token: <%= raw Caboose.json(form_authenticity_token) %>
33
38
  });
34
39
  });
40
+ <% end %>
35
41
 
36
42
  </script>
37
43
  <% end %>
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.9.33'
2
+ VERSION = '0.9.34'
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.9.33
4
+ version: 0.9.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry