Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IP-254] Receipts for payments #351

Open
wants to merge 205 commits into
base: development
Choose a base branch
from

Conversation

mihaimatei
Copy link

I've implemented receipts tied to payment method, as follows:

  1. Created a new invoicing/numbering group for receipts
  2. Added the option to choose the numbering group for a payment method.
  3. Made payment method data available to the invoice PDF template and if a numbering group is assigned to used payment method, it will display a receipt block.
    It is designed to support partial payments, so multiple receipts for each invoice.
    I've added changes to the PDF template from branch 1.4.6, and marked the added lines between comment :|, sorry for that.

Database changes summary:

ALTER TABLE `ip_payment_methods` ADD COLUMN `receipt_group_id` INT(11) NULL;
ALTER TABLE `ip_payments` ADD COLUMN `receipt_number` VARCHAR(100) NULL;

The SQL queries should be moved into the proper next release sql setup file, now it's in 017_1.4.4-nextRelease.sql

More info in the Jira ticket comment: https://development.invoiceplane.com/browse/IP-254

Pitma and others added 30 commits June 8, 2015 22:04
No matter how the proportions of the logo were, it was always displayed as fixed 80x80px - this looked distorted if the logo is e.g. 200x40px.
IP-312 - Current logged in user not displayed
IP-315 - Array definition incompatible with PHP < 5.4
IP-291 - Let CodeIgniter also accept new domain names
IP-310 - Taxes and products do not respect separator and decimal
Added invoice footer also to quotes
fix logo upload image width/height proportions
Getting the start of a vm for invoiceplane
The start of the payment gateway integrations.  Work in progress!
IP-293 - Custom title for public view of quotes / invoices
show (http(s)) protocol in setup complete procedure
Forgot to add support for item_name
IP-318 - Support for variables in product / item names
Kovah and others added 12 commits December 22, 2015 09:31
IP-360 - Implemented mPDF template file
IP-104 - Custom fields are not copied when Invoice is duplicated
With this small add the client's import process fills all the fields.

if you accept this change you may have to update also the columns reference in https://wiki.invoiceplane.com/en/1.0/system/importing-data adding the relative two columns.
Conflicts:
	application/helpers/pdf_helper.php
IP-109: Added suport for having a custom template for each invoice group
New lines to html br in guest quote view
New lines to html br in guest quote view
 IP-400 fix null password PDF protection
 IP-400 fix null password PDF protection
@Kovah
Copy link
Contributor

Kovah commented Mar 28, 2016

Thank you for your pull request! 🎉
Could you please do a rebase of your branch to prevent duplicate commits from other users.

@Kovah
Copy link
Contributor

Kovah commented Mar 29, 2016

@mihaimatei

@mihaimatei mihaimatei force-pushed the IP-254-Receipts-rebasedon-development branch from b00006a to 61692a4 Compare March 29, 2016 21:52
@mihaimatei
Copy link
Author

@Kovah , sorry for the delay, I've rebase first time got me with a lot of conflicts and others commits, I don't know why, but probably because I've started based on v1.4.4 or something was not up to date.
I've rebased it again, checked the changes, squashed my commits and now looks fine.

<?php echo format_currency($invoice_tax_rate->invoice_tax_rate_amount); ?>
</td>
</tr>
<?php endforeach ?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It miss the ";" after the endforeach

<h1 class="invoice-title"><?php echo lang('receipt') . ' ' . $payment->receipt_number; ?></h1>
<div id="company">
<div><b><?php echo $invoice->user_company; ?></b></div>
<?php if ($invoice->user_vat_id)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be great to use the same format as line 19 for example. It's a template and most of users are not developers so it will be hard to understand the condition for them

if(condition) {
   echo "blabla";
}

@Kovah
Copy link
Contributor

Kovah commented Nov 28, 2017

Needs to be rebased on top of 1.6.0 to include it in version 1.6.0.

@Kovah Kovah changed the title IP-254 Receipts for payments [IP-254] Receipts for payments Apr 9, 2018
@UnderDogg
Copy link
Contributor

Needs label : 1.6 or 1.5.11 or something. Needs Milestone?

@Kovah Kovah added this to the 1.6.0 milestone Aug 12, 2018
@UnderDogg UnderDogg changed the base branch from development to release January 23, 2021 12:37
@UnderDogg UnderDogg changed the base branch from release to develop January 23, 2021 12:37
@UnderDogg UnderDogg changed the base branch from develop to development January 23, 2021 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet