mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2026-11-19 10:40:36 -05:00
Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22af08cee7 | ||
|
|
7c87f4f9c5 | ||
|
|
cf5328cb21 | ||
|
|
c851929e02 | ||
|
|
56859d1794 | ||
|
|
671afa2436 | ||
|
|
30c1f5181e | ||
|
|
0d143e6eb1 | ||
|
|
92f9eb1bc7 | ||
|
|
40eb6205c4 | ||
|
|
0c5bac855e |
No files matched your search
@@ -75,10 +75,22 @@ The plugin provides basic Customer management:
|
||||
* Search Customers by **name or phone number**: the best matches come first (click a column to sort them instead), and a single match opens that Customer
|
||||
|
||||
* View and edit Customer information
|
||||
|
||||
* On the customer page, ticking an estimate (or a redmine_qbo_vehicles vehicle) adds it to the **New issue** link and to redmine_qbo_calendar's **Add appointment** link, one of each at a time
|
||||
|
||||
|
||||
Customers are synchronized with QuickBooks.
|
||||
|
||||
### Sharing an issue with the customer
|
||||
|
||||
**Share** on an issue (permission **Share issues with customers**) opens a link the customer can open without logging in: the issue with its history, attachments, estimate and invoices. A link lasts a month; sharing the issue again while it's valid gives the same link.
|
||||
|
||||
Expired links, and links whose issue was deleted, are deleted whenever a new link is made. To delete them now (or on a schedule):
|
||||
|
||||
```
|
||||
bundle exec rake redmine_qbo:purge_customer_tokens RAILS_ENV=production
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Webhook Support
|
||||
@@ -128,7 +140,7 @@ Estimates and invoices keep their number, date, customer, total, sales tax and *
|
||||
* Time lines are linked to their time activities, so QuickBooks marks the time as billed. Estimates the invoice was made from, or imported into it, are linked and closed when it's saved.
|
||||
* **Custom fields from the work orders**: the issues behind an invoice are the ones its time lines and lineitems estimates name. Plugins can fill custom fields from them when they're imported, and block a save (e.g. redmine_qbo_vehicles fills the VIN and mileage and allows one vehicle per invoice). On its own, redmine_qbo leaves the boxes as typed.
|
||||
* **Sales person**: an invoice credits the sales person on the estimate it was made from (the first linked estimate that names one); if none does, the user who writes the invoice.
|
||||
* Invoices show their status, worked out from the balance and due date like QuickBooks' invoice list: **Paid**, **Partially paid**, **Overdue**, **Open** or **Voided** (a zero total), on the customer page's invoice list and the invoice page. A paid invoice shows the day it was paid in full (e.g. **Paid 11/03/2026**): the later of its date and the last payment or credit memo applied to it.
|
||||
* Invoices show their status, worked out from the balance and due date like QuickBooks' invoice list: **Paid**, **Partially paid**, **Overdue**, **Open** or **Voided** (a zero total), on the customer page's invoice list and the invoice page. A paid invoice shows when it was paid in full (the later of its date and the last payment or credit memo applied to it): on the customer page's list, **Paid** when it was paid the day it was written, or **Paid +3d** when it was paid in full 3 days after its date, with the date when hovering over it; on the invoice page, the date (e.g. **Paid 11/03/2026**).
|
||||
* Invoices with a payment applied open read-only. The due date is left to QuickBooks (from the customer's terms) unless one is picked. The "default message shown on invoices" fills in the message.
|
||||
|
||||
### Payments
|
||||
@@ -154,6 +166,16 @@ Refunds for canceled orders and returned parts, following SOP-OPS-014, so they d
|
||||
* Each refund has its own page, listed on the customer page: what was refunded and how, with the fee invoice (opened in Redmine), a **PDF** of the refund (QuickBooks has no PDF of a check or an expense), the fee invoice's PDF, and **Email the customer** to send the summary again. If a QuickBooks step fails, the refund stops there and its page says which step and what was already done, to finish in QuickBooks.
|
||||
* It refunds all of the customer's remaining credit held as unapplied payments. Credit held as credit memos isn't refunded here.
|
||||
|
||||
#### Refunding a paid invoice
|
||||
|
||||
Completed work that's billed and paid in full is refunded from its invoice, with a QuickBooks **Refund Receipt**, the way QuickBooks refunds a paid sale:
|
||||
|
||||
* **Refund** on a paid-in-full invoice (or pick it under **Paid invoice** on the customer's Refund page). The invoice's lines are listed (bundles opened up into their lines), each marked parts or labor, with what earlier refunds already took of it. Tick the lines to refund and change the **quantity** (e.g. 2 of 4 parts returned) or the **amount** (a partial refund, e.g. some of the labor). A line can't be refunded, over one or more refunds, for more than it was billed.
|
||||
* **Restocking fee** is optional: when ticked, it's the rate in the settings of the *parts* refunded. Labor carries no fee, so a refund of labor alone has none. Leave it off when the parts aren't coming back.
|
||||
* The page shows the lines, the invoice discount's share (if it had one), the estimated sales tax refunded, the fee and the refund. Choose **Company check** (with its number) or **Card**.
|
||||
* **Refund** records the refund receipt in QuickBooks: the refunded lines with their products/services and tax codes (so the income and sales tax come back off the books; QuickBooks works out the tax), the discount's share, the fee as a negative line with the restocking fee product/service, paid out of the refund check or card refund account in the settings, with the payment method (a QuickBooks payment method named Check, or one with Card/Visa/Mastercard/Amex/Discover in its name) and the check number. The invoice stays as it is, paid.
|
||||
* As ticked on the page, it also notes the refund on the invoice's work orders (their status is left alone) and emails the customer a summary. The refund's page, PDF and email list the lines refunded, and show the refund receipt's exact total: refund exactly that.
|
||||
|
||||
### Business report
|
||||
|
||||
**Business report** in the top menu compares, for a period (this or last week, month, quarter or year, or custom dates; weeks start on the day set in Redmine's *Start calendars on* setting, Monday when it follows the language):
|
||||
@@ -207,13 +229,14 @@ Administration → Items lists the QuickBooks product/service list (synced from
|
||||
* **View business reports**: the Business report
|
||||
* **Write invoices**: create and edit invoices, and import time and estimates into them
|
||||
* **Email invoices**: email invoices to customers
|
||||
* **Issue refunds**: the Refund page, refunds and their PDFs
|
||||
* **Issue refunds**: the Refund page (customer credit) and refunds of paid invoices, refunds and their PDFs
|
||||
* **Share issues with customers**: the Share link on issues (see Sharing an issue with the customer)
|
||||
|
||||
2. Settings (Administration -> Plugins -> Configure)
|
||||
* **Estimates expire after (days)**: new estimates get an expiration date this many days after the estimate date (e.g. 30). Leave blank for none.
|
||||
* **Labor products/services** (e.g. Labor): one list used three ways. An estimate's lines with them can become issues (their quantities are also the estimate's labor hours, which an appointment's hours can't be less than); an invoice's lines with them are offered under Replace these lines when time is imported; and their quantities are the hours on estimates and invoices in the business report. While none are chosen, products/services named Labor are used.
|
||||
* **Issues from estimates**: the default project and the default tracker.
|
||||
* **Refunds**: the restocking fee (SOP-OPS-014: 30%) and the product/service on its invoice (e.g. a "Restocking Fee" service, which sets the income account), the bank accounts refund checks and card refunds come out of (blank: the first bank account), and the status canceled work orders are set to (blank: a closed status named Canceled).
|
||||
* **Refunds**: the restocking fee (SOP-OPS-014: 30%) and the product/service on its invoice or refund receipt line (e.g. a "Restocking Fee" service, which sets the income account), the bank accounts refund checks and card refunds come out of (blank: the first bank account), and the status canceled work orders are set to (blank: a closed status named Canceled).
|
||||
* Item and account counts, the default income account and their syncs are under Synchronization.
|
||||
|
||||
3. Writing an estimate
|
||||
@@ -250,7 +273,7 @@ Hook|:qbo_billing_issues_created, { estimate:, issues:, params: } | Called after
|
||||
Hook|:qbo_billing_field_defaults, { customer:, issues: } | Return `{ field_id => value }` for a document's work orders: used when an invoice is made from an estimate, for the fields it leaves blank. New estimates and invoices start blank (redmine_qbo_vehicles: the work orders' VIN and highest mileage)
|
||||
Hook|:qbo_billing_field_options, { customer: } | Return `{ field_id => [{ value:, label: }, ...] }` to suggest in the editor's custom field boxes for a customer (redmine_qbo_vehicles: the customer's vehicles for the VIN box)
|
||||
View|:view_qbo_estimate_form_bottom, { form:, document: } | Add your plugin's script to the estimate/invoice editor. It can use `window.qboEditor` (`field(id)`, `fieldNamed(/name/)`, `setFieldOptions(id, options)`) and listen for `qbo:customer-changed` and `qbo:imported` on the form (redmine_qbo_vehicles fills the VIN and mileage)
|
||||
View|checkboxes with `data-new-issue-param="issue[field]"` on the customer page | Ticking one adds `issue[field]=value` to the New issue link, one per field (redmine_qbo's estimates, redmine_qbo_vehicles' vehicles)
|
||||
View|checkboxes with `data-new-issue-param="issue[field]"` and `data-appointment-param="field"` on the customer page | Ticking one adds `issue[field]=value` to the New issue link and `field=value` to redmine_qbo_calendar's Add appointment link (`#appointment_link`), one per field (redmine_qbo's estimates: `estimate_id`, redmine_qbo_vehicles' vehicles: `vehicle_id`)
|
||||
View Hook|:view_qbo_estimate_contextual, { estimate_id:, customer_id:, custom_fields:, doc_number: } | Adds links to an estimate page's action area (e.g. redmine_qbo_calendar's Add appointment); `custom_fields` is `{ field_id => value }`
|
||||
View Hook|:view_qbo_invoice_contextual, { invoice_id:, customer_id:, doc_number: } | Adds links to an invoice page's action area (e.g. redmine_qbo_labels' Print label)
|
||||
|
||||
|
||||
@@ -33,36 +33,6 @@ class CustomersController < ApplicationController
|
||||
before_action :require_admin, only: :sync
|
||||
skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:view]
|
||||
|
||||
def address_to_s(address)
|
||||
return if address.nil?
|
||||
|
||||
lines = [
|
||||
address.line1,
|
||||
address.line2,
|
||||
address.line3,
|
||||
address.line4,
|
||||
address.line5
|
||||
].compact_blank
|
||||
|
||||
city_line = [
|
||||
address.city,
|
||||
address.country_sub_division_code,
|
||||
address.postal_code
|
||||
].compact_blank.join(" ")
|
||||
|
||||
lines << city_line unless city_line.blank?
|
||||
|
||||
lines.join("\n")
|
||||
end
|
||||
|
||||
def add_customer
|
||||
global_check_permission(:add_customers)
|
||||
end
|
||||
|
||||
def allowed_params
|
||||
params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
|
||||
end
|
||||
|
||||
# Used for autocomplete forms. Fuzzy matching (nicknames, typos, word order, phone digits) helps
|
||||
# staff spot an existing customer before creating a duplicate. See CustomerSearchService.
|
||||
def autocomplete
|
||||
@@ -109,14 +79,6 @@ class CustomersController < ApplicationController
|
||||
render_404
|
||||
end
|
||||
|
||||
def filter_estimates_by_customer
|
||||
@filtered_estimates = Estimate.all.where(customer_id: params[:selected_customer])
|
||||
end
|
||||
|
||||
def filter_invoices_by_customer
|
||||
@filtered_invoices = Invoice.all.where(customer_id: params[:selected_customer])
|
||||
end
|
||||
|
||||
# Most matches a search lists (best first)
|
||||
SEARCH_LIMIT = 200
|
||||
|
||||
@@ -146,29 +108,6 @@ class CustomersController < ApplicationController
|
||||
@issue_counts = Issue.where(customer_id: @customers.map(&:id)).group(:customer_id).count
|
||||
end
|
||||
|
||||
def load_issue_data
|
||||
@journals = @issue.journals.preload(:details).preload(user: :email_address).reorder(:created_on, :id).to_a
|
||||
|
||||
@journals.each_with_index { |j, i| j.indice = i + 1 }
|
||||
@journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
|
||||
Journal.preload_journals_details_custom_fields(@journals)
|
||||
@journals.select! { |journal| journal.notes? || journal.visible_details.any? }
|
||||
@journals.reverse! if User.current.wants_comments_in_reverse_order?
|
||||
|
||||
@changesets = @issue.changesets.visible.preload(:repository, :user).to_a
|
||||
@changesets.reverse! if User.current.wants_comments_in_reverse_order?
|
||||
|
||||
@relations = @issue.relations.select { |r| r.other_issue(@issue)&.visible? }
|
||||
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
||||
@priorities = IssuePriority.active
|
||||
@time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
|
||||
@relation = IssueRelation.new
|
||||
end
|
||||
|
||||
def log(msg)
|
||||
Rails.logger.info "[CustomersController] #{msg}"
|
||||
end
|
||||
|
||||
def new
|
||||
@customer = Customer.new
|
||||
|
||||
@@ -253,8 +192,41 @@ class CustomersController < ApplicationController
|
||||
render_403
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def add_customer
|
||||
global_check_permission(:add_customers)
|
||||
end
|
||||
|
||||
def allowed_params
|
||||
params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
|
||||
end
|
||||
|
||||
def load_issue_data
|
||||
@journals = @issue.journals.preload(:details).preload(user: :email_address).reorder(:created_on, :id).to_a
|
||||
|
||||
@journals.each_with_index { |j, i| j.indice = i + 1 }
|
||||
@journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
|
||||
Journal.preload_journals_details_custom_fields(@journals)
|
||||
@journals.select! { |journal| journal.notes? || journal.visible_details.any? }
|
||||
@journals.reverse! if User.current.wants_comments_in_reverse_order?
|
||||
|
||||
@changesets = @issue.changesets.visible.preload(:repository, :user).to_a
|
||||
@changesets.reverse! if User.current.wants_comments_in_reverse_order?
|
||||
|
||||
@relations = @issue.relations.select { |r| r.other_issue(@issue)&.visible? }
|
||||
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
||||
@priorities = IssuePriority.active
|
||||
@time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
|
||||
@relation = IssueRelation.new
|
||||
end
|
||||
|
||||
def log(msg)
|
||||
Rails.logger.info "[CustomersController] #{msg}"
|
||||
end
|
||||
|
||||
def view_customer
|
||||
global_check_permission(:view_customers)
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
@@ -8,7 +8,8 @@
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
# Customer refunds (SOP-OPS-014): the Refund page for a customer with credit, and a refund once it's made
|
||||
# Customer refunds (SOP-OPS-014): the Refund page for a customer with credit (a canceled order's deposit), the
|
||||
# Refund invoice page for completed work on a paid invoice, and a refund once it's made
|
||||
class QboRefundsController < ApplicationController
|
||||
before_action :authorize_global
|
||||
|
||||
@@ -43,6 +44,40 @@ class QboRefundsController < ApplicationController
|
||||
show_form
|
||||
end
|
||||
|
||||
# Refund of a paid invoice: its lines to pick from, the optional restocking fee, how the money goes back
|
||||
def new_invoice
|
||||
@form = RedmineQboBilling::InvoiceRefundForm.new(invoice_id: params[:invoice_id].to_s, txn_date: User.current.today.iso8601,
|
||||
method: 'check', charge_fee: '1', note_issues: '1', email_customer: '1')
|
||||
return unless load_invoice_page
|
||||
|
||||
@form.customer_id = @customer.id.to_s
|
||||
# Every line with something left to refund is ticked, at what's left of it
|
||||
@lines.select(&:refundable?).each do |line|
|
||||
@form.lines[line.key] = RedmineQboBilling::InvoiceRefundForm::LineChoice.new(
|
||||
refund: '1', quantity: (quantity = RedmineQboBilling::InvoiceRefundWriter.default_quantity(line)) && RedmineQboBilling::RefundWriter.plain(quantity),
|
||||
amount: format('%.2f', line.remaining_amount)
|
||||
)
|
||||
end
|
||||
load_invoice_plan
|
||||
end
|
||||
|
||||
def create_invoice
|
||||
@form = RedmineQboBilling::InvoiceRefundForm.from_params(params.require(:refund).permit(*RedmineQboBilling::InvoiceRefundForm.permitted))
|
||||
return unless load_invoice_page
|
||||
return show_invoice_form unless @form.valid?
|
||||
|
||||
refund = RedmineQboBilling::InvoiceRefundWriter.refund!(@form)
|
||||
if refund.done?
|
||||
flash[:notice] = l(:notice_refund_done, amount: RedmineQboBilling::RefundWriter.money(refund.refund_amount))
|
||||
else
|
||||
flash[:error] = refund.message
|
||||
end
|
||||
redirect_to qbo_refund_path(refund)
|
||||
rescue RedmineQboBilling::RefundWriter::Error, *QBO_ERRORS => e
|
||||
@form.errors.add(:base, qbo_message(e))
|
||||
show_invoice_form
|
||||
end
|
||||
|
||||
def show
|
||||
@refund = QboRefund.find_by(id: params[:id])
|
||||
return render_404 unless @refund
|
||||
@@ -88,6 +123,7 @@ class QboRefundsController < ApplicationController
|
||||
|
||||
def load_page
|
||||
@estimates = RedmineQboBilling::RefundWriter.estimate_choices(@customer)
|
||||
@invoices = RedmineQboBilling::InvoiceRefundWriter.invoice_choices(@customer)
|
||||
@preview = RedmineQboBilling::RefundWriter.preview(@customer, parts: @form.parts_value || BigDecimal('0'))
|
||||
@statuses = IssueStatus.sorted.to_a
|
||||
rescue *QBO_ERRORS => e
|
||||
@@ -100,6 +136,40 @@ class QboRefundsController < ApplicationController
|
||||
render :new, status: :unprocessable_entity
|
||||
end
|
||||
|
||||
# The paid invoice from QuickBooks, its customer and its lines; renders the error and returns false when it
|
||||
# can't be refunded
|
||||
def load_invoice_page
|
||||
gateway = RedmineQboBilling::RefundGateway.new
|
||||
@invoice = gateway.invoice(@form.invoice_id) if @form.invoice_id.present?
|
||||
@customer = Customer.find_by(id: @invoice&.customer_ref&.value)
|
||||
if @invoice.nil? || @customer.nil?
|
||||
render_404
|
||||
return false
|
||||
end
|
||||
unless RedmineQboBilling::InvoiceRefundWriter.paid_in_full?(@invoice)
|
||||
flash[:error] = l(:error_refund_invoice_not_paid)
|
||||
redirect_to edit_qbo_invoice_path(@invoice.id)
|
||||
return false
|
||||
end
|
||||
|
||||
@lines = RedmineQboBilling::InvoiceRefundWriter.lines(@invoice)
|
||||
@refunds = QboRefund.of_invoice(@invoice.id).recent.to_a
|
||||
true
|
||||
rescue *QBO_ERRORS => e
|
||||
flash[:error] = qbo_message(e)
|
||||
redirect_to(@form.customer_id.present? ? customer_path(@form.customer_id) : customers_path)
|
||||
false
|
||||
end
|
||||
|
||||
def load_invoice_plan
|
||||
@plan, = RedmineQboBilling::InvoiceRefundWriter.plan(@invoice, @form, invoice_lines: @lines)
|
||||
end
|
||||
|
||||
def show_invoice_form
|
||||
load_invoice_plan
|
||||
render :new_invoice, status: :unprocessable_entity
|
||||
end
|
||||
|
||||
def qbo_message(error)
|
||||
detail = error.respond_to?(:detail) ? error.detail.to_s : ''
|
||||
message = error.message.to_s
|
||||
|
||||
@@ -31,28 +31,6 @@ module AuthHelper
|
||||
require_login
|
||||
end
|
||||
|
||||
# Kept for plugins that still call it (e.g. redmine_qbo_vehicles): requires a logged-in user.
|
||||
# The old version effectively never ran; share-link customers use require_login_or_customer_token.
|
||||
def require_user
|
||||
return true if User.current.logged?
|
||||
|
||||
require_login
|
||||
end
|
||||
|
||||
def allowed_to?(action)
|
||||
return false if User.current.nil?
|
||||
project = Project.find_by(id: params[:project_id])
|
||||
return false if project.nil?
|
||||
User.current.allowed_to?(action, project)
|
||||
end
|
||||
|
||||
def check_permission(permission)
|
||||
if !allowed_to?(permission)
|
||||
flash[:error] = t :notice_forbidden
|
||||
render_403
|
||||
end
|
||||
end
|
||||
|
||||
def global_check_permission(permission)
|
||||
if !globaly_allowed_to?(permission)
|
||||
flash[:error] = t :notice_forbidden
|
||||
|
||||
@@ -21,17 +21,8 @@ class CustomerToken < ApplicationRecord
|
||||
|
||||
TOKEN_EXPIRATION = 1.month
|
||||
|
||||
# Check if the token has expired
|
||||
def expired?
|
||||
expires_at.present? && expires_at <= Time.current
|
||||
end
|
||||
|
||||
# Remove expired tokens from the database
|
||||
def self.remove_expired_tokens
|
||||
where("expires_at <= ?", Time.current).delete_all
|
||||
end
|
||||
|
||||
# Get or create a token for the given issue
|
||||
# Get or create a token for the given issue. Making a new one also clears out the share links that have expired
|
||||
# or whose issue was deleted, so they don't pile up.
|
||||
def self.get_token(issue)
|
||||
return unless issue
|
||||
return unless User.current.allowed_to?(:view_issues, issue.project)
|
||||
@@ -39,9 +30,17 @@ class CustomerToken < ApplicationRecord
|
||||
token = active.find_by(issue_id: issue.id)
|
||||
return token if token
|
||||
|
||||
purge_expired
|
||||
create!(issue: issue)
|
||||
end
|
||||
|
||||
# Deletes the share links that have expired or whose issue no longer exists; returns how many
|
||||
def self.purge_expired
|
||||
where('expires_at <= ?', Time.current)
|
||||
.or(where.not(issue_id: Issue.select(:id)))
|
||||
.delete_all
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Generate a unique token for the customer
|
||||
|
||||
@@ -79,12 +79,6 @@ class QboBaseModel < ActiveRecord::Base
|
||||
QboSyncJob.perform_later(entity: model_name.name, id: id)
|
||||
end
|
||||
|
||||
# Flag used to update local without pushing to QBO.
|
||||
# This is used to prevent loops with the webhook
|
||||
def skip_qbo_push?
|
||||
!!skip_qbo_push
|
||||
end
|
||||
|
||||
def self.qbo_sync(push: true)
|
||||
self.qbo_push_enabled = push
|
||||
end
|
||||
|
||||
@@ -31,14 +31,6 @@ class QboDraft < ApplicationRecord
|
||||
where(document: documents)
|
||||
}
|
||||
|
||||
def self.writable_document?(document, user = User.current)
|
||||
case document.to_s
|
||||
when 'estimate' then RedmineQboBilling.writer?(user)
|
||||
when 'invoice' then RedmineQboBilling.invoice_writer?(user)
|
||||
else false
|
||||
end
|
||||
end
|
||||
|
||||
# The editor's fields as posted (estimate[...])
|
||||
def fields
|
||||
parsed = JSON.parse(data.presence || '{}')
|
||||
|
||||
@@ -8,10 +8,16 @@
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
# A customer refund (SOP-OPS-014), as it was made: the restocking fee, the refund, and each step's outcome
|
||||
# A customer refund (SOP-OPS-014), as it was made: the restocking fee, the refund, and each step's outcome.
|
||||
# Two kinds: credit, a canceled order's deposit (RefundWriter), and invoice, completed work on a paid invoice
|
||||
# (InvoiceRefundWriter).
|
||||
class QboRefund < ApplicationRecord
|
||||
METHODS = %w[check card].freeze
|
||||
STATUSES = %w[done incomplete].freeze
|
||||
KINDS = %w[credit invoice].freeze
|
||||
|
||||
# A refunded invoice line, as recorded: its key on the invoice (InvoiceRefundWriter.line_key)
|
||||
RefundedLine = Struct.new(:key, :description, :quantity, :amount, :parts, keyword_init: true)
|
||||
|
||||
belongs_to :customer
|
||||
belongs_to :user, optional: true
|
||||
@@ -19,8 +25,15 @@ class QboRefund < ApplicationRecord
|
||||
validates :customer_id, presence: true
|
||||
validates :method, inclusion: { in: METHODS }
|
||||
validates :status, inclusion: { in: STATUSES }
|
||||
validates :kind, inclusion: { in: KINDS }
|
||||
|
||||
scope :recent, -> { order(created_at: :desc, id: :desc) }
|
||||
# The invoice's refunds that made a refund receipt in QuickBooks
|
||||
scope :of_invoice, ->(id) { where(kind: 'invoice', invoice_id: id).where.not(purchase_id: [nil, '']) }
|
||||
|
||||
def invoice?
|
||||
kind == 'invoice'
|
||||
end
|
||||
|
||||
def done?
|
||||
status == 'done'
|
||||
@@ -44,11 +57,47 @@ class QboRefund < ApplicationRecord
|
||||
self[:canceled_issue_ids] = Array(ids).map(&:to_i).uniq.to_json
|
||||
end
|
||||
|
||||
# The QuickBooks screen for the refund check or expense
|
||||
def noted_issue_ids
|
||||
Array(JSON.parse(self[:noted_issue_ids].presence || '[]')).map(&:to_i)
|
||||
rescue JSON::ParserError
|
||||
[]
|
||||
end
|
||||
|
||||
def noted_issue_ids=(ids)
|
||||
self[:noted_issue_ids] = Array(ids).map(&:to_i).uniq.to_json
|
||||
end
|
||||
|
||||
def refunded_lines
|
||||
Array(JSON.parse(self[:refunded_lines].presence || '[]')).map do |line|
|
||||
RefundedLine.new(key: line['key'].to_s, description: line['description'].to_s, quantity: line['quantity'],
|
||||
amount: BigDecimal(line['amount'].to_s.presence || '0'), parts: line['parts'] == true)
|
||||
end
|
||||
rescue JSON::ParserError
|
||||
[]
|
||||
end
|
||||
|
||||
def refunded_lines=(lines)
|
||||
self[:refunded_lines] = Array(lines).map do |line|
|
||||
{ key: line.key.to_s, description: line.description.to_s, quantity: line.quantity&.to_s,
|
||||
amount: line.amount.to_d.to_s('F'), parts: line.parts ? true : false }
|
||||
end.to_json
|
||||
end
|
||||
|
||||
# What the order or invoice is called: "E1068", "Invoice #1234", or nil
|
||||
def document_label
|
||||
if invoice? then I18n.t(:label_refund_invoice_number, number: invoice_number)
|
||||
elsif estimate_number.present? then "E#{estimate_number}"
|
||||
end
|
||||
end
|
||||
|
||||
# The QuickBooks screen for the refund receipt, check or expense
|
||||
def purchase_url
|
||||
return nil if purchase_id.blank?
|
||||
|
||||
page = check? ? 'check' : 'expense'
|
||||
page = if invoice? then 'refundreceipt'
|
||||
elsif check? then 'check'
|
||||
else 'expense'
|
||||
end
|
||||
"https://#{RedmineQbo.sandbox_mode? ? 'sandbox' : 'app'}.qbo.intuit.com/app/#{page}?txnId=#{purchase_id}"
|
||||
end
|
||||
end
|
||||
@@ -80,15 +80,6 @@ class SyncServiceBase
|
||||
false
|
||||
end
|
||||
|
||||
def extract_value(remote, remote_attr)
|
||||
case remote_attr
|
||||
when Proc
|
||||
remote_attr.call(remote)
|
||||
else
|
||||
remote.public_send(remote_attr)
|
||||
end
|
||||
end
|
||||
|
||||
# Attribute Mapping DSL
|
||||
#
|
||||
# This DSL defines how attributes from a QuickBooks Online (QBO) entity
|
||||
@@ -157,7 +148,6 @@ class SyncServiceBase
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def map_attribute(local_attr, remote_attr = nil, &block)
|
||||
attribute_map[local_attr] =
|
||||
if block_given?
|
||||
|
||||
@@ -1,45 +1,58 @@
|
||||
<%#
|
||||
Adds what's ticked on the customer page to the "New issue" link (#dynamic-new-issue-link in the contextual
|
||||
area). Any checkbox with data-new-issue-param="issue[field]" takes part, one ticked per field: this plugin's
|
||||
estimates (issue[estimate_id]), and other plugins' lists (e.g. redmine_qbo_vehicles' issue[vehicle_id]).
|
||||
Adds what's ticked on the customer page to its links: "New issue" (#dynamic-new-issue-link in the contextual area)
|
||||
and redmine_qbo_calendar's "Add appointment" (#appointment_link). A checkbox takes part with
|
||||
data-new-issue-param="issue[field]" (New issue) and data-appointment-param="field" (Add appointment); one is
|
||||
ticked per field: this plugin's estimates (estimate_id), and other plugins' lists (e.g. redmine_qbo_vehicles'
|
||||
vehicle_id).
|
||||
%>
|
||||
<script>
|
||||
function newIssueParamBoxes(param) {
|
||||
return Array.prototype.filter.call(document.querySelectorAll('input[data-new-issue-param]'), function (cb) {
|
||||
return !param || cb.getAttribute('data-new-issue-param') === param;
|
||||
});
|
||||
}
|
||||
(function () {
|
||||
var LINKS = [['dynamic-new-issue-link', 'data-new-issue-param'], ['appointment_link', 'data-appointment-param']];
|
||||
var ANY = 'input[data-new-issue-param], input[data-appointment-param]';
|
||||
|
||||
// One box per field: ticking one unticks the others for the same field
|
||||
document.addEventListener('change', function (event) {
|
||||
var box = event.target;
|
||||
if (!box.matches || !box.matches('input[data-new-issue-param]')) return;
|
||||
if (box.checked) {
|
||||
newIssueParamBoxes(box.getAttribute('data-new-issue-param')).forEach(function (cb) {
|
||||
if (cb !== box) cb.checked = false;
|
||||
function boxes(attr, param) {
|
||||
return Array.prototype.filter.call(document.querySelectorAll('input[' + attr + ']'), function (cb) {
|
||||
return !param || cb.getAttribute(attr) === param;
|
||||
});
|
||||
}
|
||||
updateLink();
|
||||
});
|
||||
|
||||
function updateLink() {
|
||||
var link = document.getElementById('dynamic-new-issue-link');
|
||||
if (!link) return;
|
||||
|
||||
// Cache the pristine base URL on first run
|
||||
if (!link.dataset.baseUrl) link.dataset.baseUrl = link.getAttribute('href');
|
||||
var url = new URL(link.dataset.baseUrl, window.location.origin);
|
||||
|
||||
newIssueParamBoxes().forEach(function (cb) {
|
||||
var param = cb.getAttribute('data-new-issue-param');
|
||||
var ticked = newIssueParamBoxes(param).filter(function (b) { return b.checked; })[0];
|
||||
if (ticked) {
|
||||
url.searchParams.set(param, ticked.value);
|
||||
} else {
|
||||
url.searchParams.delete(param);
|
||||
// Boxes for the same field (the same estimate list, the same vehicle list)
|
||||
function sameField(box) {
|
||||
for (var i = 0; i < LINKS.length; i++) {
|
||||
var attr = LINKS[i][1], param = box.getAttribute(attr);
|
||||
if (param) return boxes(attr, param);
|
||||
}
|
||||
});
|
||||
return [box];
|
||||
}
|
||||
|
||||
link.setAttribute('href', url.toString());
|
||||
}
|
||||
function updateLinks() {
|
||||
LINKS.forEach(function (pair) {
|
||||
var link = document.getElementById(pair[0]);
|
||||
if (!link) return;
|
||||
// Cache the pristine base URL on first run
|
||||
if (!link.dataset.baseUrl) link.dataset.baseUrl = link.getAttribute('href');
|
||||
var url = new URL(link.dataset.baseUrl, window.location.origin);
|
||||
boxes(pair[1]).forEach(function (cb) {
|
||||
var param = cb.getAttribute(pair[1]);
|
||||
var ticked = boxes(pair[1], param).filter(function (b) { return b.checked; })[0];
|
||||
if (ticked) {
|
||||
url.searchParams.set(param, ticked.value);
|
||||
} else {
|
||||
url.searchParams.delete(param);
|
||||
}
|
||||
});
|
||||
link.setAttribute('href', url.toString());
|
||||
});
|
||||
}
|
||||
|
||||
// One box per field: ticking one unticks the others for the same field
|
||||
document.addEventListener('change', function (event) {
|
||||
var box = event.target;
|
||||
if (!box.matches || !box.matches(ANY)) return;
|
||||
if (box.checked) {
|
||||
sameField(box).forEach(function (cb) { if (cb !== box) cb.checked = false; });
|
||||
}
|
||||
updateLinks();
|
||||
});
|
||||
})();
|
||||
</script>
|
||||
@@ -1 +0,0 @@
|
||||
$('select#issue_estimate_id').html('<%= j content_tag(:option,'',value:"")+options_from_collection_for_select(@filtered_estimates, :id, :doc_number) %>');
|
||||
@@ -52,7 +52,7 @@
|
||||
<div class="splitcontent">
|
||||
<div class="splitcontentleft">
|
||||
<h4><%=t(:estimates)%>:</h4>
|
||||
<%= render partial: 'estimates/list', locals: {estimates: @customer.estimates} %>
|
||||
<%= render partial: 'estimates/list', locals: {estimates: @customer.estimates, new_issue_checkboxes: true} %>
|
||||
</div>
|
||||
|
||||
<div class="splitcontentleft">
|
||||
@@ -78,7 +78,13 @@
|
||||
<% customer_refunds.each do |refund| %>
|
||||
<tr>
|
||||
<td><%= link_to format_date(refund.txn_date), qbo_refund_path(refund) %></td>
|
||||
<td><%= refund.estimate_id.present? ? link_to("E#{refund.estimate_number}", RedmineQboBilling.writer? ? edit_qbo_estimate_path(refund.estimate_id) : estimate_path(refund.estimate_id)) : '' %></td>
|
||||
<td>
|
||||
<% if refund.invoice? %>
|
||||
<%= link_to refund.document_label, RedmineQboBilling.invoice_writer? ? edit_qbo_invoice_path(refund.invoice_id) : invoice_path(refund.invoice_id) %>
|
||||
<% elsif refund.estimate_id.present? %>
|
||||
<%= link_to("E#{refund.estimate_number}", RedmineQboBilling.writer? ? edit_qbo_estimate_path(refund.estimate_id) : estimate_path(refund.estimate_id)) %>
|
||||
<% end %>
|
||||
</td>
|
||||
<td><%= refund.method_name %></td>
|
||||
<td style="text-align: right"><%= RedmineQboBilling::RefundWriter.money(refund.refund_amount) %></td>
|
||||
<td><%= refund.done? ? '' : l(:label_refund_incomplete) %></td>
|
||||
|
||||
@@ -3,14 +3,19 @@
|
||||
<%= render partial: 'qbo_estimates/status_styles' %>
|
||||
<div class="qbo-estimate-list">
|
||||
<% estimates.sort.reverse.each do |estimate| %>
|
||||
<%# One cell each (qbo_estimates/_status_styles lines them up in columns, so the icons line up) %>
|
||||
<div class="row">
|
||||
<%= check_box_tag "estimate_ids[]", estimate.id, false, onchange: "updateLink()", data: { text: "Estimate ##{estimate.doc_number}", new_issue_param: 'issue[estimate_id]' }, class: "estimate-checkbox appointment" %>
|
||||
<b><%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %></b> <%= estimate.txn_date %>
|
||||
<%# Ticking an estimate adds it to the customer page's New issue and Add appointment links (customers/_new_issue_link_script) %>
|
||||
<span class="qbo-list-check"><%= check_box_tag "estimate_ids[]", estimate.id, false, data: { new_issue_param: 'issue[estimate_id]', appointment_param: 'estimate_id' }, class: "estimate-checkbox" if local_assigns[:new_issue_checkboxes] %></span>
|
||||
<b class="qbo-list-number"><%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %></b>
|
||||
<span class="qbo-list-date"><%= estimate.txn_date %></span>
|
||||
<%# QuickBooks status, cached by the estimate sync (kept current by the webhook) %>
|
||||
<% if estimate.txn_status.present? %>
|
||||
<span class="qbo-estimate-status qbo-estimate-status-<%= estimate.txn_status.downcase %>"><%= estimate.txn_status %></span>
|
||||
<% end %>
|
||||
<%= render partial: 'qbo_estimates/estimate_actions', locals: { estimate: estimate } if RedmineQboBilling.writer? %>
|
||||
<span class="qbo-list-status">
|
||||
<% if estimate.txn_status.present? %>
|
||||
<span class="qbo-estimate-status qbo-estimate-status-<%= estimate.txn_status.downcase %>"><%= estimate.txn_status %></span>
|
||||
<% end %>
|
||||
</span>
|
||||
<span class="qbo-list-actions"><%= render partial: 'qbo_estimates/estimate_actions', locals: { estimate: estimate } if RedmineQboBilling.writer? %></span>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@@ -13,14 +13,19 @@
|
||||
|
||||
<div class="qbo-invoice-list">
|
||||
<% invoices.sort.reverse.each do |invoice| %>
|
||||
<%# One cell each (qbo_estimates/_status_styles lines them up in columns, so the icons line up) %>
|
||||
<div class="row">
|
||||
<%= check_box_tag "invoice_ids[]", invoice.id, false, onchange: "updateLink()", data: { url: invoice_path(invoice), text: "Invoice ##{invoice.to_s}" }, class: "invoice-checkbox appointment" if invoices.count > 1 %>
|
||||
<b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
|
||||
<%# Paid / partially paid / overdue / open / voided, from the cached balance and due date %>
|
||||
<% if (status = invoice.status) %>
|
||||
<span class="qbo-estimate-status qbo-invoice-status-<%= status %>"><%= RedmineQboBilling::InvoiceStatus.label(status, paid_on: invoice.paid_on) %></span>
|
||||
<% end %>
|
||||
<%= render partial: 'qbo_invoices/invoice_actions', locals: { invoice: invoice } if RedmineQboBilling.invoice_writer? %>
|
||||
<span class="qbo-list-check"><%= check_box_tag "invoice_ids[]", invoice.id, false, class: "invoice-checkbox" if invoices.count > 1 %></span>
|
||||
<b class="qbo-list-number"><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b>
|
||||
<span class="qbo-list-date"><%= invoice.txn_date %></span>
|
||||
<%# Paid / partially paid / overdue / open / voided, from the cached balance and due date; short so the list
|
||||
stays narrow: "Paid", or "Paid +3d" when paid in full days after its date (the date on hover) %>
|
||||
<span class="qbo-list-status">
|
||||
<% if (status = invoice.status) %>
|
||||
<span class="qbo-estimate-status qbo-invoice-status-<%= status %>" title="<%= RedmineQboBilling::InvoiceStatus.title(status, paid_on: invoice.paid_on) %>"><%= RedmineQboBilling::InvoiceStatus.short_label(status, paid_on: invoice.paid_on, invoice_date: invoice.txn_date) %></span>
|
||||
<% end %>
|
||||
</span>
|
||||
<span class="qbo-list-actions"><%= render partial: 'qbo_invoices/invoice_actions', locals: { invoice: invoice } if RedmineQboBilling.invoice_writer? %></span>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@@ -14,4 +14,11 @@
|
||||
.qbo-invoice-status-open { background: #e8eefa; color: #0d47a1; }
|
||||
.qbo-invoice-status-voided { background: #eceef1; color: #6b6c72; text-decoration: line-through; }
|
||||
.qbo-invoice-list .qbo-estimate-status { font-size: .8em; padding: 1px 7px; margin-left: 4px; }
|
||||
/* The estimate and invoice lists: checkbox, number, date, status and actions in columns, so the edit/view icons
|
||||
line up; a list wider than its column scrolls instead of wrapping */
|
||||
.qbo-estimate-list, .qbo-invoice-list { display: grid; grid-template-columns: repeat(5, max-content); column-gap: .35em;
|
||||
row-gap: 2px; align-items: center; overflow-x: auto; }
|
||||
.qbo-estimate-list .row, .qbo-invoice-list .row { display: contents; }
|
||||
.qbo-estimate-list .row > *, .qbo-invoice-list .row > * { white-space: nowrap; }
|
||||
.qbo-list-status .qbo-estimate-status { margin-left: 0; }
|
||||
</style>
|
||||
@@ -6,6 +6,10 @@
|
||||
<% if RedmineQboBilling.payment_receiver? && @form.balance.to_d > 0 %>
|
||||
<%= link_to sprite_icon('add', l(:button_receive_payment)), new_qbo_payment_path(customer_id: @form.customer_id), class: 'icon icon-add' %>
|
||||
<% end %>
|
||||
<%# Completed work that's paid in full is refunded with a refund receipt %>
|
||||
<% if RedmineQboBilling.refunder? && @form.total.to_d.positive? && @form.balance.to_d <= 0 %>
|
||||
<%= link_to sprite_icon('arrow-narrow-left', l(:label_refund)), new_invoice_qbo_refunds_path(invoice_id: @form.id), class: 'icon icon-arrow-narrow-left' %>
|
||||
<% end %>
|
||||
<%= link_to sprite_icon('application-pdf', l(:label_estimate_pdf)), invoice_path(@form.id), class: 'icon icon-pdf', target: :_blank %>
|
||||
<% if RedmineQboBilling.invoice_sender? && @form.email.present? %>
|
||||
<%= link_to sprite_icon('email', l(:button_email_estimate)), send_email_qbo_invoice_path(@form.id, email: @form.email),
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
<% money = ->(amount) { RedmineQboBilling::RefundWriter.money(amount) } -%>
|
||||
<%= t(:text_refund_email_greeting, name: @customer&.name.to_s) %>
|
||||
|
||||
<%= t(:text_refund_email_intro, shop: @shop_name, order: @refund.estimate_number.present? ? "E#{@refund.estimate_number}" : t(:label_refund_your_order)) %>
|
||||
<%= t(:text_refund_email_intro, shop: @shop_name, order: @refund.document_label || t(:label_refund_your_order)) %>
|
||||
|
||||
<% if @refund.invoice? -%>
|
||||
<% @refund.refunded_lines.each do |line| -%>
|
||||
<%= line.description %>: <%= money.(line.amount) %>
|
||||
<% end -%>
|
||||
<%= t(:label_refund_lines_amount) %>: <%= money.(@refund.lines_amount) %>
|
||||
<% if @refund.discount_amount.to_d.positive? -%>
|
||||
<%= t(:label_refund_discount) %>: -<%= money.(@refund.discount_amount) %>
|
||||
<% end -%>
|
||||
<%= t(:label_refund_tax) %>: <%= money.(@refund.tax_amount) %>
|
||||
<% end -%>
|
||||
<% if @refund.fee_amount.to_d.positive? -%>
|
||||
<%= t(:label_refund_parts) %>: <%= money.(@refund.parts_amount) %>
|
||||
<%= t(:label_refund_fee_rate, rate: RedmineQboBilling::RefundWriter.plain(@refund.fee_rate)) %>: <%= money.(@refund.fee_amount) %>
|
||||
@@ -10,6 +20,10 @@
|
||||
<%= t(:label_refund_amount) %>: <%= money.(@refund.refund_amount) %>
|
||||
<%= @refund.check? ? t(:text_refund_email_check, number: @refund.check_number) : t(:text_refund_email_card) %>
|
||||
|
||||
<% if !@refund.invoice? -%>
|
||||
<%= t(:text_refund_email_terms) %>
|
||||
<% elsif @refund.fee_amount.to_d.positive? -%>
|
||||
<%= t(:text_refund_email_terms_invoice) %>
|
||||
<% end -%>
|
||||
|
||||
<%= @shop_name %>
|
||||
@@ -13,6 +13,21 @@
|
||||
|
||||
<p class="warning"><%= l(:text_refund_final_sale) %></p>
|
||||
|
||||
<%# Completed work on a paid invoice is refunded from the invoice (a refund receipt), not from credit %>
|
||||
<% if @invoices.present? %>
|
||||
<%= form_tag new_invoice_qbo_refunds_path, method: :get, id: 'qbo-refund-invoice' do %>
|
||||
<div class="box tabular">
|
||||
<p>
|
||||
<label for="qbo_refund_invoice"><%= l(:label_refund_paid_invoice) %></label>
|
||||
<%= select_tag 'invoice_id', options_for_select(@invoices), include_blank: true, id: 'qbo_refund_invoice',
|
||||
onchange: 'if (this.value) this.form.submit()' %>
|
||||
<noscript><%= submit_tag l(:button_apply), name: nil %></noscript>
|
||||
<em class="info"><%= l(:text_refund_paid_invoice) %></em>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% if preview && preview.credits.empty? %>
|
||||
<p class="nodata"><%= l(:text_refund_no_credit) %></p>
|
||||
<% end %>
|
||||
|
||||
@@ -0,0 +1,195 @@
|
||||
<%# Refund of completed work on a paid invoice: a QuickBooks Refund Receipt (InvoiceRefundWriter) %>
|
||||
<% html_title "#{l(:label_refund)} #{l(:label_refund_invoice_number, number: @invoice.doc_number)}" %>
|
||||
<% writer = RedmineQboBilling::RefundWriter %>
|
||||
<% money = ->(amount) { writer.money(amount) } %>
|
||||
<% plan = @plan %>
|
||||
<% number = @invoice.doc_number.to_s %>
|
||||
|
||||
<h2>
|
||||
<%= link_to l(:label_customers), customers_path %> »
|
||||
<%= link_to @customer.name, customer_path(@customer) %> »
|
||||
<%= link_to l(:label_refund_invoice_number, number: number), edit_qbo_invoice_path(@invoice.id) %> »
|
||||
<%= l(:label_refund) %>
|
||||
</h2>
|
||||
|
||||
<%= error_messages_for @form %>
|
||||
|
||||
<p class="warning"><%= l(:text_refund_final_sale) %></p>
|
||||
|
||||
<% if @refunds.any? %>
|
||||
<div class="flash warning">
|
||||
<%= l(:text_refund_invoice_earlier) %>
|
||||
<%= safe_join(@refunds.map { |r| link_to("#{format_date(r.txn_date)} · #{money.(r.refund_amount)}", qbo_refund_path(r)) }, ', ') %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= form_tag create_invoice_qbo_refunds_path, method: :post, id: 'qbo-refund-form' do %>
|
||||
<%= hidden_field_tag 'refund[customer_id]', @customer.id, id: nil %>
|
||||
<%= hidden_field_tag 'refund[invoice_id]', @invoice.id, id: nil %>
|
||||
|
||||
<fieldset class="box" id="qbo-refund-lines">
|
||||
<legend><%= l(:label_refund_invoice_lines, number: number, date: format_date(@invoice.txn_date)) %></legend>
|
||||
<table class="list" data-discount-rate="<%= plan.discount_rate.to_s('F') %>" data-tax-rate="<%= plan.tax_rate.to_s('F') %>"
|
||||
data-fee-rate="<%= plan.fee_rate.to_s('F') %>">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
<th style="text-align: left"><%= l(:label_refund_line) %></th>
|
||||
<th></th>
|
||||
<th style="text-align: right"><%= l(:label_refund_line_billed) %></th>
|
||||
<th style="text-align: right"><%= l(:label_refund_line_refunded) %></th>
|
||||
<th><%= l(:label_refund_line_quantity) %></th>
|
||||
<th><%= l(:label_refund_line_amount) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @lines.each do |line| %>
|
||||
<% choice = @form.line(line.key) %>
|
||||
<% field = "refund[lines][#{line.key}]" %>
|
||||
<% dom = "qbo_refund_line_#{line.key.parameterize(separator: '_')}" %>
|
||||
<tr class="qbo-refund-line<%= ' disabled' unless line.refundable? %>" data-rate="<%= line.rate&.to_s('F') %>"
|
||||
data-parts="<%= line.parts ? 1 : 0 %>" data-taxable="<%= line.taxable ? 1 : 0 %>">
|
||||
<td>
|
||||
<% if line.refundable? %>
|
||||
<%= hidden_field_tag "#{field}[refund]", '0', id: nil %>
|
||||
<%= check_box_tag "#{field}[refund]", '1', choice&.refund?, id: dom, class: 'qbo-refund-pick' %>
|
||||
<% end %>
|
||||
</td>
|
||||
<td style="text-align: left">
|
||||
<label for="<%= dom %>">
|
||||
<% if line.item_name.present? %><strong><%= line.item_name %></strong><br><% end %>
|
||||
<%= line.description %>
|
||||
</label>
|
||||
</td>
|
||||
<td><span class="badge <%= line.parts ? 'badge-status-open' : 'badge-status-closed' %>"><%= l(line.parts ? :label_refund_parts : :label_refund_labor) %></span>
|
||||
<% if line.taxable %><span class="badge"><%= l(:label_refund_taxable) %></span><% end %></td>
|
||||
<td style="text-align: right">
|
||||
<% if line.quantity && line.rate %><%= writer.plain(line.quantity) %> × <%= money.(line.rate) %><br><% end %>
|
||||
<%= money.(line.amount) %>
|
||||
</td>
|
||||
<td style="text-align: right"><%= line.refunded_amount.positive? ? money.(line.refunded_amount) : '' %></td>
|
||||
<% if line.refundable? %>
|
||||
<td style="white-space: nowrap">
|
||||
<% if line.quantity && line.rate %>
|
||||
<%= text_field_tag "#{field}[quantity]", choice&.quantity, size: 5, inputmode: 'decimal', autocomplete: 'off',
|
||||
class: 'qbo-refund-quantity', 'aria-label': l(:label_refund_line_quantity) %>
|
||||
<em class="info">/ <%= writer.plain(line.remaining_quantity) %></em>
|
||||
<% end %>
|
||||
</td>
|
||||
<td style="white-space: nowrap">
|
||||
$<%= text_field_tag "#{field}[amount]", choice&.amount, size: 9, inputmode: 'decimal', autocomplete: 'off',
|
||||
class: 'qbo-refund-line-amount', 'aria-label': l(:label_refund_line_amount),
|
||||
data: { max: line.remaining_amount.to_s('F') } %>
|
||||
</td>
|
||||
<% else %>
|
||||
<td colspan="2"><em class="info"><%= l(:text_refund_line_done) %></em></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<p><em class="info"><%= l(:text_refund_invoice_lines) %></em></p>
|
||||
</fieldset>
|
||||
|
||||
<div class="box tabular">
|
||||
<p>
|
||||
<label for="qbo_refund_charge_fee"><%= l(:label_refund_charge_fee) %></label>
|
||||
<%= hidden_field_tag 'refund[charge_fee]', '0', id: nil %>
|
||||
<%= check_box_tag 'refund[charge_fee]', '1', @form.charge_fee?, id: 'qbo_refund_charge_fee' %>
|
||||
<%= l(:label_refund_fee_rate, rate: writer.plain(plan.fee_rate)) %>
|
||||
<em class="info"><%= l(:text_refund_charge_fee) %></em>
|
||||
</p>
|
||||
<p>
|
||||
<label><%= l(:label_refund_method) %><span class="required"> *</span></label>
|
||||
<label class="inline"><%= radio_button_tag 'refund[method]', 'check', @form.method == 'check', id: 'qbo_refund_method_check' %> <%= l(:label_refund_method_check) %></label>
|
||||
<label class="inline"><%= radio_button_tag 'refund[method]', 'card', @form.method == 'card', id: 'qbo_refund_method_card' %> <%= l(:label_refund_method_card) %></label>
|
||||
<em class="info"><%= l(:text_refund_method) %></em>
|
||||
</p>
|
||||
<p id="qbo-refund-check-number">
|
||||
<label for="qbo_refund_check_number"><%= l(:label_refund_check_number) %><span class="required"> *</span></label>
|
||||
<%= text_field_tag 'refund[check_number]', @form.check_number, id: 'qbo_refund_check_number', size: 12, maxlength: 21 %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="qbo_refund_date"><%= l(:label_refund_date) %><span class="required"> *</span></label>
|
||||
<%= date_field_tag 'refund[txn_date]', @form.txn_date, id: 'qbo_refund_date' %>
|
||||
</p>
|
||||
<p>
|
||||
<label for="qbo_refund_reason"><%= l(:label_refund_reason) %><span class="required"> *</span></label>
|
||||
<%= text_area_tag 'refund[reason]', @form.reason, id: 'qbo_refund_reason', rows: 3, cols: 60, maxlength: 2000 %>
|
||||
<em class="info"><%= l(:text_refund_invoice_reason) %></em>
|
||||
</p>
|
||||
<p>
|
||||
<label><%= l(:label_refund_also) %></label>
|
||||
<% [[:note_issues, :label_refund_note_issues], [:email_customer, :label_refund_email_customer]].each do |flag, label| %>
|
||||
<label class="block">
|
||||
<%= hidden_field_tag "refund[#{flag}]", '0', id: nil %>
|
||||
<%= check_box_tag "refund[#{flag}]", '1', @form.send(:"#{flag}?"), id: "qbo_refund_#{flag}" %>
|
||||
<%= l(label) %>
|
||||
</label>
|
||||
<% end %>
|
||||
<% if @customer.email.blank? %><em class="info"><%= l(:text_refund_no_email) %></em><% end %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<fieldset class="box" id="qbo-refund-preview">
|
||||
<legend><%= l(:label_refund_summary) %></legend>
|
||||
<table class="list">
|
||||
<tbody>
|
||||
<tr><td><%= l(:label_refund_lines_amount) %></td><td style="text-align: right" id="qbo-refund-lines-amount"><%= money.(plan.lines_amount) %></td></tr>
|
||||
<tr id="qbo-refund-discount-row"<%= ' style="display: none"'.html_safe unless plan.discount_rate.positive? %>>
|
||||
<td><%= l(:label_refund_discount) %></td><td style="text-align: right" id="qbo-refund-discount">-<%= money.(plan.discount) %></td>
|
||||
</tr>
|
||||
<tr><td><%= l(:label_refund_tax_estimate) %></td><td style="text-align: right" id="qbo-refund-tax"><%= money.(plan.tax) %></td></tr>
|
||||
<tr><td><%= l(:label_refund_fee_on_parts) %> (<span id="qbo-refund-parts"><%= money.(plan.parts_amount) %></span>)</td>
|
||||
<td style="text-align: right" id="qbo-refund-fee">-<%= money.(plan.fee) %></td></tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr><td><strong><%= l(:label_refund_amount) %></strong></td><td style="text-align: right"><strong id="qbo-refund-amount"><%= money.(plan.refund) %></strong></td></tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<p><em class="info"><%= l(:text_refund_invoice_summary) %></em></p>
|
||||
</fieldset>
|
||||
|
||||
<p><%= submit_tag l(:button_refund), data: { confirm: l(:text_refund_invoice_confirm) }, disabled: @lines.none?(&:refundable?) %></p>
|
||||
<% end %>
|
||||
|
||||
<%= javascript_tag do %>
|
||||
$(function() {
|
||||
var table = $('#qbo-refund-lines table');
|
||||
var money = function(n) { return '$' + n.toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ','); };
|
||||
var num = function(v) { return parseFloat(String(v || '').replace(/[$,\s]/g, '')) || 0; };
|
||||
var round = function(n) { return Math.round(n * 100) / 100; };
|
||||
function update() {
|
||||
var lines = 0, parts = 0, taxable = 0;
|
||||
$('tr.qbo-refund-line').each(function() {
|
||||
var row = $(this);
|
||||
if (!row.find('.qbo-refund-pick').is(':checked')) return;
|
||||
var amount = num(row.find('.qbo-refund-line-amount').val());
|
||||
lines += amount;
|
||||
if (row.data('parts') == 1) parts += amount;
|
||||
if (row.data('taxable') == 1) taxable += amount;
|
||||
});
|
||||
var discountRate = num(table.data('discount-rate')), taxRate = num(table.data('tax-rate'));
|
||||
var discount = round(lines * discountRate);
|
||||
var tax = round(taxable * (1 - discountRate) * taxRate);
|
||||
var fee = $('#qbo_refund_charge_fee').is(':checked') ? Math.round(parts * num(table.data('fee-rate'))) / 100 : 0;
|
||||
$('#qbo-refund-lines-amount').text(money(lines));
|
||||
$('#qbo-refund-discount').text('-' + money(discount));
|
||||
$('#qbo-refund-tax').text(money(tax));
|
||||
$('#qbo-refund-parts').text(money(parts));
|
||||
$('#qbo-refund-fee').text('-' + money(fee));
|
||||
$('#qbo-refund-amount').text(money(Math.max(lines - discount + tax - fee, 0)));
|
||||
}
|
||||
// A quantity refunds that many at the line's rate (the amount can still be changed after)
|
||||
$('.qbo-refund-quantity').on('input', function() {
|
||||
var row = $(this).closest('tr'), rate = num(row.data('rate'));
|
||||
if (rate) row.find('.qbo-refund-line-amount').val(round(num($(this).val()) * rate).toFixed(2));
|
||||
row.find('.qbo-refund-pick').prop('checked', num($(this).val()) > 0);
|
||||
update();
|
||||
});
|
||||
$('.qbo-refund-line-amount, #qbo_refund_charge_fee, .qbo-refund-pick').on('input change', update);
|
||||
function method() { $('#qbo-refund-check-number').toggle($('#qbo_refund_method_check').is(':checked')); }
|
||||
$('input[name="refund[method]"]').on('change', method);
|
||||
update(); method();
|
||||
});
|
||||
<% end %>
|
||||
@@ -15,7 +15,9 @@
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% if @refund.done? %>
|
||||
<% if @refund.done? && @refund.invoice? %>
|
||||
<p class="notice flash"><%= l(:text_refund_receipt_made, number: @refund.receipt_number.presence || @refund.purchase_id) %></p>
|
||||
<% elsif @refund.done? %>
|
||||
<p class="<%= @refund.balance_after.to_d.zero? ? 'notice flash' : 'warning' %>">
|
||||
<%= @refund.balance_after.nil? ? l(:text_refund_balance_unknown) : l(:text_refund_balance, balance: money.(@refund.balance_after)) %>
|
||||
</p>
|
||||
@@ -27,13 +29,39 @@
|
||||
<% end %>
|
||||
|
||||
<div class="box tabular">
|
||||
<p><label><%= l(:label_refund_estimate) %></label> <%= @refund.estimate_id.present? ? link_to("E#{@refund.estimate_number}", RedmineQboBilling.writer? ? edit_qbo_estimate_path(@refund.estimate_id) : estimate_path(@refund.estimate_id)) : l(:label_refund_no_estimate) %></p>
|
||||
<p><label><%= l(:label_refund_reason) %></label> <%= @refund.reason %></p>
|
||||
<p><label><%= l(:label_refund_credit) %></label> <%= money.(@refund.credit_amount) %></p>
|
||||
<% if @refund.invoice? %>
|
||||
<p><label><%= l(:label_refund_invoice) %></label>
|
||||
<%= link_to @refund.document_label, RedmineQboBilling.invoice_writer? ? edit_qbo_invoice_path(@refund.invoice_id) : invoice_path(@refund.invoice_id) %>
|
||||
· <%= l(:label_refund_paid_on_invoice) %> <%= money.(@refund.credit_amount) %></p>
|
||||
<p><label><%= l(:label_refund_reason) %></label> <%= @refund.reason %></p>
|
||||
<p><label><%= l(:label_refund_lines_amount) %></label> <%= money.(@refund.lines_amount) %></p>
|
||||
<% if @refund.refunded_lines.any? %>
|
||||
<table class="list" style="max-width: 50em">
|
||||
<tbody>
|
||||
<% @refund.refunded_lines.each do |line| %>
|
||||
<tr>
|
||||
<td style="text-align: left"><%= line.description %></td>
|
||||
<td><%= l(line.parts ? :label_refund_parts : :label_refund_labor) %></td>
|
||||
<td style="text-align: right"><%= RedmineQboBilling::RefundWriter.plain(BigDecimal(line.quantity.to_s)) if line.quantity.present? %></td>
|
||||
<td style="text-align: right"><%= money.(line.amount) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end %>
|
||||
<% if @refund.discount_amount.to_d.positive? %>
|
||||
<p><label><%= l(:label_refund_discount) %></label> -<%= money.(@refund.discount_amount) %></p>
|
||||
<% end %>
|
||||
<p><label><%= l(:label_refund_tax) %></label> <%= money.(@refund.tax_amount) %></p>
|
||||
<% else %>
|
||||
<p><label><%= l(:label_refund_estimate) %></label> <%= @refund.estimate_id.present? ? link_to("E#{@refund.estimate_number}", RedmineQboBilling.writer? ? edit_qbo_estimate_path(@refund.estimate_id) : estimate_path(@refund.estimate_id)) : l(:label_refund_no_estimate) %></p>
|
||||
<p><label><%= l(:label_refund_reason) %></label> <%= @refund.reason %></p>
|
||||
<p><label><%= l(:label_refund_credit) %></label> <%= money.(@refund.credit_amount) %></p>
|
||||
<% end %>
|
||||
<p><label><%= l(:label_refund_parts) %></label> <%= money.(@refund.parts_amount) %></p>
|
||||
<p>
|
||||
<label><%= l(:label_refund_fee_rate, rate: RedmineQboBilling::RefundWriter.plain(@refund.fee_rate)) %></label>
|
||||
<%= money.(@refund.fee_amount) %>
|
||||
<%= @refund.fee_amount.to_d.positive? ? money.(@refund.fee_amount) : l(:label_refund_no_fee) %>
|
||||
<% if @refund.fee_invoice_id.present? %>
|
||||
· <%= link_to l(:label_refund_fee_invoice, number: @refund.fee_invoice_number), RedmineQboBilling.invoice_writer? ? edit_qbo_invoice_path(@refund.fee_invoice_id) : invoice_path(@refund.fee_invoice_id) %>
|
||||
<% end %>
|
||||
@@ -42,12 +70,17 @@
|
||||
<label><%= l(:label_refund_amount) %></label>
|
||||
<%= money.(@refund.refund_amount) %> · <%= @refund.method_name %><%= " ##{@refund.check_number}" if @refund.check? %>
|
||||
<% if @refund.purchase_url %>
|
||||
· <%= link_to l(@refund.check? ? :label_refund_open_check : :label_refund_open_expense), @refund.purchase_url, target: '_blank', rel: 'noopener' %>
|
||||
· <%= link_to l(@refund.invoice? ? :label_refund_open_receipt : (@refund.check? ? :label_refund_open_check : :label_refund_open_expense)),
|
||||
@refund.purchase_url, target: '_blank', rel: 'noopener' %>
|
||||
<% end %>
|
||||
</p>
|
||||
<% if @refund.estimate_number.present? %>
|
||||
<p><label><%= l(:label_refund_close_estimate) %></label> <%= checked_image @refund.estimate_closed? %></p>
|
||||
<% end %>
|
||||
<% if @refund.noted_issue_ids.any? %>
|
||||
<p><label><%= l(:label_refund_note_issues) %></label>
|
||||
<%= safe_join(Issue.where(id: @refund.noted_issue_ids).map { |issue| link_to_issue(issue, project: false) }, ', ') %></p>
|
||||
<% end %>
|
||||
<% if @refund.canceled_issue_ids.any? %>
|
||||
<p><label><%= l(:label_refund_cancel_issues) %></label>
|
||||
<%= safe_join(Issue.where(id: @refund.canceled_issue_ids).map { |issue| link_to_issue(issue, project: false) }, ', ') %></p>
|
||||
|
||||
@@ -186,54 +186,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><%= l(:label_report_taxes) %></h3>
|
||||
<div class="splitcontent">
|
||||
<div class="splitcontentleft">
|
||||
<div class="qbo-report-chart">
|
||||
<canvas id="qbo-chart-taxes" data-kind="money" data-series="<%= tax_series.to_json %>"></canvas>
|
||||
</div>
|
||||
<table class="list qbo-report">
|
||||
<tbody>
|
||||
<% [[:tax_invoiced, l(:label_report_tax_invoiced)], [:tax_collected, l(:label_report_tax_collected)]].each do |key, label| %>
|
||||
<tr>
|
||||
<td class="name"><%= label %> <span class="count">(<%= l(:label_report_taxed_invoices, count: taxes[key][:count]) %>)</span></td>
|
||||
<td class="bar"><div class="qbo-bar qbo-bar-<%= key %>" style="width: <%= bar.call(taxes[key][:total], max_tax) %>%"></div></td>
|
||||
<td class="value"><%= number_to_currency(taxes[key][:total]) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<p><em class="info"><%= l(:text_report_taxes) %></em></p>
|
||||
</div>
|
||||
<div class="splitcontentright">
|
||||
<table class="list qbo-report-months qbo-report-tax-months">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="month"><%= l(:label_month) %></th>
|
||||
<th><%= l(:label_report_tax_invoiced) %></th>
|
||||
<th><%= l(:label_report_tax_collected) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @report.months.each do |row| %>
|
||||
<tr>
|
||||
<td class="month"><%= ::I18n.t('date.abbr_month_names')[row[:month].month] %> <%= row[:month].year %></td>
|
||||
<td><%= number_to_currency(row[:tax_invoiced]) %></td>
|
||||
<td><%= number_to_currency(row[:tax_collected]) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr class="total">
|
||||
<td class="month"><strong><%= l(:label_total) %></strong></td>
|
||||
<td><strong><%= number_to_currency(taxes[:tax_invoiced][:total]) %></strong></td>
|
||||
<td><strong><%= number_to_currency(taxes[:tax_collected][:total]) %></strong></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><%= l(:label_report_by_month) %></h3>
|
||||
<div class="autoscroll">
|
||||
<table class="list qbo-report-months">
|
||||
@@ -283,6 +235,54 @@
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
<h3><%= l(:label_report_taxes) %></h3>
|
||||
<div class="splitcontent">
|
||||
<div class="splitcontentleft">
|
||||
<div class="qbo-report-chart">
|
||||
<canvas id="qbo-chart-taxes" data-kind="money" data-series="<%= tax_series.to_json %>"></canvas>
|
||||
</div>
|
||||
<table class="list qbo-report">
|
||||
<tbody>
|
||||
<% [[:tax_invoiced, l(:label_report_tax_invoiced)], [:tax_collected, l(:label_report_tax_collected)]].each do |key, label| %>
|
||||
<tr>
|
||||
<td class="name"><%= label %> <span class="count">(<%= l(:label_report_taxed_invoices, count: taxes[key][:count]) %>)</span></td>
|
||||
<td class="bar"><div class="qbo-bar qbo-bar-<%= key %>" style="width: <%= bar.call(taxes[key][:total], max_tax) %>%"></div></td>
|
||||
<td class="value"><%= number_to_currency(taxes[key][:total]) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<p><em class="info"><%= l(:text_report_taxes) %></em></p>
|
||||
</div>
|
||||
<div class="splitcontentright">
|
||||
<table class="list qbo-report-months qbo-report-tax-months">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="month"><%= l(:label_month) %></th>
|
||||
<th><%= l(:label_report_tax_invoiced) %></th>
|
||||
<th><%= l(:label_report_tax_collected) %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% @report.months.each do |row| %>
|
||||
<tr>
|
||||
<td class="month"><%= ::I18n.t('date.abbr_month_names')[row[:month].month] %> <%= row[:month].year %></td>
|
||||
<td><%= number_to_currency(row[:tax_invoiced]) %></td>
|
||||
<td><%= number_to_currency(row[:tax_collected]) %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr class="total">
|
||||
<td class="month"><strong><%= l(:label_total) %></strong></td>
|
||||
<td><strong><%= number_to_currency(taxes[:tax_invoiced][:total]) %></strong></td>
|
||||
<td><strong><%= number_to_currency(taxes[:tax_collected][:total]) %></strong></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="info"><%= l(:text_report_notes) %></p>
|
||||
|
||||
<style>
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
function updateLink() {
|
||||
console.log("updateLink called");
|
||||
const linkElement = document.getElementById("appointment_link");
|
||||
const regex = /((?:<br\/>|%3Cbr\/?%3E))([\s\S]*?)(&dates)/gi;
|
||||
linkElement.href = linkElement.href.replace(regex, `$1${getSelectedDocs()}$3`);
|
||||
}
|
||||
|
||||
function getSelectedDocs() {
|
||||
const appointent_extras = document.querySelectorAll('.appointment');
|
||||
|
||||
let output = '';
|
||||
for (const item of appointent_extras) {
|
||||
if (item.checked) {
|
||||
console.log(`Checked item: ${item.dataset.text} with URL: ${item.dataset.url}`);
|
||||
output += `%0A`+ encodeURIComponent(`<a href="${window.location.origin}${item.dataset.url}">${item.dataset.text}</a>`) +`%0A`;
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
@@ -1,8 +1,3 @@
|
||||
/* Keep Redmine default look, just enhance metadata */
|
||||
.ui-autocomplete .autocomplete-meta {
|
||||
color: #888;
|
||||
font-size: 0.9em;
|
||||
}
|
||||
/* Contextual links on their own line under the page title (customer and vehicle pages), where a long title and
|
||||
many links would otherwise crowd each other */
|
||||
#content .contextual.qbo-under-title {
|
||||
|
||||
+51
-28
@@ -29,14 +29,11 @@ en:
|
||||
field_invoice: "Invoice"
|
||||
field_notes: "Notes"
|
||||
label_account_balance: "Account Balance"
|
||||
label_actions: "Actions"
|
||||
label_amount: "Amount"
|
||||
label_appointment: "Add Appointment"
|
||||
label_balance_with_jobs: "Balance With Jobs"
|
||||
label_bill_time: "Bill Time"
|
||||
label_billing_address: "Billing Address"
|
||||
label_billing_enqueued: "Billing has been enqueued for issue"
|
||||
label_billed_success: "Successfully billed "
|
||||
label_client_id: "Intuit QBO OAuth2 Client ID"
|
||||
label_client_secret: "Intuit QBO OAuth2 Client Secret"
|
||||
label_closed_issues: "Closed Issues"
|
||||
@@ -45,23 +42,17 @@ en:
|
||||
label_customer_link_expires: "This customer link expires in"
|
||||
label_customer: "Customer"
|
||||
label_customers: "Customers"
|
||||
label_delete: "Delete"
|
||||
label_deposit_into: "Deposit to Account"
|
||||
label_details: "Details"
|
||||
label_display_name: "Display Name"
|
||||
label_door: "Door"
|
||||
label_edit: "Edit"
|
||||
label_edit_customer: "Edit Customer"
|
||||
label_email: "Email"
|
||||
label_error: "Error"
|
||||
label_estimate_404: "Estimate not found"
|
||||
label_estimate: "Estimate"
|
||||
label_estimates: "Estimates"
|
||||
label_hours: "Hours"
|
||||
label_invoice_404: "Invoice not found"
|
||||
label_invoices: "Invoices"
|
||||
label_last_sync: "Last Sync"
|
||||
label_load_customer: "Load Customer"
|
||||
label_make: "Make"
|
||||
label_matching: "Matching"
|
||||
label_mobile_phone: "Mobile Phone"
|
||||
@@ -74,13 +65,9 @@ en:
|
||||
text_customers_best_match: "%{count} best matches, closest first. Click a column to sort them by it instead."
|
||||
label_no_estimates: "No Estimates"
|
||||
label_no_invoices: "No Invoices"
|
||||
label_oauth2_refresh_token_expires_at: "Refresh Token Expires At"
|
||||
label_oauth_expires: "OAuth2 Access Token Expires At"
|
||||
label_oauth_note: "Note: You need to authenticate with QuickBooks after saving your key and secret above."
|
||||
label_open_issues: "Open Issues"
|
||||
label_primary_phone: "Primary Phone"
|
||||
label_qbo_sync_success: "Successfully synced to QuickBooks"
|
||||
label_redmine_qbo: "Redmine QuickBooks"
|
||||
label_sandbox: "Sandbox"
|
||||
label_search: "Search"
|
||||
label_search_customers: "Search Customers"
|
||||
@@ -97,23 +84,11 @@ en:
|
||||
notice_billing_error_no_customer: "Cannot bill without an assigned customer."
|
||||
notice_billing_error_no_employee: "Cannot bill without an assigned employee."
|
||||
notice_billing_error_no_qbo: "Cannot bill without a QuickBooks connection. Please connect to QuickBooks and try again."
|
||||
notice_customer_created: "Customer created in QuickBooks"
|
||||
notice_customer_deleted: "Customer deleted in QuickBooks"
|
||||
notice_customer_not_deleted: "Customer could not be deleted in QuickBooks"
|
||||
notice_customer_not_found: "Customer not found in QuickBooks"
|
||||
notice_customer_updated: "Customer updated in QuickBooks"
|
||||
notice_error_issue_not_found: "The issue could not be found. Please check the issue and try again."
|
||||
notice_error_project_nil: "The issue's project is nil. Set project to:"
|
||||
notice_error_tracker_nil: "The issue's tracker is nil. Set tracker to:"
|
||||
notice_estimate_created: "Estimate created in QuickBooks"
|
||||
notice_estimate_not_found: "Estimate not found, we are syncing with QuickBooks to find it. Please check back shortly."
|
||||
notice_estimate_updated: "Estimate updated in QuickBooks"
|
||||
notice_forbidden: "You do not have permission to access this resource."
|
||||
notice_invoice_created: "Invoice created in QuickBooks"
|
||||
notice_invoice_not_found: "Invoice not found"
|
||||
notice_invoice_updated: "Invoice updated in QuickBooks"
|
||||
notice_issue_not_found: "Issue not found"
|
||||
warn_ru_sure: "Are you sure?"
|
||||
|
||||
# ---- Billing: estimates, invoices, payments, items and accounts ----
|
||||
label_billing_settings: "Billing"
|
||||
@@ -247,7 +222,6 @@ en:
|
||||
label_default_account: "Default Item Income Account"
|
||||
label_description: "Description"
|
||||
label_edit_item: "Edit Item"
|
||||
label_item: "Item"
|
||||
label_item_new: "New Item"
|
||||
label_items: "Items"
|
||||
label_management_and_sync: "Synchronization"
|
||||
@@ -261,9 +235,7 @@ en:
|
||||
text_qbo_sync_info: "Sync changes reads what changed in QuickBooks since the last sync; Full sync and each type's Sync re-read every record (e.g. after changing the labor products/services, sync estimates and invoices). Webhooks keep things current in between."
|
||||
text_default_account_info: "New products/services go in this income account; set it on the Accounts page."
|
||||
label_never_synced: "Never synced"
|
||||
label_no: "No"
|
||||
label_type: "Type"
|
||||
label_yes: "Yes"
|
||||
error_default_account_not_selected: "Select an account to make it the default."
|
||||
notice_default_account_updated: "Default account updated."
|
||||
|
||||
@@ -290,6 +262,8 @@ en:
|
||||
label_invoice_no: "Invoice no."
|
||||
label_invoice_status_paid: "Paid"
|
||||
label_invoice_status_paid_on: "Paid %{date}"
|
||||
label_invoice_status_paid_days: "Paid +%{days}d"
|
||||
text_invoice_paid_in_full: "Paid in full %{date}"
|
||||
label_invoice_status_partial: "Partially paid"
|
||||
label_invoice_status_overdue: "Overdue"
|
||||
label_invoice_status_open: "Open"
|
||||
@@ -534,3 +508,52 @@ en:
|
||||
text_refund_check_account: "The bank account refund checks are written from."
|
||||
text_refund_card_account: "The account card refunds come out of (where card payments are deposited)."
|
||||
text_refund_canceled_status: "Work orders of a canceled order are set to this status, with the reason as a note."
|
||||
|
||||
# Refunds of paid invoices: completed work, billed and paid in full (a QuickBooks Refund Receipt)
|
||||
label_refund_invoice: "Invoice"
|
||||
label_refund_invoice_number: "Invoice #%{number}"
|
||||
label_refund_paid_invoice: "Paid invoice"
|
||||
label_refund_invoice_lines: "Invoice #%{number} · %{date}"
|
||||
label_refund_line: "Line"
|
||||
label_refund_line_billed: "Billed"
|
||||
label_refund_line_refunded: "Refunded before"
|
||||
label_refund_line_quantity: "Qty to refund"
|
||||
label_refund_line_amount: "Amount to refund"
|
||||
label_refund_labor: "Labor"
|
||||
label_refund_taxable: "Taxable"
|
||||
label_refund_charge_fee: "Restocking fee"
|
||||
label_refund_note_issues: "Note the refund on the invoice's work orders"
|
||||
label_refund_lines_amount: "Lines refunded"
|
||||
label_refund_discount: "Invoice discount (its share)"
|
||||
label_refund_tax_estimate: "Sales tax (estimated)"
|
||||
label_refund_tax: "Sales tax"
|
||||
label_refund_fee_on_parts: "Restocking fee on parts"
|
||||
label_refund_paid_on_invoice: "paid"
|
||||
label_refund_no_fee: "None"
|
||||
label_refund_open_receipt: "Refund receipt in QuickBooks"
|
||||
label_refund_receipt: "Refund receipt"
|
||||
text_refund_paid_invoice: "Completed work that's billed and paid in full: open its invoice to refund some or all of it (a refund receipt in QuickBooks). The rest of this page refunds customer credit, e.g. a canceled order's deposit."
|
||||
text_refund_invoice_lines: "Tick the lines to refund. Change the quantity (parts returned) or the amount (a partial refund) as needed; a line can't be refunded for more than was billed, less what earlier refunds took."
|
||||
text_refund_line_done: "Already refunded"
|
||||
text_refund_charge_fee: "Charged on the parts refunded only; labor carries no fee. Leave it off when the parts aren't coming back, or there are none."
|
||||
text_refund_invoice_reason: "Goes on the refund receipt in QuickBooks and on the invoice's work orders."
|
||||
text_refund_invoice_summary: "QuickBooks works out the sales tax on the refund receipt, so the refund can differ from this estimate by a few cents. The refund's page shows the exact amount to refund on the terminal or check."
|
||||
text_refund_invoice_confirm: "Record this refund receipt in QuickBooks?"
|
||||
text_refund_invoice_earlier: "This invoice has been refunded before:"
|
||||
text_refund_receipt_made: "Done. Refund receipt %{number} is recorded in QuickBooks. Refund exactly the amount below."
|
||||
text_refund_receipt_number: "No. %{number}"
|
||||
text_refund_receipt_memo: "Refund for invoice #%{number}"
|
||||
text_refund_invoice_private_note: "Refund of invoice #%{number} made in Redmine (SOP-OPS-014). Reason: %{reason}"
|
||||
text_refund_invoice_issue_note: "Refunded %{amount} on invoice #%{number} by %{method}: %{reason}"
|
||||
text_refund_issues_not_noted: "The refund couldn't be noted on some work orders: %{issues}"
|
||||
text_refund_email_terms_invoice: "As in our posted terms, returned parts carry a restocking fee."
|
||||
error_refund_no_invoice: "Pick the invoice to refund."
|
||||
error_refund_no_lines: "Tick at least one line to refund."
|
||||
error_refund_line_gone: "A line to refund isn't on the invoice any more. Reload the page."
|
||||
error_refund_line_quantity: "%{line}: the quantity must be more than 0 and no more than %{quantity}."
|
||||
error_refund_line_amount: "%{line}: enter an amount to refund of more than $0.00."
|
||||
error_refund_line_over: "%{line}: no more than %{amount} is left to refund."
|
||||
error_refund_fee_over_lines: "The restocking fee (%{fee}) isn't less than what's refunded (%{amount})."
|
||||
error_refund_invoice_customer: "That invoice is for another customer."
|
||||
error_refund_invoice_not_paid: "Only an invoice that's paid in full can be refunded here. Take or refund the payment in QuickBooks."
|
||||
error_refund_step_receipt: "The refund receipt couldn't be recorded in QuickBooks: %{error}. Nothing was refunded."
|
||||
+6
-6
@@ -33,11 +33,7 @@ post 'bill/:id', to: 'qbo#bill', as: :bill
|
||||
get 'customers/view/:token', to: 'customers#view', as: :view
|
||||
get 'customers/share/:id', to: 'customers#share', as: :share
|
||||
|
||||
#java script routes
|
||||
get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
|
||||
get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'
|
||||
|
||||
resources :customers do
|
||||
resources :customers, except: [:destroy] do
|
||||
collection do
|
||||
get :autocomplete
|
||||
get :sync
|
||||
@@ -77,6 +73,10 @@ resources :qbo_refunds, only: [:new, :create, :show] do
|
||||
get :pdf
|
||||
post :email
|
||||
end
|
||||
collection do
|
||||
get :new_invoice
|
||||
post :create_invoice
|
||||
end
|
||||
end
|
||||
|
||||
# Receive payment pages, and a customer's payments (/qbo_payments?customer_id=)
|
||||
@@ -99,7 +99,7 @@ resources :items do
|
||||
end
|
||||
|
||||
# QuickBooks income accounts
|
||||
resources :accounts do
|
||||
resources :accounts, only: [:index] do
|
||||
collection do
|
||||
patch :set_default
|
||||
get :sync
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
#The MIT License (MIT)
|
||||
#
|
||||
#Copyright (c) 2026 rick barrette
|
||||
#
|
||||
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
# Refunds of paid invoices (completed, billed and paid-in-full work): a QuickBooks Refund Receipt for the lines
|
||||
# refunded, with an optional restocking fee, alongside the refunds of customer credit (canceled orders)
|
||||
class AddInvoiceRefunds < ActiveRecord::Migration[7.0]
|
||||
def up
|
||||
# credit: a canceled order's deposit (fee invoice + check/expense); invoice: a paid invoice (refund receipt)
|
||||
add_column :qbo_refunds, :kind, :string, null: false, default: 'credit', limit: 10 unless column_exists?(:qbo_refunds, :kind)
|
||||
add_column :qbo_refunds, :invoice_id, :bigint unless column_exists?(:qbo_refunds, :invoice_id)
|
||||
add_column :qbo_refunds, :invoice_number, :string unless column_exists?(:qbo_refunds, :invoice_number)
|
||||
# The Refund Receipt's number (its id is purchase_id)
|
||||
add_column :qbo_refunds, :receipt_number, :string unless column_exists?(:qbo_refunds, :receipt_number)
|
||||
# The refunded lines before the discount, fee and tax; the invoice discount's share; the tax refunded
|
||||
add_column :qbo_refunds, :lines_amount, :decimal, precision: 15, scale: 2, null: false, default: 0 unless column_exists?(:qbo_refunds, :lines_amount)
|
||||
add_column :qbo_refunds, :discount_amount, :decimal, precision: 15, scale: 2, null: false, default: 0 unless column_exists?(:qbo_refunds, :discount_amount)
|
||||
add_column :qbo_refunds, :tax_amount, :decimal, precision: 15, scale: 2, null: false, default: 0 unless column_exists?(:qbo_refunds, :tax_amount)
|
||||
# The lines refunded (JSON: key, description, quantity, amount, parts), so a line isn't refunded twice
|
||||
add_column :qbo_refunds, :refunded_lines, :text unless column_exists?(:qbo_refunds, :refunded_lines)
|
||||
# The work orders the refund was noted on (JSON list of issue ids)
|
||||
add_column :qbo_refunds, :noted_issue_ids, :text unless column_exists?(:qbo_refunds, :noted_issue_ids)
|
||||
add_index :qbo_refunds, :invoice_id unless index_exists?(:qbo_refunds, :invoice_id)
|
||||
end
|
||||
|
||||
def down
|
||||
remove_index :qbo_refunds, :invoice_id if index_exists?(:qbo_refunds, :invoice_id)
|
||||
%i[kind invoice_id invoice_number receipt_number lines_amount discount_amount tax_amount refunded_lines
|
||||
noted_issue_ids].each do |column|
|
||||
remove_column :qbo_refunds, column if column_exists?(:qbo_refunds, column)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
|
||||
name 'Redmine QBO plugin'
|
||||
author 'Rick Barrette'
|
||||
description 'A pluging for Redmine to connect with QuickBooks Online: customers, time activities for billable hours when an issue is closed, and estimates, invoices and payments written in Redmine'
|
||||
version '2026.11.21'
|
||||
version '2026.11.25'
|
||||
url 'https://github.com/rickbarrette/redmine_qbo'
|
||||
author_url 'https://barrettefabrication.com'
|
||||
settings default: {empty: true}, partial: 'qbo/settings'
|
||||
@@ -28,9 +28,8 @@ Redmine::Plugin.register :redmine_qbo do
|
||||
TimeEntry.safe_attributes :billed
|
||||
|
||||
# Global Permissions
|
||||
# autocomplete and the filter_* actions feed the customer, estimate and invoice pickers on issue forms
|
||||
permission :view_customers, { customers: [:index, :show, :autocomplete,
|
||||
:filter_estimates_by_customer, :filter_invoices_by_customer] }, global: true
|
||||
# autocomplete feeds the customer pickers (issue forms, estimates, invoices, payments)
|
||||
permission :view_customers, { customers: [:index, :show, :autocomplete] }, global: true
|
||||
permission :add_customers, { customers: [:new, :create] }, global: true
|
||||
permission :edit_customers, { customers: [:edit, :update] }, global: true
|
||||
permission :share_issues_with_customers, { customers: [:share] }, global: true
|
||||
@@ -54,8 +53,9 @@ Redmine::Plugin.register :redmine_qbo do
|
||||
permission :view_payments, { qbo_payments: [:index, :show, :pdf] }, global: true
|
||||
permission :receive_payments, { qbo_payments: [:index, :new, :create, :show, :edit, :update, :pdf, :open_invoices],
|
||||
qbo_estimates: [:customer_info] }, global: true
|
||||
# Refunds for canceled orders and returned parts (SOP-OPS-014): restocking fee, refund check or card refund
|
||||
permission :issue_refunds, { qbo_refunds: [:new, :create, :show, :pdf, :email] }, global: true
|
||||
# Refunds for canceled orders, returned parts and paid invoices (SOP-OPS-014): restocking fee, refund check
|
||||
# or card refund
|
||||
permission :issue_refunds, { qbo_refunds: [:new, :create, :new_invoice, :create_invoice, :show, :pdf, :email] }, global: true
|
||||
permission :view_business_reports, { qbo_reports: [:index] }, global: true
|
||||
# The product/service list, accounts and their syncs are admin-only (see ItemsController, AccountsController)
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@ module RedmineQbo
|
||||
# Load the javascript to support the autocomplete forms
|
||||
def view_layouts_base_html_head(context = {})
|
||||
safe_join([
|
||||
javascript_include_tag( 'application.js', plugin: :redmine_qbo),
|
||||
javascript_include_tag( 'autocomplete.js', plugin: :redmine_qbo),
|
||||
javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo),
|
||||
stylesheet_link_tag( 'autocomplete', plugin: :redmine_qbo)
|
||||
|
||||
@@ -11,17 +11,45 @@
|
||||
module RedmineQbo
|
||||
module Patches
|
||||
module AttachmentsControllerPatch
|
||||
# Redmine's own access checks, which deny the anonymous viewer of a share link. Each one defers
|
||||
# to Redmine unless the session holds a customer share token for the issue the file belongs to.
|
||||
module CustomerTokenAccess
|
||||
private
|
||||
|
||||
def read_authorize
|
||||
valid_customer_token? || super
|
||||
end
|
||||
|
||||
def find_container
|
||||
return super unless customer_token_for_download_all?
|
||||
|
||||
@container = Issue.find(params[:object_id])
|
||||
@project = @container.project
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
render_404
|
||||
end
|
||||
|
||||
def find_downloadable_attachments
|
||||
return super unless customer_token_for_download_all?
|
||||
|
||||
@attachments = @container.attachments.select(&:readable?)
|
||||
bulk_download_max_size = Setting.bulk_download_max_size.to_i.kilobytes
|
||||
if @attachments.sum(&:filesize) > bulk_download_max_size
|
||||
flash[:error] = l(:error_bulk_download_size_too_big, max_size: number_to_human_size(bulk_download_max_size.to_i))
|
||||
redirect_back_or_default(container_url, referer: true)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def self.apply
|
||||
AttachmentsController.prepend(CustomerTokenAccess)
|
||||
|
||||
AttachmentsController.class_eval do
|
||||
# 1. PREPEND: Must run before ANY of Redmine's ApplicationController filters
|
||||
# Must run before any of Redmine's ApplicationController filters
|
||||
prepend_before_action :load_customer_token
|
||||
|
||||
# 2. Skip global login redirects if the user holds a valid token for this file
|
||||
# Skip the login redirect if the session holds a valid token for this file
|
||||
skip_before_action :check_if_login_required, if: :valid_customer_token?
|
||||
skip_before_action :check_project_privacy, raise: false, if: :valid_customer_token?
|
||||
|
||||
# Note: We do NOT need to skip :read_authorize anymore.
|
||||
# Because we patched Attachment#visible?, read_authorize will pass naturally!
|
||||
|
||||
private
|
||||
|
||||
@@ -31,33 +59,32 @@ module RedmineQbo
|
||||
@customer_token = session[:token].present? ? CustomerToken.active.find_by(token: session[:token]) : nil
|
||||
end
|
||||
|
||||
def customer_token_for_download_all?
|
||||
@customer_token.present? && params[:action] == 'download_all' &&
|
||||
params[:object_type] == 'issues' && params[:object_id].to_i == @customer_token.issue_id
|
||||
end
|
||||
|
||||
def valid_customer_token?
|
||||
token = @customer_token
|
||||
return false unless token
|
||||
return customer_token_for_download_all? if params[:action] == 'download_all'
|
||||
return false unless %w[show download thumbnail].include?(params[:action])
|
||||
|
||||
# Handle "Download All" zip requests (object_type=issues, object_id=ID)
|
||||
if params[:action] == 'download_all'
|
||||
return params[:object_type] == 'issues' && params[:object_id].to_i == token.issue_id
|
||||
end
|
||||
|
||||
# Handle normal single attachment requests (show, download, thumbnail)
|
||||
attachment = Attachment.find_by(id: params[:id])
|
||||
return false unless attachment
|
||||
|
||||
# Allow if attachment belongs directly to the Issue
|
||||
if attachment.container_type == 'Issue' && attachment.container_id == token.issue_id
|
||||
return true
|
||||
case attachment.container_type
|
||||
when 'Issue'
|
||||
attachment.container_id == token.issue_id
|
||||
when 'Journal'
|
||||
journal = attachment.container
|
||||
journal&.journalized_type == 'Issue' && journal.journalized_id == token.issue_id && !journal.private_notes?
|
||||
else
|
||||
false
|
||||
end
|
||||
|
||||
# Allow if attachment belongs to a Journal (comment) on the Issue
|
||||
if attachment.container_type == 'Journal' && attachment.container.journalized_type == 'Issue' && attachment.container.journalized_id == token.issue_id
|
||||
return true
|
||||
end
|
||||
|
||||
false
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -15,7 +15,6 @@ module RedmineQbo
|
||||
|
||||
prepended do
|
||||
belongs_to :customer
|
||||
belongs_to :customer_token
|
||||
belongs_to :estimate
|
||||
has_and_belongs_to_many :invoices
|
||||
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
#The MIT License (MIT)
|
||||
#
|
||||
#Copyright (c) 2026 rick barrette
|
||||
#
|
||||
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
module RedmineQboBilling
|
||||
# What the Refund invoice page posts: the paid invoice, the lines refunded (each with its quantity and
|
||||
# amount), whether a restocking fee is charged on the parts among them, how the money goes back (card terminal
|
||||
# or company check), and what else to do.
|
||||
class InvoiceRefundForm
|
||||
include ActiveModel::Model
|
||||
include ActiveModel::Validations
|
||||
|
||||
ATTRIBUTES = %i[customer_id invoice_id txn_date method check_number reason charge_fee note_issues
|
||||
email_customer].freeze
|
||||
FLAGS = %i[charge_fee note_issues email_customer].freeze
|
||||
|
||||
# One invoice line as posted: refund ticked, the quantity and the amount refunded
|
||||
LineChoice = Struct.new(:refund, :quantity, :amount, keyword_init: true) do
|
||||
def refund?
|
||||
refund.to_s == '1' || refund == true
|
||||
end
|
||||
|
||||
def quantity_value
|
||||
quantity.blank? ? nil : EstimateForm.decimal(quantity)
|
||||
end
|
||||
|
||||
def amount_value
|
||||
amount.blank? ? nil : EstimateForm.decimal(amount)
|
||||
end
|
||||
end
|
||||
|
||||
attr_accessor(*ATTRIBUTES)
|
||||
# { line key => LineChoice }
|
||||
attr_writer :lines
|
||||
|
||||
validate :validate_refund
|
||||
|
||||
# params: the refund's permitted params, lines as { key => { refund:, quantity:, amount: } }
|
||||
def self.from_params(params)
|
||||
params = params.to_h.stringify_keys
|
||||
form = new(ATTRIBUTES.to_h { |attr| [attr, params[attr.to_s].to_s.strip] })
|
||||
form.lines = (params['lines'] || {}).to_h.to_h do |key, line|
|
||||
line = line.to_h.stringify_keys
|
||||
[key.to_s, LineChoice.new(refund: line['refund'].to_s, quantity: line['quantity'].to_s.strip,
|
||||
amount: line['amount'].to_s.strip.delete('$,'))]
|
||||
end
|
||||
form
|
||||
end
|
||||
|
||||
def self.permitted
|
||||
ATTRIBUTES + [{ lines: {} }]
|
||||
end
|
||||
|
||||
def lines
|
||||
@lines ||= {}
|
||||
end
|
||||
|
||||
def line(key)
|
||||
lines[key.to_s]
|
||||
end
|
||||
|
||||
def chosen
|
||||
lines.select { |_, line| line.refund? }
|
||||
end
|
||||
|
||||
def txn_date_value
|
||||
EstimateForm.date(txn_date)
|
||||
end
|
||||
|
||||
def check?
|
||||
method == 'check'
|
||||
end
|
||||
|
||||
FLAGS.each do |flag|
|
||||
define_method(:"#{flag}?") { send(flag).to_s == '1' || send(flag) == true }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def validate_refund
|
||||
errors.add(:base, I18n.t(:error_estimate_needs_customer)) if customer_id.blank?
|
||||
errors.add(:base, I18n.t(:error_refund_no_invoice)) if invoice_id.blank?
|
||||
errors.add(:base, I18n.t(:error_refund_method)) unless QboRefund::METHODS.include?(method)
|
||||
errors.add(:base, I18n.t(:error_refund_check_number)) if check? && check_number.blank?
|
||||
errors.add(:base, I18n.t(:error_refund_reason)) if reason.blank?
|
||||
errors.add(:base, I18n.t(:error_estimate_field_invalid, field: I18n.t(:label_refund_date))) if txn_date_value.nil?
|
||||
errors.add(:base, I18n.t(:error_refund_no_lines)) if chosen.empty?
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,348 @@
|
||||
#The MIT License (MIT)
|
||||
#
|
||||
#Copyright (c) 2026 rick barrette
|
||||
#
|
||||
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
module RedmineQboBilling
|
||||
# Refunds of completed work: an invoice that's billed and paid in full (SOP-OPS-014 for the restocking fee).
|
||||
# QuickBooks' way to refund a paid sale is a Refund Receipt, which this makes:
|
||||
#
|
||||
# * the invoice lines refunded (all or part of each), with their product/service and tax code, so the income
|
||||
# and the sales tax come back off the books the way they went on (QuickBooks works out the tax);
|
||||
# * the invoice's discount, if it had one, in proportion to what's refunded;
|
||||
# * the restocking fee, when it's charged, as a negative line with the restocking fee product/service:
|
||||
# its rate (plugin setting) of the parts refunded. Labor carries no fee, and work with no parts has none;
|
||||
# * paid out of the refund check or card refund bank account in the settings, by company check (its number)
|
||||
# or a refund on the card terminal.
|
||||
#
|
||||
# The invoice itself stays as it is, paid. Each refund is recorded (QboRefund, kind invoice) with the lines it
|
||||
# refunded, so a line can't be refunded for more than it was billed across several refunds. Then, as asked on
|
||||
# the page, the refund is noted on the invoice's work orders and the customer is emailed a summary.
|
||||
module InvoiceRefundWriter
|
||||
Error = RefundWriter::Error
|
||||
|
||||
# An invoice line that can be refunded, with what earlier refunds already took of it
|
||||
Line = Struct.new(:key, :item_id, :item_name, :description, :quantity, :rate, :amount, :taxable, :parts,
|
||||
:refunded_quantity, :refunded_amount, keyword_init: true) do
|
||||
def remaining_amount
|
||||
[amount - refunded_amount, BigDecimal('0')].max
|
||||
end
|
||||
|
||||
def remaining_quantity
|
||||
quantity && [quantity - refunded_quantity, BigDecimal('0')].max
|
||||
end
|
||||
|
||||
def refundable?
|
||||
remaining_amount.positive?
|
||||
end
|
||||
|
||||
def label
|
||||
[item_name.presence, description.presence].compact.uniq.join(' · ')
|
||||
end
|
||||
end
|
||||
|
||||
# A line being refunded: the invoice line, the quantity (nil when only an amount is refunded) and the amount
|
||||
Refunding = Struct.new(:line, :quantity, :amount, keyword_init: true)
|
||||
|
||||
# What a refund comes to: the lines, the invoice discount's share, the fee, the tax (estimated before
|
||||
# QuickBooks works it out) and the refund
|
||||
Plan = Struct.new(:refunding, :lines_amount, :parts_amount, :discount_rate, :discount, :fee_rate, :fee,
|
||||
:tax_rate, :tax, :refund, keyword_init: true)
|
||||
|
||||
module_function
|
||||
|
||||
def settings
|
||||
RefundWriter.settings
|
||||
end
|
||||
|
||||
# Billed and paid in full: a total, and nothing left owing
|
||||
def paid_in_full?(remote)
|
||||
total = BigDecimal(remote&.total.to_s.presence || '0')
|
||||
balance = BigDecimal(remote&.balance.to_s.presence || '0')
|
||||
total.positive? && balance <= 0
|
||||
end
|
||||
|
||||
# The customer's paid invoices to pick from on the Refund page, newest first: [[label, id], ...]
|
||||
def invoice_choices(customer)
|
||||
Invoice.where(customer_id: customer.id).where('balance <= 0 AND total_amount > 0')
|
||||
.order(txn_date: :desc, id: :desc).limit(50).map do |invoice|
|
||||
["##{invoice.doc_number} · #{invoice.txn_date} · #{RefundWriter.money(invoice.total_amount)}", invoice.id.to_s]
|
||||
end
|
||||
end
|
||||
|
||||
# The invoice's lines that can be refunded (bundles opened up into their lines), with what this invoice's
|
||||
# earlier refunds took of each
|
||||
def lines(remote, refunds: QboRefund.of_invoice(remote.id))
|
||||
taken = Hash.new { |hash, key| hash[key] = [BigDecimal('0'), BigDecimal('0')] }
|
||||
refunds.each do |refund|
|
||||
refund.refunded_lines.each do |line|
|
||||
taken[line.key][0] += BigDecimal(line.quantity.to_s.presence || '0')
|
||||
taken[line.key][1] += line.amount.to_d
|
||||
end
|
||||
end
|
||||
|
||||
labor_ids = LaborItems.ids
|
||||
sales_lines(Array(remote.line_items)).filter_map do |line, key|
|
||||
detail = RefundWriter.sales_detail(line)
|
||||
amount = BigDecimal(line.amount.to_s.presence || '0')
|
||||
next unless amount.positive?
|
||||
|
||||
ref = detail&.item_ref
|
||||
quantity = detail&.quantity.nil? ? nil : BigDecimal(detail.quantity.to_s)
|
||||
quantity = nil unless quantity&.positive?
|
||||
Line.new(key: key, item_id: ref&.value.to_s.presence, item_name: ref&.name.to_s, description: line.description.to_s,
|
||||
quantity: quantity, rate: detail&.unit_price.nil? ? nil : BigDecimal(detail.unit_price.to_s),
|
||||
amount: amount, taxable: detail&.tax_code_ref&.value.to_s == 'TAX',
|
||||
parts: ref.present? && ref.value.present? && !LaborItems.match?(ref, ids: labor_ids),
|
||||
refunded_quantity: taken[key][0], refunded_amount: taken[key][1])
|
||||
end
|
||||
end
|
||||
|
||||
# The sales lines with a key for each: its QuickBooks line id, or for a line in a bundle the bundle's id and
|
||||
# its place in it
|
||||
def sales_lines(lines, prefix = nil)
|
||||
lines.each_with_index.flat_map do |line, index|
|
||||
key = "#{prefix}#{line.id.presence || index + 1}"
|
||||
if line.respond_to?(:group_line_detail) && line.group_line_detail
|
||||
sales_lines(Array(line.group_line_detail.line_items), "#{key}.")
|
||||
elsif RefundWriter.sales_detail(line)
|
||||
[[line, key]]
|
||||
else
|
||||
[]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# The invoice's discount, as a share of its lines (0.1 for 10% off)
|
||||
def discount_rate(remote)
|
||||
discount = EstimateWriter.discount_total(remote).to_d
|
||||
subtotal = sales_lines(Array(remote.line_items)).sum(BigDecimal('0')) { |line, _| BigDecimal(line.amount.to_s.presence || '0') }
|
||||
return BigDecimal('0') unless discount.positive? && subtotal.positive?
|
||||
|
||||
[discount / subtotal, BigDecimal('1')].min
|
||||
end
|
||||
|
||||
# The invoice's sales tax, as a share of its taxable lines after the discount, to estimate the tax refunded
|
||||
def tax_rate(remote, invoice_lines = lines(remote, refunds: []))
|
||||
tax = BigDecimal(remote.txn_tax_detail&.total_tax.to_s.presence || '0')
|
||||
taxable = invoice_lines.select(&:taxable).sum(BigDecimal('0'), &:amount) * (1 - discount_rate(remote))
|
||||
tax.positive? && taxable.positive? ? tax / taxable : BigDecimal('0')
|
||||
end
|
||||
|
||||
# Works out the refund from the form's lines: [plan, errors]
|
||||
def plan(remote, form, invoice_lines: lines(remote))
|
||||
errors = []
|
||||
by_key = invoice_lines.index_by(&:key)
|
||||
refunding = form.chosen.filter_map do |key, choice|
|
||||
line = by_key[key]
|
||||
if line.nil?
|
||||
errors << I18n.t(:error_refund_line_gone)
|
||||
next
|
||||
end
|
||||
|
||||
refunding_line(line, choice, errors)
|
||||
end
|
||||
|
||||
lines_amount = refunding.sum(BigDecimal('0'), &:amount)
|
||||
parts = refunding.select { |r| r.line.parts }.sum(BigDecimal('0'), &:amount)
|
||||
rate = discount_rate(remote)
|
||||
discount = (lines_amount * rate).round(2, BigDecimal::ROUND_HALF_UP)
|
||||
fee_rate = RefundWriter.fee_rate
|
||||
fee = form.charge_fee? ? RefundWriter.fee(parts, fee_rate) : BigDecimal('0')
|
||||
tax_rate = tax_rate(remote, invoice_lines)
|
||||
taxable = refunding.select { |r| r.line.taxable }.sum(BigDecimal('0'), &:amount) * (1 - rate)
|
||||
tax = (taxable * tax_rate).round(2, BigDecimal::ROUND_HALF_UP)
|
||||
refund = lines_amount - discount + tax - fee
|
||||
if refunding.any? && fee >= lines_amount - discount
|
||||
errors << I18n.t(:error_refund_fee_over_lines, fee: RefundWriter.money(fee), amount: RefundWriter.money(lines_amount - discount))
|
||||
end
|
||||
|
||||
plan = Plan.new(refunding: refunding, lines_amount: lines_amount, parts_amount: parts, discount_rate: rate,
|
||||
discount: discount, fee_rate: fee_rate, fee: fee, tax_rate: tax_rate, tax: tax,
|
||||
refund: [refund, BigDecimal('0')].max)
|
||||
[plan, errors.uniq]
|
||||
end
|
||||
|
||||
# A line being refunded, from what was posted for it: the quantity and the amount (by default the quantity
|
||||
# at the line's rate, or what's left of the line). Adds to errors when it can't be refunded.
|
||||
def refunding_line(line, choice, errors)
|
||||
name = line.label.presence || line.key
|
||||
quantity = choice.quantity_value
|
||||
quantity = nil if line.quantity.nil? || line.rate.nil?
|
||||
amount = choice.amount_value
|
||||
amount ||= quantity ? (quantity * line.rate).round(2) : line.remaining_amount
|
||||
|
||||
if quantity && (quantity <= 0 || quantity > line.remaining_quantity)
|
||||
errors << I18n.t(:error_refund_line_quantity, line: name, quantity: RefundWriter.plain(line.remaining_quantity))
|
||||
return nil
|
||||
end
|
||||
if amount.nil? || amount <= 0
|
||||
errors << I18n.t(:error_refund_line_amount, line: name)
|
||||
return nil
|
||||
end
|
||||
if amount > line.remaining_amount
|
||||
errors << I18n.t(:error_refund_line_over, line: name, amount: RefundWriter.money(line.remaining_amount))
|
||||
return nil
|
||||
end
|
||||
|
||||
# A partial amount (not the quantity at the line's rate) is refunded as an amount alone, so it doesn't
|
||||
# use up the line's quantity
|
||||
quantity = nil if quantity && (quantity * line.rate).round(2) != amount
|
||||
Refunding.new(line: line, quantity: quantity, amount: amount)
|
||||
end
|
||||
|
||||
# The quantity to offer for a line: what's left of it, when that's what's left of its amount at its rate
|
||||
def default_quantity(line)
|
||||
quantity = line.remaining_quantity
|
||||
return nil unless quantity&.positive? && line.rate
|
||||
|
||||
(quantity * line.rate).round(2) == line.remaining_amount ? quantity : nil
|
||||
end
|
||||
|
||||
# Makes the refund receipt; returns the QboRefund (done, or incomplete with why in its message). Raises
|
||||
# Error, before anything is made in QuickBooks, when the refund can't be made as asked.
|
||||
def refund!(form, user: User.current, gateway: RefundGateway.new, mailer: QboRefundMailer)
|
||||
customer = Customer.find_by(id: form.customer_id)
|
||||
raise Error, I18n.t(:error_estimate_needs_customer) unless customer
|
||||
|
||||
remote = gateway.invoice(form.invoice_id)
|
||||
raise Error, I18n.t(:notice_invoice_not_found) unless remote
|
||||
raise Error, I18n.t(:error_refund_invoice_customer) unless remote.customer_ref&.value.to_s == customer.id.to_s
|
||||
raise Error, I18n.t(:error_refund_invoice_not_paid) unless paid_in_full?(remote)
|
||||
|
||||
plan, errors = plan(remote, form)
|
||||
raise Error, errors.join(' ') if errors.any?
|
||||
raise Error, I18n.t(:error_refund_no_lines) if plan.refunding.empty?
|
||||
|
||||
item = RefundWriter.fee_item
|
||||
raise Error, I18n.t(:error_refund_no_fee_item) if plan.fee.positive? && item.nil?
|
||||
|
||||
bank_account = settings[form.check? ? 'refund_check_account_id' : 'refund_card_account_id'].presence || gateway.account_id('Bank')
|
||||
raise Error, I18n.t(:error_refund_no_bank_account) unless bank_account
|
||||
|
||||
paid = BigDecimal(remote.total.to_s) - BigDecimal(remote.balance.to_s.presence || '0')
|
||||
record = QboRefund.create!(kind: 'invoice', customer_id: customer.id, invoice_id: remote.id,
|
||||
invoice_number: remote.doc_number.to_s, user: user, txn_date: form.txn_date_value,
|
||||
method: form.method, check_number: form.check? ? form.check_number : nil,
|
||||
reason: form.reason, lines_amount: plan.lines_amount, discount_amount: plan.discount,
|
||||
parts_amount: plan.parts_amount, fee_rate: plan.fee_rate, fee_amount: plan.fee,
|
||||
tax_amount: plan.tax, credit_amount: paid, refund_amount: plan.refund,
|
||||
refunded_lines: refunded_lines(plan), status: 'incomplete')
|
||||
|
||||
made = RefundWriter.step(record, :receipt) do
|
||||
receipt = build_receipt(record, remote, plan, form, item, bank_account, gateway)
|
||||
saved = gateway.create_refund_receipt(receipt)
|
||||
raise Error, I18n.t(:error_refund_not_saved) unless saved&.id
|
||||
|
||||
tax = saved.txn_tax_detail&.total_tax
|
||||
record.update!(purchase_id: saved.id.to_s, receipt_number: saved.doc_number.to_s,
|
||||
refund_amount: saved.total.nil? ? plan.refund : BigDecimal(saved.total.to_s),
|
||||
tax_amount: tax.nil? ? plan.tax : BigDecimal(tax.to_s))
|
||||
end
|
||||
return record unless made
|
||||
|
||||
warnings = []
|
||||
warnings << note_issues(record, user) if form.note_issues?
|
||||
warnings << RefundWriter.email_customer(record, customer, mailer) if form.email_customer?
|
||||
record.update!(status: 'done', message: warnings.compact.join("\n").presence)
|
||||
record
|
||||
end
|
||||
|
||||
def refunded_lines(plan)
|
||||
plan.refunding.map do |r|
|
||||
QboRefund::RefundedLine.new(key: r.line.key, description: r.line.label, quantity: r.quantity,
|
||||
amount: r.amount, parts: r.line.parts)
|
||||
end
|
||||
end
|
||||
|
||||
# The QuickBooks Refund Receipt: the lines refunded, the discount's share, the restocking fee
|
||||
def build_receipt(record, remote, plan, form, fee_item, bank_account, gateway)
|
||||
receipt = Quickbooks::Model::RefundReceipt.new
|
||||
receipt.customer_ref = Quickbooks::Model::BaseReference.new(record.customer_id.to_s)
|
||||
receipt.txn_date = record.txn_date
|
||||
receipt.deposit_to_account_ref = Quickbooks::Model::BaseReference.new(bank_account.to_s)
|
||||
method_id = gateway.payment_method_id(form.check? ? :check : :card)
|
||||
receipt.payment_method_ref = Quickbooks::Model::BaseReference.new(method_id) if method_id
|
||||
receipt.payment_ref_number = record.check_number if form.check?
|
||||
receipt.bill_email = remote.bill_email if remote.bill_email&.address.present?
|
||||
receipt.customer_memo = I18n.t(:text_refund_receipt_memo, number: record.invoice_number)
|
||||
receipt.private_note = I18n.t(:text_refund_invoice_private_note, number: record.invoice_number, reason: record.reason)
|
||||
receipt.apply_tax_after_discount = true if plan.discount.positive?
|
||||
|
||||
lines = plan.refunding.map { |r| receipt_line(r) }
|
||||
lines << discount_line(plan) if plan.discount.positive?
|
||||
lines << fee_line(record, fee_item) if plan.fee.positive?
|
||||
lines.each_with_index { |line, index| line.line_num = index + 1 }
|
||||
receipt.line_items = lines
|
||||
receipt
|
||||
end
|
||||
|
||||
# A refunded line: the invoice line's product/service and tax code. Its quantity and rate go with it when
|
||||
# the amount is that quantity at the line's rate (refunding_line); a partial amount goes as an amount alone.
|
||||
def receipt_line(refunding)
|
||||
line = refunding.line
|
||||
remote = Quickbooks::Model::Line.new
|
||||
remote.description = line.description
|
||||
remote.amount = refunding.amount
|
||||
remote.sales_item! do |detail|
|
||||
detail.item_ref = Quickbooks::Model::BaseReference.new(line.item_id) if line.item_id
|
||||
if refunding.quantity
|
||||
detail.quantity = refunding.quantity
|
||||
detail.unit_price = line.rate
|
||||
end
|
||||
detail.tax_code_ref = Quickbooks::Model::BaseReference.new(line.taxable ? 'TAX' : 'NON')
|
||||
end
|
||||
remote
|
||||
end
|
||||
|
||||
def discount_line(plan)
|
||||
remote = Quickbooks::Model::Line.new
|
||||
remote.amount = plan.discount
|
||||
remote.discount! { |detail| detail.percent_based = false }
|
||||
remote
|
||||
end
|
||||
|
||||
# The restocking fee, kept back: a negative line, so the fee is income and the refund is less by it
|
||||
def fee_line(record, item)
|
||||
remote = Quickbooks::Model::Line.new
|
||||
remote.amount = -record.fee_amount
|
||||
remote.description = RefundWriter.fee_description(record.parts_amount, record.fee_rate, record.fee_amount,
|
||||
nil, on: record.document_label)
|
||||
remote.sales_item! do |detail|
|
||||
detail.item_id = item.id
|
||||
detail.quantity = 1
|
||||
detail.unit_price = -record.fee_amount
|
||||
detail.tax_code_ref = Quickbooks::Model::BaseReference.new('NON')
|
||||
end
|
||||
remote
|
||||
end
|
||||
|
||||
# Notes the refund on the invoice's work orders (their status is left alone); returns a warning, or nil
|
||||
def note_issues(record, user)
|
||||
issues = Invoice.find_by(id: record.invoice_id)&.issues.to_a
|
||||
return nil if issues.empty?
|
||||
|
||||
note = I18n.t(:text_refund_invoice_issue_note, amount: RefundWriter.money(record.refund_amount),
|
||||
number: record.invoice_number, method: record.method_name,
|
||||
reason: record.reason)
|
||||
failed = []
|
||||
noted = issues.filter_map do |issue|
|
||||
issue.init_journal(user, note)
|
||||
if issue.save
|
||||
issue.id
|
||||
else
|
||||
failed << "##{issue.id} (#{issue.errors.full_messages.join(', ')})"
|
||||
nil
|
||||
end
|
||||
end
|
||||
record.update!(noted_issue_ids: noted)
|
||||
failed.any? ? I18n.t(:text_refund_issues_not_noted, issues: failed.join('; ')) : nil
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -42,6 +42,26 @@ module RedmineQboBilling
|
||||
I18n.t("label_invoice_status_#{status}")
|
||||
end
|
||||
|
||||
# The invoice list's short badge: "Paid", or "Paid +3d" when it was paid in full 3 days after its date
|
||||
def short_label(status, paid_on: nil, invoice_date: nil)
|
||||
days = days_to_pay(invoice_date, paid_on) if status == :paid
|
||||
return I18n.t(:label_invoice_status_paid_days, days: days) if days&.positive?
|
||||
|
||||
label(status)
|
||||
end
|
||||
|
||||
# The badge's tooltip: "Paid in full 11/19/2025" (nil unless it's paid with a known day)
|
||||
def title(status, paid_on: nil)
|
||||
I18n.t(:text_invoice_paid_in_full, date: I18n.l(paid_on)) if status == :paid && paid_on
|
||||
end
|
||||
|
||||
# Days from the invoice's date to the day it was paid in full
|
||||
def days_to_pay(invoice_date, paid_on)
|
||||
return nil unless invoice_date && paid_on
|
||||
|
||||
(paid_on.to_date - invoice_date.to_date).to_i
|
||||
end
|
||||
|
||||
def to_d(value)
|
||||
BigDecimal(value.to_s.presence || '0')
|
||||
rescue ArgumentError
|
||||
|
||||
@@ -59,6 +59,19 @@ module RedmineQboBilling
|
||||
with_service('Purchase') { |service| service.create(purchase) }
|
||||
end
|
||||
|
||||
# A paid invoice's refund (InvoiceRefundWriter)
|
||||
def create_refund_receipt(receipt)
|
||||
with_service('RefundReceipt') { |service| service.create(receipt) }
|
||||
end
|
||||
|
||||
PAYMENT_METHOD_NAMES = { check: /\b(check|cheque)\b/i, card: /card|visa|mastercard|amex|discover/i }.freeze
|
||||
|
||||
# QuickBooks' payment method for a refund by :check or :card (the first whose name fits), or nil
|
||||
def payment_method_id(kind)
|
||||
pattern = PAYMENT_METHOD_NAMES[kind]
|
||||
PaymentWriter.payment_methods.detect { |name, _| name.match?(pattern) }&.last
|
||||
end
|
||||
|
||||
# The first active account of a QuickBooks account type ('Accounts Receivable', 'Bank')
|
||||
def account_id(type)
|
||||
account = with_service('Account') do |service|
|
||||
|
||||
@@ -55,7 +55,8 @@ module RedmineQboBilling
|
||||
def details(pdf)
|
||||
rows = [[l(:label_customer), @refund.customer&.name.to_s],
|
||||
[l(:label_refund_date), format_date(@refund.txn_date)],
|
||||
[l(:label_refund_estimate), @refund.estimate_number.present? ? "E#{@refund.estimate_number}" : l(:label_refund_no_estimate)],
|
||||
@refund.invoice? ? [l(:label_refund_invoice), @refund.document_label] :
|
||||
[l(:label_refund_estimate), @refund.estimate_number.present? ? "E#{@refund.estimate_number}" : l(:label_refund_no_estimate)],
|
||||
[l(:label_refund_reason), @refund.reason.to_s]]
|
||||
rows.each { |label, value| row(pdf, label, value) }
|
||||
end
|
||||
@@ -65,7 +66,11 @@ module RedmineQboBilling
|
||||
pdf.RDMCell(WIDTH, 6, l(:label_refund_summary), 'B', 1)
|
||||
pdf.SetFontStyle('', 10)
|
||||
fee = @refund.fee_amount.to_d
|
||||
money_row(pdf, l(:label_refund_credit), @refund.credit_amount)
|
||||
if @refund.invoice?
|
||||
invoice_lines(pdf)
|
||||
else
|
||||
money_row(pdf, l(:label_refund_credit), @refund.credit_amount)
|
||||
end
|
||||
if fee.positive?
|
||||
label = l(:label_refund_pdf_fee, rate: RefundWriter.plain(@refund.fee_rate), parts: RefundWriter.money(@refund.parts_amount))
|
||||
label += " · #{l(:label_refund_fee_invoice, number: @refund.fee_invoice_number)}" if @refund.fee_invoice_number.present?
|
||||
@@ -79,11 +84,24 @@ module RedmineQboBilling
|
||||
end
|
||||
end
|
||||
|
||||
# A paid invoice's refund: each line refunded, the discount's share and the sales tax
|
||||
def invoice_lines(pdf)
|
||||
@refund.refunded_lines.each do |line|
|
||||
quantity = line.quantity.present? ? " (#{RefundWriter.plain(BigDecimal(line.quantity.to_s))})" : ''
|
||||
money_row(pdf, "#{line.description.truncate(90)}#{quantity}", line.amount)
|
||||
end
|
||||
money_row(pdf, l(:label_refund_discount), -@refund.discount_amount.to_d) if @refund.discount_amount.to_d.positive?
|
||||
money_row(pdf, l(:label_refund_tax), @refund.tax_amount)
|
||||
end
|
||||
|
||||
def notes(pdf)
|
||||
pdf.SetFontStyle('', 9)
|
||||
issues = Issue.where(id: @refund.canceled_issue_ids).to_a
|
||||
row(pdf, l(:label_refund_pdf_work_orders), issues.map { |i| "#{i.tracker} ##{i.id}: #{i.subject}" }.join("\n")) if issues.any?
|
||||
row(pdf, l(:label_refund_pdf_estimate), l(:text_refund_pdf_estimate_rejected, number: @refund.estimate_number)) if @refund.estimate_closed?
|
||||
if @refund.invoice? && @refund.receipt_number.present?
|
||||
row(pdf, l(:label_refund_receipt), l(:text_refund_receipt_number, number: @refund.receipt_number))
|
||||
end
|
||||
row(pdf, l(:label_refund_recorded_by), "#{@refund.user&.name} · #{format_time(@refund.created_at)}")
|
||||
row(pdf, l(:label_refund_incomplete), @refund.message.to_s) unless @refund.done?
|
||||
end
|
||||
|
||||
@@ -108,9 +108,9 @@ module RedmineQboBilling
|
||||
refund: [total - amount, BigDecimal('0')].max)
|
||||
end
|
||||
|
||||
# "Restocking fee: 30% × $1,026.63 parts on E1068 = $308.00"
|
||||
def fee_description(parts, rate, amount, estimate_number)
|
||||
on = estimate_number.present? ? " on E#{estimate_number}" : ''
|
||||
# "Restocking fee: 30% × $1,026.63 parts on E1068 = $308.00" (on: what the parts are on instead, e.g. "Invoice #1234")
|
||||
def fee_description(parts, rate, amount, estimate_number, on: nil)
|
||||
on = on.present? ? " on #{on}" : (estimate_number.present? ? " on E#{estimate_number}" : '')
|
||||
I18n.t(:text_refund_fee_line, rate: plain(rate), parts: money(parts), on: on, fee: money(amount))
|
||||
end
|
||||
|
||||
|
||||
@@ -21,4 +21,9 @@ namespace :redmine_qbo do
|
||||
|
||||
puts "Checked #{estimates.size} estimate(s), created #{total} relation(s)."
|
||||
end
|
||||
|
||||
desc "Delete customer share links that have expired or whose issue was deleted (also done whenever a link is made)"
|
||||
task purge_customer_tokens: :environment do
|
||||
puts "Deleted #{CustomerToken.purge_expired} customer share link(s)."
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,87 @@
|
||||
#The MIT License (MIT)
|
||||
#
|
||||
#Copyright (c) 2026 rick barrette
|
||||
#
|
||||
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
require File.expand_path('../test_helper', __dir__)
|
||||
|
||||
# Files on an issue shared through a customer link (customers/view/:token) open for the anonymous
|
||||
# visitor holding the link, and nothing else does.
|
||||
class CustomerShareAttachmentsTest < Redmine::IntegrationTest
|
||||
fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :issues, :trackers,
|
||||
:projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :attachments, :journals
|
||||
|
||||
# Issue 4 is in a private project; attachment 7 is on it, attachment 1 is on issue 3.
|
||||
def setup
|
||||
set_fixtures_attachments_directory
|
||||
CustomerToken.delete_all
|
||||
User.current = User.find(1)
|
||||
@token = CustomerToken.create!(issue_id: 4, expires_at: 1.week.from_now)
|
||||
User.current = nil
|
||||
end
|
||||
|
||||
def teardown
|
||||
set_tmp_attachments_directory
|
||||
end
|
||||
|
||||
def open_share_link
|
||||
get "/customers/view/#{@token.token}"
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
def test_without_the_link_files_need_a_login
|
||||
with_settings login_required: '1' do
|
||||
get '/attachments/download/7/archive.zip'
|
||||
assert_redirected_to %r{/login}
|
||||
end
|
||||
end
|
||||
|
||||
def test_share_link_opens_the_issues_files
|
||||
with_settings login_required: '1' do
|
||||
open_share_link
|
||||
assert_select 'a[href=?]', '/attachments/7'
|
||||
|
||||
get '/attachments/7'
|
||||
assert_response :success
|
||||
get '/attachments/download/7/archive.zip'
|
||||
assert_response :success
|
||||
assert_equal 'application/zip', response.media_type
|
||||
get '/attachments/issues/4/download'
|
||||
assert_response :success
|
||||
end
|
||||
end
|
||||
|
||||
def test_share_link_does_not_open_other_files
|
||||
with_settings login_required: '1' do
|
||||
open_share_link
|
||||
get '/attachments/download/1/error281.txt'
|
||||
assert_redirected_to %r{/login}
|
||||
get '/attachments/issues/3/download'
|
||||
assert_redirected_to %r{/login}
|
||||
end
|
||||
end
|
||||
|
||||
def test_files_on_private_notes_stay_hidden
|
||||
journal = Journal.create!(journalized: Issue.find(4), user: User.find(1), notes: 'internal', private_notes: true)
|
||||
Attachment.find(1).update_columns(container_type: 'Journal', container_id: journal.id)
|
||||
with_settings login_required: '1' do
|
||||
open_share_link
|
||||
get '/attachments/download/1/error281.txt'
|
||||
assert_redirected_to %r{/login}
|
||||
end
|
||||
end
|
||||
|
||||
def test_expired_link_opens_nothing
|
||||
with_settings login_required: '1' do
|
||||
open_share_link
|
||||
@token.update_columns(expires_at: 1.minute.ago)
|
||||
get '/attachments/download/7/archive.zip'
|
||||
assert_redirected_to %r{/login}
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -98,4 +98,97 @@ class QboRefundsTest < Redmine::IntegrationTest
|
||||
get "/qbo_refunds/#{refund.id}"
|
||||
assert_select 'a[href=?]', "/qbo_refunds/#{refund.id}/pdf"
|
||||
end
|
||||
|
||||
# ---- Paid invoices ----
|
||||
|
||||
def invoice_setup
|
||||
RedmineQboBilling::LaborItems.stubs(:ids).returns([])
|
||||
@gateway.invoices << paid_invoice
|
||||
end
|
||||
|
||||
def test_invoice_refund_page
|
||||
invoice_setup
|
||||
log_user('admin', 'admin')
|
||||
get '/qbo_refunds/new_invoice?invoice_id=950'
|
||||
assert_response :success
|
||||
assert_select 'h2', text: /Invoice #1234/
|
||||
assert_select 'input[type=checkbox][name=?][checked]', 'refund[lines][2][refund]'
|
||||
assert_select 'input[name=?][value=?]', 'refund[lines][2][quantity]', '4'
|
||||
assert_select 'input[name=?][value=?]', 'refund[lines][3][amount]', '80.00'
|
||||
assert_select 'input[name=?][checked]', 'refund[charge_fee]'
|
||||
# Everything ticked: $440.00 of lines, $14.00 tax, 30% of $200.00 parts
|
||||
assert_select '#qbo-refund-lines-amount', text: '$440.00'
|
||||
assert_select '#qbo-refund-tax', text: '$14.00'
|
||||
assert_select '#qbo-refund-fee', text: '-$60.00'
|
||||
assert_select '#qbo-refund-amount', text: '$394.00'
|
||||
end
|
||||
|
||||
def test_unpaid_invoice_isnt_refunded
|
||||
RedmineQboBilling::LaborItems.stubs(:ids).returns([])
|
||||
@gateway.invoices << paid_invoice(balance: 50)
|
||||
log_user('admin', 'admin')
|
||||
get '/qbo_refunds/new_invoice?invoice_id=950'
|
||||
assert_redirected_to '/qbo_invoices/950/edit'
|
||||
end
|
||||
|
||||
def test_invoice_refund
|
||||
invoice_setup
|
||||
log_user('admin', 'admin')
|
||||
post '/qbo_refunds/create_invoice', params: { refund: {
|
||||
customer_id: CUSTOMER_ID, invoice_id: '950', method: 'card', txn_date: '2026-11-18', reason: 'Returned pads',
|
||||
charge_fee: '0', note_issues: '1', email_customer: '0',
|
||||
lines: { '1' => { refund: '0', quantity: '2', amount: '240.00' }, '2' => { refund: '1', quantity: '2', amount: '60.00' },
|
||||
'3' => { refund: '0', quantity: '1', amount: '80.00' } }
|
||||
} }
|
||||
refund = QboRefund.last
|
||||
assert_redirected_to "/qbo_refunds/#{refund.id}"
|
||||
assert refund.done?, refund.message
|
||||
assert_equal BigDecimal('64.20'), refund.refund_amount
|
||||
follow_redirect!
|
||||
assert_select 'p', text: /Refund receipt 3000 is recorded/
|
||||
assert_select 'a[href*="app/refundreceipt?txnId=900"]'
|
||||
assert_select 'a[href=?]', '/qbo_invoices/950/edit'
|
||||
|
||||
get '/qbo_refunds/new_invoice?invoice_id=950'
|
||||
assert_select 'input[name=?][value=?]', 'refund[lines][2][quantity]', '2'
|
||||
assert_select '.flash.warning a[href=?]', "/qbo_refunds/#{refund.id}"
|
||||
|
||||
get "/qbo_refunds/#{refund.id}/pdf"
|
||||
assert_response :success
|
||||
|
||||
get "/customers/#{CUSTOMER_ID}"
|
||||
assert_select 'a[href=?]', '/qbo_invoices/950/edit', text: 'Invoice #1234'
|
||||
end
|
||||
|
||||
def test_invoice_refund_form_errors
|
||||
invoice_setup
|
||||
log_user('admin', 'admin')
|
||||
post '/qbo_refunds/create_invoice', params: { refund: {
|
||||
customer_id: CUSTOMER_ID, invoice_id: '950', method: 'check', check_number: '', txn_date: '2026-11-18', reason: '',
|
||||
lines: { '2' => { refund: '1', quantity: '9' } }
|
||||
} }
|
||||
assert_response :unprocessable_entity
|
||||
assert_select '#errorExplanation', text: /check number/
|
||||
assert_select '#errorExplanation', text: /reason/
|
||||
|
||||
post '/qbo_refunds/create_invoice', params: { refund: {
|
||||
customer_id: CUSTOMER_ID, invoice_id: '950', method: 'check', check_number: '1', txn_date: '2026-11-18', reason: 'x',
|
||||
lines: { '2' => { refund: '1', quantity: '9' } }
|
||||
} }
|
||||
assert_response :unprocessable_entity
|
||||
assert_select '#errorExplanation', text: /no more than 4/
|
||||
assert_equal 0, QboRefund.count
|
||||
assert_empty @gateway.receipts
|
||||
end
|
||||
|
||||
def test_credit_refund_page_offers_paid_invoices
|
||||
Invoice.where(id: 950).delete_all
|
||||
Invoice.new(id: 950, doc_number: '1234', txn_date: Date.new(2026, 11, 2), customer_id: CUSTOMER_ID,
|
||||
total_amount: 454, balance: 0).save!(validate: false)
|
||||
log_user('admin', 'admin')
|
||||
get "/qbo_refunds/new?customer_id=#{CUSTOMER_ID}"
|
||||
assert_select '#qbo_refund_invoice option[value="950"]', text: /#1234/
|
||||
ensure
|
||||
Invoice.where(id: 950).delete_all
|
||||
end
|
||||
end
|
||||
+74
-1
@@ -15,7 +15,7 @@ module QboRefundTestHelper
|
||||
|
||||
# Stands in for QuickBooks: the customer's payments, and what the refund made
|
||||
class FakeGateway
|
||||
attr_reader :payments, :invoices, :purchases, :applied, :rejected
|
||||
attr_reader :payments, :invoices, :purchases, :applied, :rejected, :receipts
|
||||
attr_accessor :auto_apply, :fail_on, :estimate_record, :balance
|
||||
|
||||
def initialize(payments: [], estimate: nil)
|
||||
@@ -25,6 +25,7 @@ module QboRefundTestHelper
|
||||
@purchases = []
|
||||
@applied = []
|
||||
@rejected = []
|
||||
@receipts = []
|
||||
@auto_apply = false
|
||||
@balance = BigDecimal('0')
|
||||
end
|
||||
@@ -78,6 +79,28 @@ module QboRefundTestHelper
|
||||
purchase
|
||||
end
|
||||
|
||||
# QuickBooks' refund receipt: tax at 7% on the taxable lines, after the discount's share
|
||||
def create_refund_receipt(receipt)
|
||||
raise Quickbooks::IntuitRequestException, 'QuickBooks is down' if fail_on == :receipt
|
||||
|
||||
sales = receipt.line_items.select { |l| l.detail_type.to_s == 'SalesItemLineDetail' }
|
||||
discount = receipt.line_items.select { |l| l.detail_type.to_s == 'DiscountLineDetail' }.sum(BigDecimal('0')) { |l| l.amount.to_d }
|
||||
lines = sales.sum(BigDecimal('0')) { |l| l.amount.to_d.positive? ? l.amount.to_d : 0 }
|
||||
taxable = sales.select { |l| l.sales_item_line_detail.tax_code_ref&.value == 'TAX' }.sum(BigDecimal('0')) { |l| l.amount.to_d }
|
||||
tax = (taxable * (lines.positive? ? 1 - discount / lines : 1) * BigDecimal('0.07')).round(2)
|
||||
receipt.id = (900 + receipts.size).to_s
|
||||
receipt.doc_number = (3000 + receipts.size).to_s
|
||||
receipt.txn_tax_detail = Quickbooks::Model::TransactionTaxDetail.new
|
||||
receipt.txn_tax_detail.total_tax = tax
|
||||
receipt.total = sales.sum(BigDecimal('0')) { |l| l.amount.to_d } - discount + tax
|
||||
receipts << receipt
|
||||
receipt
|
||||
end
|
||||
|
||||
def payment_method_id(kind)
|
||||
{ check: '2', card: '3' }[kind]
|
||||
end
|
||||
|
||||
def account_id(type)
|
||||
{ 'Accounts Receivable' => '84', 'Bank' => '35' }[type]
|
||||
end
|
||||
@@ -160,6 +183,56 @@ module QboRefundTestHelper
|
||||
Struct.new(:id, :name).new('55', 'Restocking Fee')
|
||||
end
|
||||
|
||||
def sales_line(id, item_id, name, quantity, rate, taxable: true, description: '')
|
||||
line = Quickbooks::Model::InvoiceLineItem.new
|
||||
line.id = id.to_s
|
||||
line.description = description
|
||||
line.amount = (BigDecimal(quantity.to_s) * BigDecimal(rate.to_s)).round(2)
|
||||
line.sales_item! do |d|
|
||||
d.item_ref = Quickbooks::Model::BaseReference.new(item_id.to_s, name: name)
|
||||
d.quantity = BigDecimal(quantity.to_s)
|
||||
d.unit_price = BigDecimal(rate.to_s)
|
||||
d.tax_code_ref = Quickbooks::Model::BaseReference.new(taxable ? 'TAX' : 'NON')
|
||||
end
|
||||
line
|
||||
end
|
||||
|
||||
# Invoice #1234, paid in full: 2 h labor at $120 (not taxed), 4 brake pads at $30 and a $80 rotor (taxed at
|
||||
# 7%: $14.00), $454.00 in all
|
||||
def paid_invoice(id: 950, balance: 0, customer_id: CUSTOMER_ID, discount: nil)
|
||||
invoice = Quickbooks::Model::Invoice.new
|
||||
invoice.id = id.to_s
|
||||
invoice.doc_number = '1234'
|
||||
invoice.txn_date = Date.new(2026, 11, 2)
|
||||
invoice.customer_ref = Quickbooks::Model::BaseReference.new(customer_id.to_s)
|
||||
invoice.line_items = [sales_line(1, 1, 'Labor', 2, 120, taxable: false, description: 'Brake job'),
|
||||
sales_line(2, 3, 'Brake Pads', 4, 30, description: 'Ceramic pads'),
|
||||
sales_line(3, 4, 'Rotor', 1, 80, description: 'Front rotor')]
|
||||
tax = BigDecimal('14')
|
||||
if discount
|
||||
line = Quickbooks::Model::InvoiceLineItem.new
|
||||
line.amount = BigDecimal(discount.to_s)
|
||||
line.discount_item! { |d| d.percent_based = false }
|
||||
invoice.line_items = invoice.line_items + [line]
|
||||
tax = (BigDecimal('200') * (1 - BigDecimal(discount.to_s) / 440) * BigDecimal('0.07')).round(2)
|
||||
end
|
||||
invoice.txn_tax_detail = Quickbooks::Model::TransactionTaxDetail.new
|
||||
invoice.txn_tax_detail.total_tax = tax
|
||||
invoice.total = BigDecimal('440') - BigDecimal((discount || 0).to_s) + tax
|
||||
invoice.balance = BigDecimal(balance.to_s)
|
||||
invoice
|
||||
end
|
||||
|
||||
def invoice_refund_form(attributes = {})
|
||||
form = RedmineQboBilling::InvoiceRefundForm.from_params(
|
||||
{ customer_id: CUSTOMER_ID.to_s, invoice_id: '950', txn_date: '2026-11-18', method: 'check',
|
||||
check_number: '5002', reason: 'Parts returned unused', charge_fee: '1', note_issues: '1',
|
||||
email_customer: '1', lines: { '2' => { refund: '1', quantity: '4' }, '3' => { refund: '1', quantity: '1' } } }
|
||||
.merge(attributes)
|
||||
)
|
||||
form
|
||||
end
|
||||
|
||||
def refund_form(attributes = {})
|
||||
RedmineQboBilling::RefundForm.new({ customer_id: CUSTOMER_ID.to_s, estimate_id: '598', txn_date: '2026-11-16',
|
||||
parts_amount: '307.99', method: 'check', check_number: '5001',
|
||||
|
||||
@@ -65,4 +65,18 @@ class BusinessReportTest < ActiveSupport::TestCase
|
||||
assert_equal 105.0, r.chart[:current][:tax_invoiced].compact.sum
|
||||
assert_equal 70.0, r.chart[:current][:tax_collected].compact.sum
|
||||
end
|
||||
|
||||
def test_short_paid_badge
|
||||
status = RedmineQboBilling::InvoiceStatus
|
||||
nov18 = Date.new(2026, 11, 18)
|
||||
assert_equal 'Paid', status.short_label(:paid, paid_on: nov18, invoice_date: nov18)
|
||||
assert_equal 'Paid +1d', status.short_label(:paid, paid_on: nov18 + 1, invoice_date: nov18)
|
||||
assert_equal 'Paid +34d', status.short_label(:paid, paid_on: nov18 + 34, invoice_date: nov18)
|
||||
assert_equal 'Paid', status.short_label(:paid, paid_on: nil, invoice_date: nov18)
|
||||
# A deposit taken before the invoice: paid in full on its date
|
||||
assert_equal 'Paid', status.short_label(:paid, paid_on: nov18, invoice_date: nov18 + 2)
|
||||
assert_equal 'Open', status.short_label(:open, paid_on: nov18 + 3, invoice_date: nov18)
|
||||
assert_match(/\APaid in full \S+/, status.title(:paid, paid_on: nov18))
|
||||
assert_nil status.title(:open, paid_on: nov18)
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,48 @@
|
||||
#The MIT License (MIT)
|
||||
#
|
||||
#Copyright (c) 2026 rick barrette
|
||||
#
|
||||
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
require File.expand_path('../test_helper', __dir__)
|
||||
|
||||
class CustomerTokenTest < ActiveSupport::TestCase
|
||||
fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :issues, :trackers,
|
||||
:projects_trackers, :issue_statuses, :enabled_modules, :enumerations
|
||||
|
||||
def setup
|
||||
CustomerToken.delete_all
|
||||
User.current = User.find(1)
|
||||
end
|
||||
|
||||
def token(issue_id, expires_at)
|
||||
CustomerToken.create!(issue_id: issue_id, expires_at: expires_at)
|
||||
end
|
||||
|
||||
def test_purge_expired
|
||||
active = token(1, 1.week.from_now)
|
||||
token(2, 1.day.ago)
|
||||
token(3, 1.month.ago)
|
||||
token(99_999, 1.week.from_now) # its issue was deleted
|
||||
assert_equal 3, CustomerToken.purge_expired
|
||||
assert_equal [active.id], CustomerToken.pluck(:id)
|
||||
end
|
||||
|
||||
def test_a_new_share_link_clears_out_old_ones
|
||||
token(2, 1.day.ago)
|
||||
link = CustomerToken.get_token(Issue.find(1))
|
||||
assert link.expires_at > Time.current
|
||||
assert_equal [link.id], CustomerToken.pluck(:id)
|
||||
end
|
||||
|
||||
def test_an_active_link_is_reused
|
||||
active = token(1, 1.week.from_now)
|
||||
token(2, 1.day.ago)
|
||||
assert_equal active, CustomerToken.get_token(Issue.find(1))
|
||||
assert_equal 2, CustomerToken.count # nothing new made, nothing cleared
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,227 @@
|
||||
#The MIT License (MIT)
|
||||
#
|
||||
#Copyright (c) 2026 rick barrette
|
||||
#
|
||||
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
require File.expand_path('../test_helper', __dir__)
|
||||
|
||||
class InvoiceRefundWriterTest < ActiveSupport::TestCase
|
||||
include QboRefundTestHelper
|
||||
Writer = RedmineQboBilling::InvoiceRefundWriter
|
||||
|
||||
def setup
|
||||
User.current = User.find(1)
|
||||
@customer = create_customer
|
||||
Customer.any_instance.stubs(:email).returns('jane@example.com')
|
||||
RedmineQboBilling::RefundWriter.stubs(:fee_item).returns(fee_item)
|
||||
RedmineQboBilling::LaborItems.stubs(:ids).returns([])
|
||||
@gateway = FakeGateway.new
|
||||
@gateway.invoices << paid_invoice
|
||||
end
|
||||
|
||||
def refund(form = invoice_refund_form, gateway: @gateway)
|
||||
Writer.refund!(form, user: User.find(1), gateway: gateway, mailer: FakeMailer)
|
||||
end
|
||||
|
||||
def receipt
|
||||
@gateway.receipts.last
|
||||
end
|
||||
|
||||
def test_lines
|
||||
lines = Writer.lines(paid_invoice, refunds: [])
|
||||
assert_equal %w[1 2 3], lines.map(&:key)
|
||||
assert_equal [false, true, true], lines.map(&:parts)
|
||||
assert_equal [false, true, true], lines.map(&:taxable)
|
||||
assert_equal BigDecimal('120'), lines[1].amount
|
||||
assert_equal BigDecimal('4'), lines[1].quantity
|
||||
assert_equal 'Brake Pads · Ceramic pads', lines[1].label
|
||||
end
|
||||
|
||||
def test_lines_inside_bundles
|
||||
invoice = paid_invoice
|
||||
bundle = Quickbooks::Model::InvoiceLineItem.new
|
||||
bundle.id = '7'
|
||||
bundle.amount = BigDecimal('150')
|
||||
bundle.group_line_detail!
|
||||
bundle.group_line_detail.line_items = [sales_line(nil, 1, 'Labor', 1, 100, taxable: false), sales_line(nil, 5, 'Shim Kit', 1, 50)]
|
||||
invoice.line_items = invoice.line_items + [bundle]
|
||||
lines = Writer.lines(invoice, refunds: [])
|
||||
assert_equal %w[1 2 3 7.1 7.2], lines.map(&:key)
|
||||
assert_equal [false, true], lines.last(2).map(&:parts)
|
||||
end
|
||||
|
||||
def test_paid_in_full_only
|
||||
assert Writer.paid_in_full?(paid_invoice)
|
||||
assert_not Writer.paid_in_full?(paid_invoice(balance: 10))
|
||||
end
|
||||
|
||||
# Returned parts by check: $200.00 of parts, a $60.00 fee (30%), $14.00 tax back: $154.00
|
||||
def test_refund_parts_with_fee
|
||||
record = refund
|
||||
assert record.done?, record.message
|
||||
assert record.invoice?
|
||||
assert_equal '1234', record.invoice_number
|
||||
assert_equal BigDecimal('200'), record.lines_amount
|
||||
assert_equal BigDecimal('200'), record.parts_amount
|
||||
assert_equal BigDecimal('60'), record.fee_amount
|
||||
assert_equal BigDecimal('14'), record.tax_amount
|
||||
assert_equal BigDecimal('154'), record.refund_amount
|
||||
assert_equal BigDecimal('454'), record.credit_amount
|
||||
assert_equal '900', record.purchase_id
|
||||
assert_equal '3000', record.receipt_number
|
||||
assert_equal %w[2 3], record.refunded_lines.map(&:key)
|
||||
|
||||
assert_equal '35', receipt.deposit_to_account_ref.value
|
||||
assert_equal '2', receipt.payment_method_ref.value
|
||||
assert_equal '5002', receipt.payment_ref_number
|
||||
assert_equal CUSTOMER_ID.to_s, receipt.customer_ref.value
|
||||
pads, rotor, fee = receipt.line_items
|
||||
assert_equal '3', pads.sales_item_line_detail.item_ref.value
|
||||
assert_equal BigDecimal('4'), pads.sales_item_line_detail.quantity
|
||||
assert_equal BigDecimal('30'), pads.sales_item_line_detail.unit_price
|
||||
assert_equal 'TAX', pads.sales_item_line_detail.tax_code_ref.value
|
||||
assert_equal BigDecimal('80'), rotor.amount
|
||||
assert_equal BigDecimal('-60'), fee.amount
|
||||
assert_equal '55', fee.sales_item_line_detail.item_ref.value
|
||||
assert_equal 'NON', fee.sales_item_line_detail.tax_code_ref.value
|
||||
assert_equal 'Restocking fee: 30% × $200.00 parts on Invoice #1234 = $60.00', fee.description
|
||||
assert_equal [[record.id, 'jane@example.com']], FakeMailer.sent
|
||||
end
|
||||
|
||||
def test_fee_is_optional
|
||||
record = refund(invoice_refund_form(charge_fee: '0'))
|
||||
assert record.done?, record.message
|
||||
assert_equal BigDecimal('0'), record.fee_amount
|
||||
assert_equal BigDecimal('214'), record.refund_amount
|
||||
assert_equal 2, receipt.line_items.size
|
||||
end
|
||||
|
||||
# Work with no parts: no fee, even when it's ticked, and no fee product/service needed
|
||||
def test_labor_only_has_no_fee
|
||||
RedmineQboBilling::RefundWriter.stubs(:fee_item).returns(nil)
|
||||
record = refund(invoice_refund_form(lines: { '1' => { refund: '1', quantity: '2' } }, method: 'card', check_number: ''))
|
||||
assert record.done?, record.message
|
||||
assert_equal BigDecimal('0'), record.parts_amount
|
||||
assert_equal BigDecimal('0'), record.fee_amount
|
||||
assert_equal BigDecimal('240'), record.refund_amount
|
||||
assert_equal 1, receipt.line_items.size
|
||||
assert_equal 'NON', receipt.line_items.first.sales_item_line_detail.tax_code_ref.value
|
||||
assert_equal '3', receipt.payment_method_ref.value
|
||||
assert_nil receipt.payment_ref_number
|
||||
assert_nil record.check_number
|
||||
end
|
||||
|
||||
# A goodwill refund of part of the labor: an amount alone, no quantity or rate
|
||||
def test_partial_amount
|
||||
record = refund(invoice_refund_form(lines: { '1' => { refund: '1', quantity: '2', amount: '100' } }))
|
||||
assert record.done?, record.message
|
||||
detail = receipt.line_items.first.sales_item_line_detail
|
||||
assert_equal BigDecimal('100'), receipt.line_items.first.amount
|
||||
assert_nil detail.quantity
|
||||
assert_nil detail.unit_price
|
||||
assert_equal '1', detail.item_ref.value
|
||||
# It doesn't use up the 2 hours: what's left is $140.00, offered without a quantity
|
||||
assert_nil record.refunded_lines.first.quantity
|
||||
labor = Writer.lines(paid_invoice).first
|
||||
assert_equal BigDecimal('2'), labor.remaining_quantity
|
||||
assert_equal BigDecimal('140'), labor.remaining_amount
|
||||
assert_nil Writer.default_quantity(labor)
|
||||
assert_equal BigDecimal('4'), Writer.default_quantity(Writer.lines(paid_invoice)[1])
|
||||
end
|
||||
|
||||
def test_a_line_isnt_refunded_twice
|
||||
first = refund(invoice_refund_form(lines: { '2' => { refund: '1', quantity: '2' } }))
|
||||
assert first.done?, first.message
|
||||
assert_equal BigDecimal('60'), first.lines_amount
|
||||
assert_equal BigDecimal('2'), receipt.line_items.first.sales_item_line_detail.quantity
|
||||
|
||||
lines = Writer.lines(paid_invoice)
|
||||
assert_equal BigDecimal('2'), lines[1].remaining_quantity
|
||||
assert_equal BigDecimal('60'), lines[1].remaining_amount
|
||||
|
||||
error = assert_raises(Writer::Error) { refund(invoice_refund_form(lines: { '2' => { refund: '1', quantity: '3' } })) }
|
||||
assert_match(/no more than 2/, error.message)
|
||||
error = assert_raises(Writer::Error) { refund(invoice_refund_form(lines: { '2' => { refund: '1', amount: '61' } })) }
|
||||
assert_match(/\$60\.00 is left/, error.message)
|
||||
assert refund(invoice_refund_form(lines: { '2' => { refund: '1', quantity: '2' } })).done?
|
||||
end
|
||||
|
||||
def test_discount_share
|
||||
@gateway.invoices.replace([paid_invoice(discount: 44)])
|
||||
record = refund(invoice_refund_form(charge_fee: '0'))
|
||||
assert record.done?, record.message
|
||||
# 10% off the invoice: $20.00 of the $200.00 refunded
|
||||
assert_equal BigDecimal('20'), record.discount_amount
|
||||
discount = receipt.line_items.detect { |l| l.detail_type.to_s == 'DiscountLineDetail' }
|
||||
assert_equal BigDecimal('20'), discount.amount
|
||||
assert receipt.apply_tax_after_discount?
|
||||
assert_equal BigDecimal('192.60'), record.refund_amount
|
||||
end
|
||||
|
||||
def test_checks_before_making_anything
|
||||
@gateway.invoices.replace([paid_invoice(balance: 100)])
|
||||
assert_raises(Writer::Error) { refund }
|
||||
@gateway.invoices.replace([paid_invoice(customer_id: 1)])
|
||||
assert_raises(Writer::Error) { refund }
|
||||
@gateway.invoices.replace([paid_invoice])
|
||||
assert_raises(Writer::Error) { refund(invoice_refund_form(lines: { '9' => { refund: '1' } })) }
|
||||
RedmineQboBilling::RefundWriter.stubs(:fee_item).returns(nil)
|
||||
assert_raises(Writer::Error) { refund }
|
||||
assert_equal 0, QboRefund.count
|
||||
assert_empty @gateway.receipts
|
||||
end
|
||||
|
||||
def test_records_when_quickbooks_fails
|
||||
@gateway.fail_on = :receipt
|
||||
record = refund
|
||||
assert_not record.done?
|
||||
assert_match(/refund receipt couldn't be recorded/i, record.message)
|
||||
assert_nil record.purchase_id
|
||||
assert_empty FakeMailer.sent
|
||||
# A refund that made nothing doesn't use up the lines
|
||||
assert_equal BigDecimal('120'), Writer.lines(paid_invoice)[1].remaining_amount
|
||||
end
|
||||
|
||||
def test_notes_the_work_orders
|
||||
Invoice.where(id: 950).delete_all
|
||||
invoice = Invoice.new(id: 950, doc_number: '1234', txn_date: Date.new(2026, 11, 2), customer_id: CUSTOMER_ID,
|
||||
total_amount: 454, balance: 0)
|
||||
invoice.save!(validate: false)
|
||||
invoice.issues << Issue.find(1)
|
||||
status = Issue.find(1).status_id
|
||||
record = refund
|
||||
assert record.done?, record.message
|
||||
assert_equal [1], record.noted_issue_ids
|
||||
issue = Issue.find(1)
|
||||
assert_equal status, issue.status_id
|
||||
assert_equal 'Refunded $154.00 on invoice #1234 by Company check: Parts returned unused', issue.journals.last.notes
|
||||
ensure
|
||||
Invoice.where(id: 950).delete_all
|
||||
end
|
||||
|
||||
def test_the_email
|
||||
record = refund
|
||||
message = QboRefundMailer.refund_summary(record, 'jane@example.com')
|
||||
body = message.body.to_s
|
||||
assert_includes body, "We've processed the refund for Invoice #1234."
|
||||
assert_includes body, 'Brake Pads · Ceramic pads: $120.00'
|
||||
assert_includes body, 'Lines refunded: $200.00'
|
||||
assert_includes body, 'Sales tax: $14.00'
|
||||
assert_includes body, 'Restocking fee (30% of parts): $60.00'
|
||||
assert_includes body, 'Refund: $154.00'
|
||||
assert_includes body, 'returned parts carry a restocking fee'
|
||||
assert_not_includes body, "Labor that wasn't done"
|
||||
end
|
||||
|
||||
def test_the_pdf
|
||||
record = refund
|
||||
document = RedmineQboBilling::RefundPdf.new(record)
|
||||
assert document.render.start_with?('%PDF')
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user