kaui 0.6.6 → 0.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (202) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +2 -0
  3. data/Gemfile.lock +51 -37
  4. data/README.md +5 -0
  5. data/Rakefile +1 -1
  6. data/app/controllers/kaui/account_emails_controller.rb +26 -44
  7. data/app/controllers/kaui/account_tags_controller.rb +26 -38
  8. data/app/controllers/kaui/account_timelines_controller.rb +47 -50
  9. data/app/controllers/kaui/accounts_controller.rb +68 -148
  10. data/app/controllers/kaui/bundle_tags_controller.rb +32 -21
  11. data/app/controllers/kaui/bundles_controller.rb +44 -69
  12. data/app/controllers/kaui/chargebacks_controller.rb +31 -61
  13. data/app/controllers/kaui/charges_controller.rb +19 -21
  14. data/app/controllers/kaui/credits_controller.rb +22 -36
  15. data/app/controllers/kaui/custom_fields_controller.rb +15 -13
  16. data/app/controllers/kaui/engine_controller.rb +8 -10
  17. data/app/controllers/kaui/invoice_items_controller.rb +24 -41
  18. data/app/controllers/kaui/invoices_controller.rb +36 -46
  19. data/app/controllers/kaui/payment_methods_controller.rb +84 -28
  20. data/app/controllers/kaui/payments_controller.rb +64 -26
  21. data/app/controllers/kaui/refunds_controller.rb +27 -107
  22. data/app/controllers/kaui/subscriptions_controller.rb +88 -132
  23. data/app/controllers/kaui/tag_definitions_controller.rb +32 -79
  24. data/app/controllers/kaui/tags_controller.rb +16 -14
  25. data/app/controllers/kaui/transactions_controller.rb +25 -0
  26. data/app/helpers/kaui/money_helper.rb +8 -0
  27. data/app/helpers/kaui/subscription_helper.rb +115 -0
  28. data/app/helpers/kaui/uuid_helper.rb +9 -0
  29. data/app/models/kaui/ability.rb +2 -2
  30. data/app/models/kaui/account.rb +25 -42
  31. data/app/models/kaui/account_email.rb +11 -48
  32. data/app/models/kaui/account_timeline.rb +1 -5
  33. data/app/models/kaui/audit_log.rb +1 -15
  34. data/app/models/kaui/base.rb +1 -126
  35. data/app/models/kaui/bundle.rb +47 -14
  36. data/app/models/kaui/catalog.rb +2 -0
  37. data/app/models/kaui/chargeback.rb +24 -36
  38. data/app/models/kaui/credit.rb +5 -20
  39. data/app/models/kaui/custom_field.rb +9 -5
  40. data/app/models/kaui/invoice.rb +9 -53
  41. data/app/models/kaui/invoice_item.rb +8 -18
  42. data/app/models/kaui/invoice_payment.rb +24 -0
  43. data/app/models/kaui/payment.rb +14 -32
  44. data/app/models/kaui/payment_method.rb +36 -0
  45. data/app/models/kaui/rails_methods.rb +7 -9
  46. data/app/models/kaui/refund.rb +5 -20
  47. data/app/models/kaui/subscription.rb +7 -27
  48. data/app/models/kaui/tag.rb +10 -6
  49. data/app/models/kaui/tag_definition.rb +26 -34
  50. data/app/models/kaui/transaction.rb +30 -0
  51. data/app/models/kaui/user.rb +2 -0
  52. data/app/views/kaui/account_emails/_form.html.erb +8 -28
  53. data/app/views/kaui/account_emails/show.html.erb +10 -10
  54. data/app/views/kaui/account_tags/_account_tags_table.html.erb +20 -18
  55. data/app/views/kaui/account_tags/_form.html.erb +42 -0
  56. data/app/views/kaui/account_tags/edit.html.erb +1 -41
  57. data/app/views/kaui/account_tags/show.html.erb +6 -3
  58. data/app/views/kaui/account_timelines/show.html.erb +273 -302
  59. data/app/views/kaui/accounts/_form.html.erb +116 -0
  60. data/app/views/kaui/accounts/index.html.erb +13 -11
  61. data/app/views/kaui/accounts/new.html.erb +5 -0
  62. data/app/views/kaui/accounts/show.html.erb +101 -99
  63. data/app/views/kaui/bundle_tags/_bundle_tags_table.html.erb +29 -9
  64. data/app/views/kaui/bundle_tags/_form.html.erb +41 -0
  65. data/app/views/kaui/bundle_tags/edit.html.erb +2 -34
  66. data/app/views/kaui/bundle_tags/show.html.erb +6 -0
  67. data/app/views/kaui/bundles/index.html.erb +9 -9
  68. data/app/views/kaui/bundles/show.html.erb +17 -15
  69. data/app/views/kaui/bundles/transfer.html.erb +25 -24
  70. data/app/views/kaui/chargebacks/_form.html.erb +44 -0
  71. data/app/views/kaui/chargebacks/new.html.erb +3 -115
  72. data/app/views/kaui/charges/_form.html.erb +73 -0
  73. data/app/views/kaui/charges/new.html.erb +2 -91
  74. data/app/views/kaui/credits/_form.html.erb +73 -0
  75. data/app/views/kaui/credits/new.html.erb +2 -85
  76. data/app/views/kaui/invoice_items/edit.html.erb +77 -78
  77. data/app/views/kaui/invoices/show.html.erb +3 -10
  78. data/app/views/kaui/layouts/kaui_application.html.erb +0 -2
  79. data/app/views/kaui/payment_methods/_form.html.erb +30 -0
  80. data/app/views/kaui/payment_methods/_new_creditcard_payment_method.html.erb +19 -18
  81. data/app/views/kaui/payment_methods/_payment_methods_table.html.erb +8 -5
  82. data/app/views/kaui/payment_methods/index.html.erb +10 -10
  83. data/app/views/kaui/payment_methods/new.html.erb +2 -20
  84. data/app/views/kaui/payment_methods/show.html.erb +2 -1
  85. data/app/views/kaui/payments/_payments_table.html.erb +30 -22
  86. data/app/views/kaui/payments/index.html.erb +1 -1
  87. data/app/views/kaui/payments/new.html.erb +5 -5
  88. data/app/views/kaui/payments/show.html.erb +3 -0
  89. data/app/views/kaui/refunds/new.html.erb +96 -104
  90. data/app/views/kaui/subscriptions/_form.html.erb +36 -0
  91. data/app/views/kaui/subscriptions/_subscriptions_table.html.erb +39 -44
  92. data/app/views/kaui/subscriptions/edit.html.erb +24 -35
  93. data/app/views/kaui/subscriptions/index.html.erb +13 -12
  94. data/app/views/kaui/subscriptions/new.html.erb +6 -43
  95. data/app/views/kaui/subscriptions/show.html.erb +32 -25
  96. data/app/views/kaui/tag_definitions/_form.html.erb +10 -37
  97. data/app/views/kaui/tag_definitions/index.html.erb +3 -5
  98. data/app/views/kaui/tag_definitions/show.html.erb +1 -2
  99. data/app/views/kaui/transactions/_form.html.erb +77 -0
  100. data/app/views/kaui/transactions/new.html.erb +3 -0
  101. data/config/initializers/kilbill-client-init.rb +1 -1
  102. data/config/routes.rb +4 -15
  103. data/kaui.gemspec +8 -6
  104. data/lib/kaui/engine.rb +4 -1
  105. data/lib/kaui/version.rb +1 -1
  106. data/lib/kaui.rb +2 -2
  107. data/test/functional/kaui/account_emails_controller_test.rb +28 -0
  108. data/test/functional/kaui/account_tags_controller_test.rb +29 -0
  109. data/test/functional/kaui/account_timelines_controller_test.rb +21 -0
  110. data/test/functional/kaui/accounts_controller_test.rb +56 -50
  111. data/test/functional/kaui/bundle_tags_controller_test.rb +29 -0
  112. data/test/functional/kaui/bundles_controller_test.rb +58 -13
  113. data/test/functional/kaui/chargebacks_controller_test.rb +16 -5
  114. data/test/functional/kaui/charges_controller_test.rb +39 -0
  115. data/test/functional/kaui/credits_controller_test.rb +35 -0
  116. data/test/functional/kaui/custom_fields_controller_test.rb +21 -0
  117. data/test/functional/kaui/functional_test_helper.rb +61 -0
  118. data/test/functional/kaui/invoice_items_controller_test.rb +24 -10
  119. data/test/functional/kaui/invoices_controller_test.rb +41 -13
  120. data/test/functional/kaui/payment_methods_controller_test.rb +49 -0
  121. data/test/functional/kaui/payments_controller_test.rb +32 -5
  122. data/test/functional/kaui/refunds_controller_test.rb +40 -5
  123. data/test/functional/kaui/subscriptions_controller_test.rb +82 -0
  124. data/test/functional/kaui/tag_definitions_controller_test.rb +27 -53
  125. data/test/functional/kaui/tags_controller_test.rb +21 -0
  126. data/test/functional/kaui/transactions_controller_test.rb +32 -0
  127. data/test/integration/kaui/integration_test_helper.rb +31 -0
  128. data/test/integration/kaui/navigation_test.rb +43 -0
  129. data/test/killbill_test_helper.rb +143 -0
  130. data/test/test_helper.rb +10 -227
  131. data/test/unit/kaui/account_email_test.rb +19 -0
  132. data/test/unit/kaui/account_test.rb +7 -35
  133. data/test/unit/kaui/base_test.rb +5 -46
  134. data/test/unit/kaui/date_helper_test.rb +6 -5
  135. data/test/unit/kaui/invoice_item_test.rb +5 -17
  136. data/test/unit/kaui/invoice_payment_test.rb +42 -0
  137. data/test/unit/kaui/invoice_test.rb +15 -15
  138. data/test/unit/kaui/money_helper_test.rb +10 -0
  139. data/test/unit/kaui/payment_test.rb +42 -0
  140. data/test/unit/kaui/tag_definition_test.rb +5 -28
  141. data/test/unit/kaui/uuid_helper_test.rb +10 -0
  142. metadata +134 -159
  143. data/app/controllers/kaui/analytics_controller.rb +0 -28
  144. data/app/helpers/kaui/killbill_helper.rb +0 -611
  145. data/app/models/kaui/analytics.rb +0 -19
  146. data/app/models/kaui/analytics_sanity.rb +0 -7
  147. data/app/models/kaui/business_account.rb +0 -12
  148. data/app/models/kaui/business_field.rb +0 -6
  149. data/app/models/kaui/business_invoice.rb +0 -31
  150. data/app/models/kaui/business_invoice_item.rb +0 -17
  151. data/app/models/kaui/business_invoice_payment.rb +0 -25
  152. data/app/models/kaui/business_overdue_status.rb +0 -8
  153. data/app/models/kaui/business_snapshot.rb +0 -9
  154. data/app/models/kaui/business_subscription_transition.rb +0 -53
  155. data/app/models/kaui/business_tag.rb +0 -5
  156. data/app/models/kaui/charge.rb +0 -14
  157. data/app/models/kaui/entitlement.rb +0 -2
  158. data/app/models/kaui/event.rb +0 -13
  159. data/app/models/kaui/external_payment.rb +0 -15
  160. data/app/models/kaui/overdue_state.rb +0 -10
  161. data/app/models/kaui/payment_attempt.rb +0 -27
  162. data/app/models/kaui/product.rb +0 -24
  163. data/app/models/kaui/time_series_data.rb +0 -8
  164. data/app/views/kaui/analytics/account_snapshot.html.erb +0 -211
  165. data/app/views/kaui/analytics/index.html.erb +0 -17
  166. data/app/views/kaui/chargebacks/index.html.erb +0 -14
  167. data/app/views/kaui/chargebacks/show.html.erb +0 -19
  168. data/app/views/kaui/credits/index.html.erb +0 -14
  169. data/app/views/kaui/credits/show.html.erb +0 -19
  170. data/app/views/kaui/invoice_items/index.html.erb +0 -20
  171. data/app/views/kaui/invoice_items/show.html.erb +0 -31
  172. data/app/views/kaui/refunds/_refunds_table.html.erb +0 -31
  173. data/app/views/kaui/refunds/index.html.erb +0 -43
  174. data/app/views/kaui/refunds/show.html.erb +0 -33
  175. data/app/views/kaui/tag_definitions/edit.html.erb +0 -3
  176. data/test/dummy/test/fixtures/accounts.yml +0 -32
  177. data/test/dummy/test/fixtures/bill_cycle_days.yml +0 -3
  178. data/test/dummy/test/fixtures/bundles.yml +0 -4
  179. data/test/dummy/test/fixtures/invoice_items.yml +0 -13
  180. data/test/dummy/test/fixtures/invoices.yml +0 -11
  181. data/test/dummy/test/fixtures/overdue_states.yml +0 -8
  182. data/test/dummy/test/fixtures/payment_methods.yml +0 -5
  183. data/test/dummy/test/fixtures/plugin_info_properties.yml +0 -59
  184. data/test/dummy/test/fixtures/plugin_infos.yml +0 -2
  185. data/test/dummy/test/fixtures/refunds.yml +0 -9
  186. data/test/dummy/test/fixtures/tag_definitions.yml +0 -20
  187. data/test/functional/kaui/account_timeline_controller_test.rb +0 -9
  188. data/test/functional/kaui/extpayments_controller_test.rb +0 -9
  189. data/test/functional/kaui/home_controller_test.rb +0 -11
  190. data/test/integration/navigation_test.rb +0 -10
  191. data/test/kaui_test.rb +0 -7
  192. data/test/unit/helpers/kaui/account_timeline_helper_test.rb +0 -6
  193. data/test/unit/helpers/kaui/bundles_helper_test.rb +0 -6
  194. data/test/unit/helpers/kaui/chargebacks_helper_test.rb +0 -6
  195. data/test/unit/helpers/kaui/extpayments_helper_test.rb +0 -6
  196. data/test/unit/helpers/kaui/home_helper_test.rb +0 -6
  197. data/test/unit/helpers/kaui/invoices_helper_test.rb +0 -6
  198. data/test/unit/helpers/kaui/payments_helper_test.rb +0 -6
  199. data/test/unit/helpers/kaui/refunds_helper_test.rb +0 -6
  200. data/test/unit/kaui/overdue_state_test.rb +0 -18
  201. data/test/unit/kaui/refund_test.rb +0 -20
  202. data/test/unit/model_test.rb +0 -151
data/app/views/kaui/chargebacks/_form.html.erb ADDED
@@ -0,0 +1,44 @@
1
+ <%= form_for(@chargeback, :html => {:class => 'form-horizontal'}) do |f| %>
2
+ <fieldset>
3
+ <%= f.hidden_field :payment_id %>
4
+ <%= f.hidden_field :currency %>
5
+ <div class="control-group">
6
+ <%= f.label :amount, 'Chargeback amount', :class => 'control-label' %>
7
+ <div class="controls">
8
+ <%= f.text_field :amount, :id => 'chargeback_amount', :class => 'input-small' %>
9
+ <p class="help-inline"><%= @chargeback.currency %></p>
10
+ </div>
11
+ </div>
12
+ <div class="control-group">
13
+ <%= label_tag :reason, 'Reason', :class => 'control-label' %>
14
+ <div class="controls">
15
+ <%= select_tag :reason, options_for_select(Kaui::Chargeback::SAMPLE_REASON_CODES) %>
16
+ </div>
17
+ </div>
18
+ <div class="control-group">
19
+ <%= label_tag :cancel_all_subs, 'Cancel account subscriptions?', :class => 'control-label' %>
20
+ <div class="controls">
21
+ <label class="checkbox">
22
+ <%= check_box_tag :cancel_all_subs %>
23
+ </label>
24
+ </div>
25
+ </div>
26
+ <div class="control-group">
27
+ <%= label_tag :comment, 'Comment', :class => 'control-label' %>
28
+ <div class="controls">
29
+ <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
30
+ </div>
31
+ </div>
32
+ <div class="form-actions">
33
+ <%= button_tag 'Apply chargeback', :class => 'btn btn-primary' %>
34
+ </div>
35
+ </fieldset>
36
+ <% end %>
37
+
38
+ <%= javascript_tag do %>
39
+ $(document).ready(function() {
40
+ $("#chargeback_amount").keydown(function(event) {
41
+ preventNonNumericValues(event);
42
+ });
43
+ });
44
+ <% end %>
data/app/views/kaui/chargebacks/new.html.erb CHANGED
@@ -1,117 +1,5 @@
1
1
  <div class="page-header">
2
- <h1>Apply Payment Chargeback</h1>
2
+ <h1>Apply Chargeback</h1>
3
3
  </div>
4
- <%= form_for(@chargeback, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
5
- <%= hidden_field_tag :account_id, @account_id %>
6
- <%= hidden_field_tag :invoice_id, @invoice_id %>
7
- <%= f.hidden_field :payment_id %>
8
- <fieldset>
9
- <div class="control-group">
10
- <label class="control-label">Date</label>
11
- <div class="controls">
12
- <label class="checkbox">
13
- <%= DateTime.now.to_s(:pretty) %>
14
- </label>
15
- </div>
16
- </div>
17
- <div class="control-group">
18
- <label class="control-label">Invoice number</label>
19
- <div class="controls">
20
- <label class="checkbox">
21
- <%= @invoice.invoice_number %><br/>
22
- </label>
23
- </div>
24
- </div>
25
- <div class="control-group">
26
- <label class="control-label">Account name</label>
27
- <div class="controls">
28
- <label class="checkbox">
29
- <%= @account.name %><br/>
30
- <%= @account.email %>
31
- </label>
32
- </div>
33
- </div>
34
- <div class="control-group">
35
- <label class="control-label">Status</label>
36
- <div class="controls">
37
- <label class="checkbox">
38
- <%= @payment.status %>
39
- </label>
40
- </div>
41
- </div>
42
- <div class="control-group">
43
- <label class="control-label">Payment method</label>
44
- <div class="controls">
45
- <label class="checkbox">
46
- <% if @payment_method.present? and @payment_method.plugin_info.present? %>
47
- <%= @payment_method.plugin_info.type %> <%= @payment_method.plugin_info.cc_type %> <%= @payment_method.plugin_info.cc_last4 %>
48
- <% else %>
49
- <p class="text-error">DELETED</p>
50
- <% end %>
51
- </label>
52
- </div>
53
- </div>
54
- <div class="control-group">
55
- <label class="control-label">Payment</label>
56
- <div class="controls">
57
- <label class="checkbox">
58
- <%= @payment.amount %> <%= @account.currency %>
59
- </label>
60
- </div>
61
- </div>
62
- <div class="control-group">
63
- <label class="control-label">External Payment Id</label>
64
- <div class="controls">
65
- <label class="checkbox">
66
- <%= @payment.ext_first_payment_id_ref %>
67
- </label>
68
- </div>
69
- </div>
70
- <div class="control-group">
71
- <label class="control-label">External Secondary Payment Id</label>
72
- <div class="controls">
73
- <label class="checkbox">
74
- <%= @payment.ext_second_payment_id_ref %>
75
- </label>
76
- </div>
77
- </div>
78
- <div class="control-group">
79
- <%= f.label :chargeback_amount, "Chargeback amount", :class => "control-label" %>
80
- <div class="controls">
81
- <%= f.text_field :chargeback_amount, :id => 'chargeback_amount', :class => 'input-small' %>
82
- <p class="help-inline"><%= @account.currency %></p>
83
- </div>
84
- </div>
85
- <div class="control-group">
86
- <%= label_tag :reason, "Reason", :class => "control-label" %>
87
- <div class="controls">
88
- <%= select_tag :reason, options_for_select(Kaui::Chargeback::SAMPLE_REASON_CODES) %>
89
- </div>
90
- </div>
91
- <div class="control-group">
92
- <%= label_tag :cancel_all_subs, "Cancel account subscriptions?", :class => "control-label" %>
93
- <div class="controls">
94
- <label class="checkbox">
95
- <%= check_box_tag :cancel_all_subs %>
96
- </label>
97
- </div>
98
- </div>
99
- <div class="control-group">
100
- <%= label_tag :comment, "Comment", :class => "control-label" %>
101
- <div class="controls">
102
- <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
103
- </div>
104
- </div>
105
- <div class="form-actions">
106
- <%= button_tag "Apply chargeback", :class =>"btn btn-primary" %>
107
- <%= link_to 'Back', :back, :class => 'btn' %>
108
- </div>
109
- </fieldset>
110
- <% end %>
111
- <%= javascript_tag do %>
112
- $(document).ready(function() {
113
- $("#chargeback_amount").keydown(function(event) {
114
- preventNonNumericValues(event);
115
- });
116
- });
117
- <% end %>
4
+
5
+ <%= render 'form' %>
data/app/views/kaui/charges/_form.html.erb ADDED
@@ -0,0 +1,73 @@
1
+ <%= form_for(@charge, :url => {:action => :create}, :html => {:class => 'form-horizontal'}) do |f| %>
2
+ <%= f.hidden_field :account_id %>
3
+ <fieldset>
4
+ <% if @invoice.present? %>
5
+ <%= f.hidden_field :invoice_id %>
6
+ <%= f.hidden_field :currency %>
7
+ <div class="control-group">
8
+ <label class="control-label">Invoice number</label>
9
+ <div class="controls">
10
+ <label class="checkbox">
11
+ <%= @invoice.invoice_number %><br/>
12
+ </label>
13
+ </div>
14
+ </div>
15
+ <div class="control-group">
16
+ <label class="control-label">Invoice amount</label>
17
+ <div class="controls">
18
+ <label class="checkbox">
19
+ <%= @invoice.amount %> <%= @invoice.currency %>
20
+ </label>
21
+ </div>
22
+ </div>
23
+ <div class="control-group">
24
+ <label class="control-label">Balance</label>
25
+ <div class="controls">
26
+ <label class="checkbox">
27
+ <%= @invoice.balance.nil? ? '0.00' : @invoice.balance %> <%= @invoice.currency %>
28
+ </label>
29
+ </div>
30
+ </div>
31
+ <% end %>
32
+ <div class="control-group">
33
+ <%= f.label :amount, 'Charge amount', :class => 'control-label' %>
34
+ <div class="controls">
35
+ <%= f.text_field :amount, :id => 'charge_amount', :class => 'input-small' %>
36
+ <% if @invoice.present? %>
37
+ <p class="help-inline"><%= @invoice.currency %></p>
38
+ <% end %>
39
+ </div>
40
+ </div>
41
+ <% unless @invoice.present? %>
42
+ <div class="control-group">
43
+ <%= f.label :currency, 'Currency', :class => 'control-label' %>
44
+ <div class="controls">
45
+ <%= f.select :currency, currencies, {}, :class => 'input-small' %>
46
+ </div>
47
+ </div>
48
+ <% end %>
49
+ <div class="control-group">
50
+ <%= label_tag :comment, 'Comment', :class => 'control-label' %>
51
+ <div class="controls">
52
+ <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
53
+ </div>
54
+ </div>
55
+ <div class="control-group">
56
+ <%= f.label :description, 'Description (Viewable on the invoice that the customer will see)', :class => 'control-label' %>
57
+ <div class="controls">
58
+ <%= f.text_area :description, :rows => 3, :class => 'input-xlarge' %>
59
+ </div>
60
+ </div>
61
+ <div class="form-actions">
62
+ <%= button_tag 'Create charge', :class => 'btn btn-primary' %>
63
+ <%= link_to 'Back', :back, :class => 'btn' %>
64
+ </div>
65
+ </fieldset>
66
+ <% end %>
67
+ <%= javascript_tag do %>
68
+ $(document).ready(function() {
69
+ $("#charge_amount").keydown(function(event) {
70
+ preventNonNumericValues(event);
71
+ });
72
+ });
73
+ <% end %>
data/app/views/kaui/charges/new.html.erb CHANGED
@@ -1,94 +1,5 @@
1
1
  <div class="page-header">
2
2
  <h1>Apply Charge</h1>
3
3
  </div>
4
- <%= form_for(@charge, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
5
- <%= f.hidden_field :account_id %>
6
- <fieldset>
7
- <div class="control-group">
8
- <label class="control-label">Date</label>
9
- <div class="controls">
10
- <label class="checkbox">
11
- <%= DateTime.now.to_s(:pretty) %>
12
- </label>
13
- </div>
14
- </div>
15
- <div class="control-group">
16
- <label class="control-label">Account name</label>
17
- <div class="controls">
18
- <label class="checkbox">
19
- <%= @account.name %><br/>
20
- <%= @account.email %>
21
- </label>
22
- </div>
23
- <label class="control-label">Account timezone</label>
24
- <div class="controls">
25
- <label class="checkbox">
26
- <%= @account.timezone %>
27
- </label>
28
- </div>
29
- </div>
30
- <% if @invoice.present? %>
31
- <%= f.hidden_field :invoice_id %>
32
- <div class="control-group">
33
- <label class="control-label">Invoice number</label>
34
- <div class="controls">
35
- <label class="checkbox">
36
- <%= @invoice.invoice_number %><br/>
37
- </label>
38
- </div>
39
- </div>
40
- <div class="control-group">
41
- <label class="control-label">Invoice amount</label>
42
- <div class="controls">
43
- <label class="checkbox">
44
- <%= @invoice.amount %> <%= @account.currency %>
45
- </label>
46
- </div>
47
- </div>
48
- <div class="control-group">
49
- <label class="control-label">Balance</label>
50
- <div class="controls">
51
- <label class="checkbox">
52
- <%= @invoice.balance.nil? ? "0.00" : @invoice.balance %> <%= @account.currency %>
53
- </label>
54
- </div>
55
- </div>
56
- <% end %>
57
- <div class="control-group">
58
- <%= f.label :amount, "Charge amount", :class => "control-label" %>
59
- <div class="controls">
60
- <%= f.text_field :amount, :id => 'charge_amount', :class => 'input-small' %>
61
- <p class="help-inline"><%= @account.currency %></p>
62
- </div>
63
- </div>
64
- <div class="control-group">
65
- <%= label_tag :requested_date, 'Requested Date:', :class => "control-label" %>
66
- <div class="controls">
67
- <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'input-xlarge date-picker' %>
68
- </div>
69
- </div>
70
- <div class="control-group">
71
- <%= label_tag :comment, "Comment", :class => "control-label" %>
72
- <div class="controls">
73
- <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
74
- </div>
75
- </div>
76
- <div class="control-group">
77
- <%= f.label :description, "Description (Viewable on the invoice that the customer will see)", :class => "control-label" %>
78
- <div class="controls">
79
- <%= f.text_area :description, :rows => 3, :class => 'input-xlarge' %>
80
- </div>
81
- </div>
82
- <div class="form-actions">
83
- <%= button_tag "Create charge", :class =>"btn btn-primary" %>
84
- <%= link_to 'Back', :back, :class => 'btn' %>
85
- </div>
86
- </fieldset>
87
- <% end %>
88
- <%= javascript_tag do %>
89
- $(document).ready(function() {
90
- $("#charge_amount").keydown(function(event) {
91
- preventNonNumericValues(event);
92
- });
93
- });
94
- <% end %>
4
+
5
+ <%= render 'form' %>
data/app/views/kaui/credits/_form.html.erb ADDED
@@ -0,0 +1,73 @@
1
+ <%= form_for(@credit, :url => {:action => :create}, :html => {:class => 'form-horizontal'}) do |f| %>
2
+ <%= f.hidden_field :account_id %>
3
+ <fieldset>
4
+ <% if @invoice.present? %>
5
+ <%= f.hidden_field :invoice_id %>
6
+ <%= hidden_field_tag :currency, @invoice.currency %>
7
+ <div class="control-group">
8
+ <label class="control-label">Invoice number</label>
9
+ <div class="controls">
10
+ <label class="checkbox">
11
+ <%= @invoice.invoice_number %><br/>
12
+ </label>
13
+ </div>
14
+ </div>
15
+ <div class="control-group">
16
+ <label class="control-label">Invoice amount</label>
17
+ <div class="controls">
18
+ <label class="checkbox">
19
+ <%= @invoice.amount %> <%= @invoice.currency %>
20
+ </label>
21
+ </div>
22
+ </div>
23
+ <div class="control-group">
24
+ <label class="control-label">Balance</label>
25
+ <div class="controls">
26
+ <label class="checkbox">
27
+ <%= @invoice.balance.nil? ? '0.00' : @invoice.balance %> <%= @invoice.currency %>
28
+ </label>
29
+ </div>
30
+ </div>
31
+ <% end %>
32
+ <div class="control-group">
33
+ <%= f.label :credit_amount, 'Credit amount', :class => 'control-label' %>
34
+ <div class="controls">
35
+ <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'input-small' %>
36
+ <% if @invoice.present? %>
37
+ <p class="help-inline"><%= @invoice.currency %></p>
38
+ <% end %>
39
+ </div>
40
+ </div>
41
+ <% unless @invoice.present? %>
42
+ <div class="control-group">
43
+ <%= label_tag :currency, 'Currency', :class => 'control-label' %>
44
+ <div class="controls">
45
+ <%= select_tag :currency, options_for_select(currencies, :selected => 'USD'), :class => 'input-small' %>
46
+ </div>
47
+ </div>
48
+ <% end %>
49
+ <div class="control-group">
50
+ <%= label_tag :reason, 'Reason', :class => 'control-label' %>
51
+ <div class="controls">
52
+ <%= select_tag :reason, options_for_select(Kaui::Credit::SAMPLE_REASON_CODES) %>
53
+ </div>
54
+ </div>
55
+ <div class="control-group">
56
+ <%= label_tag :comment, 'Comment', :class => 'control-label' %>
57
+ <div class="controls">
58
+ <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
59
+ </div>
60
+ </div>
61
+ <div class="form-actions">
62
+ <%= button_tag 'Create credit', :class => 'btn btn-primary' %>
63
+ <%= link_to 'Back', :back, :class => 'btn' %>
64
+ </div>
65
+ </fieldset>
66
+ <% end %>
67
+ <%= javascript_tag do %>
68
+ $(document).ready(function() {
69
+ $("#credit_amount").keydown(function(event) {
70
+ preventNonNumericValues(event);
71
+ });
72
+ });
73
+ <% end %>
data/app/views/kaui/credits/new.html.erb CHANGED
@@ -1,88 +1,5 @@
1
1
  <div class="page-header">
2
2
  <h1>Apply Credit</h1>
3
3
  </div>
4
- <%= form_for(@credit, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
5
- <%= f.hidden_field :account_id %>
6
- <fieldset>
7
- <div class="control-group">
8
- <label class="control-label">Date</label>
9
- <div class="controls">
10
- <label class="checkbox">
11
- <%= DateTime.now.to_s(:pretty) %>
12
- </label>
13
- </div>
14
- </div>
15
- <div class="control-group">
16
- <label class="control-label">Account name</label>
17
- <div class="controls">
18
- <label class="checkbox">
19
- <%= @account.name %><br/>
20
- <%= @account.email %>
21
- </label>
22
- </div>
23
- </div>
24
- <% if @invoice.present? %>
25
- <%= f.hidden_field :invoice_id %>
26
- <div class="control-group">
27
- <label class="control-label">Invoice number</label>
28
- <div class="controls">
29
- <label class="checkbox">
30
- <%= @invoice.invoice_number %><br/>
31
- </label>
32
- </div>
33
- </div>
34
- <div class="control-group">
35
- <label class="control-label">Invoice amount</label>
36
- <div class="controls">
37
- <label class="checkbox">
38
- <%= @invoice.amount %> <%= @account.currency %>
39
- </label>
40
- </div>
41
- </div>
42
- <div class="control-group">
43
- <label class="control-label">Balance</label>
44
- <div class="controls">
45
- <label class="checkbox">
46
- <%= @invoice.balance.nil? ? "0.00" : @invoice.balance %> <%= @account.currency %>
47
- </label>
48
- </div>
49
- </div>
50
- <% end %>
51
- <div class="control-group">
52
- <%= f.label :credit_amount, "Credit amount", :class => "control-label" %>
53
- <div class="controls">
54
- <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'input-small' %>
55
- <p class="help-inline"><%= @account.currency %></p>
56
- </div>
57
- </div>
58
- <div class="control-group">
59
- <%= f.label :effective_date, 'Effective Date:', :class => "control-label" %>
60
- <div class="controls">
61
- <%= f.text_field :effective_date, :class => 'input-xlarge date-picker' %>
62
- </div>
63
- </div>
64
- <div class="control-group">
65
- <%= label_tag :reason, "Reason", :class => "control-label" %>
66
- <div class="controls">
67
- <%= select_tag :reason, options_for_select(Kaui::Credit::SAMPLE_REASON_CODES) %>
68
- </div>
69
- </div>
70
- <div class="control-group">
71
- <%= label_tag :comment, "Comment", :class => "control-label" %>
72
- <div class="controls">
73
- <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
74
- </div>
75
- </div>
76
- <div class="form-actions">
77
- <%= button_tag "Create credit", :class =>"btn btn-primary" %>
78
- <%= link_to 'Back', :back, :class => 'btn' %>
79
- </div>
80
- </fieldset>
81
- <% end %>
82
- <%= javascript_tag do %>
83
- $(document).ready(function() {
84
- $("#credit_amount").keydown(function(event) {
85
- preventNonNumericValues(event);
86
- });
87
- });
88
- <% end %>
4
+
5
+ <%= render 'form' %>