caboose-cms 0.9.212 → 0.9.213
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
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 18d517c4802e66cdc98e817d7addb3c8813f95a459de1d516be2c121d006f0ba
|
|
4
|
+
data.tar.gz: 9065ccfd1e7f6abe36401930a50046f699062d13c7f81657fffa3a6e850e1351
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 67f8b5c5f80f9f50a1d0b814e190984a9106c6c0e449d26bc97200c247685106ea1b95f536ae535168c586ed8f6e5b2415a94c396ae2ae6459795253b4ae1e4d
|
|
7
|
+
data.tar.gz: add7893d1c503a86de172037751b9918281ba94e2c5b95aa2ba2259f5235d577f71bcd6b9a30ef661ade2c9fec870e61b4b1bc90ff91878add88c67858db74f4
|
|
@@ -11,11 +11,14 @@ module Caboose
|
|
|
11
11
|
invoice_ids = Colonnade::SuiteMenu.where(:menu_id => menu_ids).pluq(:invoice_id) if !menu_ids.blank?
|
|
12
12
|
invoice_ids = invoice_ids.to_s.gsub('[','').gsub(']','')
|
|
13
13
|
end
|
|
14
|
+
|
|
15
|
+
status = request.fullpath == '/admin/invoices' ? Caboose::Invoice::STATUS_PENDING : ''
|
|
14
16
|
|
|
15
17
|
@pager = Caboose::PageBarGenerator.new(params, {
|
|
16
18
|
'site_id' => @site.id,
|
|
17
19
|
'customer_id' => params[:user_id] ? params[:user_id] : '',
|
|
18
|
-
'status' =>
|
|
20
|
+
'status' => status,
|
|
21
|
+
'financial_status' => '',
|
|
19
22
|
'shipping_method_code' => '',
|
|
20
23
|
'id' => '',
|
|
21
24
|
'invoice_number' => '',
|
|
@@ -3,11 +3,6 @@
|
|
|
3
3
|
<% if @edituser %>
|
|
4
4
|
<%= render :partial => 'caboose/users/admin_header' %>
|
|
5
5
|
<% else %>
|
|
6
|
-
<div id='crumbtrail'>
|
|
7
|
-
<a href='/admin'>Admin</a> >
|
|
8
|
-
<a href='/admin/invoices'>Invoices</a> >
|
|
9
|
-
Invoice #<%= @invoice.invoice_number %>
|
|
10
|
-
</div>
|
|
11
6
|
<h1>Edit Invoice #<%= @invoice.invoice_number %></h1>
|
|
12
7
|
<% end %>
|
|
13
8
|
|
|
@@ -23,26 +18,6 @@
|
|
|
23
18
|
|
|
24
19
|
</div>
|
|
25
20
|
|
|
26
|
-
|
|
27
|
-
<!--
|
|
28
|
-
<p>
|
|
29
|
-
<input type='button' value='< Back' onclick="window.location='/admin/invoices';" />
|
|
30
|
-
<% if @invoice.financial_status == Caboose::Invoice::FINANCIAL_STATUS_AUTHORIZED && @invoice.total > 0.00 %>
|
|
31
|
-
<input type='button' value='Capture Funds' onclick="controller.capture_funds();" />
|
|
32
|
-
<input type='button' value='Void' onclick="controller.void_invoice();" />
|
|
33
|
-
<% end %>
|
|
34
|
-
<% if @invoice.financial_status == Caboose::Invoice::FINANCIAL_STATUS_CAPTURED && @invoice.total > 0.00 %>
|
|
35
|
-
<input type='button' value='Refund' onclick="refund_invoice(<%= @invoice.id %>);" />
|
|
36
|
-
<% end %>
|
|
37
|
-
<input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @invoice.id %>)" />
|
|
38
|
-
<input type='button' value='Add Item' onclick="controller.add_variant();" />
|
|
39
|
-
<input type='button' value='Print Invoice' onclick="controller.print_invoice(<%= @invoice.id %>);" />
|
|
40
|
-
|
|
41
|
-
<% str = Caboose.plugin_hook('admin_edit_invoice_buttons', "", @invoice) %>
|
|
42
|
-
<% if str %><%= raw str %><% end %>
|
|
43
|
-
</p>
|
|
44
|
-
-->
|
|
45
|
-
|
|
46
21
|
<% content_for :caboose_js do %>
|
|
47
22
|
<%= javascript_include_tag 'caboose/model/all' %>
|
|
48
23
|
<%= javascript_include_tag 'caboose/admin_edit_invoice' %>
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
<p><input type='text' name='total_lte' placeholder='Total Max' value="<%= @pager.params['total_lte'] %>" style='width: 100px;' /></p>
|
|
40
40
|
<p>
|
|
41
41
|
<!--
|
|
42
|
-
<select name='status'>
|
|
42
|
+
<select name='status'>
|
|
43
43
|
<optgroup label='Status'>
|
|
44
44
|
<option value=''>-- All statuses --</option>
|
|
45
45
|
<% statuses = ['cart','pending','canceled','ready to ship','shipped','paid'] %>
|
|
@@ -61,7 +61,6 @@
|
|
|
61
61
|
statuses.each do |status|
|
|
62
62
|
all_checked = false if !@pager.params['status'].include?(status)
|
|
63
63
|
end
|
|
64
|
-
Caboose.log(@pager.params['status'])
|
|
65
64
|
%>
|
|
66
65
|
Status:
|
|
67
66
|
<% statuses.each do |status| %>
|
|
@@ -118,6 +117,14 @@
|
|
|
118
117
|
<%= render :partial => 'caboose/users/admin_footer' %>
|
|
119
118
|
<% end %>
|
|
120
119
|
|
|
120
|
+
<% content_for :caboose_css do %>
|
|
121
|
+
<style>
|
|
122
|
+
#search_form > p {
|
|
123
|
+
margin: 0;
|
|
124
|
+
padding: 0 0 10px 0;
|
|
125
|
+
}
|
|
126
|
+
</style>
|
|
127
|
+
<% end %>
|
|
121
128
|
<% content_for :caboose_js do %>
|
|
122
129
|
<script type='text/javascript'>
|
|
123
130
|
var modal = false;
|
data/lib/caboose/version.rb
CHANGED