Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity
2,540 Commits 7 Branches 902 Tags 2 GiB
92e6a103e3
Commit Graph

2540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Bomba
6e94d4460e
Merge pull request #4056 from beganovich/v2-show-gateway-fees-on-product-table 
PDFs: Show gateway fess as invoice item
 2020-09-11 19:10:26 +10:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +02:00
Benjamin Beganović
6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +02:00
Benjamin Beganović
de6034f3d4 Don't skip items with type_id = 4 2020-09-11 09:23:16 +02:00
David Bomba
fac03fce96
Merge pull request #4055 from turbo124/v2 
Fixes for checkout.com
 2020-09-11 16:32:04 +10:00
David Bomba
6e588f7925 Fixes for checkout.com 2020-09-11 16:31:49 +10:00
David Bomba
f0bd089acb
Merge pull request #4054 from turbo124/v2 
Gateway fees and payments.
 2020-09-11 16:15:53 +10:00
David Bomba
9eaa136cc3 Clean up 2020-09-11 10:14:51 +10:00
David Bomba
2f7e01c5a4 Fixes for paid invoices via gateways 2020-09-11 10:10:53 +10:00
David Bomba
0b56e8d4cb handle payments and gateway fee integration 2020-09-11 09:01:25 +10:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +10:00
David Bomba
51eedf313a
Merge pull request #4053 from beganovich/v2-fix-migration-design-issue 
Fix migration issue with designs
 2020-09-11 07:47:36 +10:00
Benjamin Beganović
1b36dc5868 cleanup 2020-09-10 13:01:34 +02:00
Benjamin Beganović
207c9388b5 Fix migration issues 2020-09-10 13:01:10 +02:00
David Bomba
f7dc573551 Fixes for invoices 2020-09-10 15:20:13 +10:00
David Bomba
9beafcd73b
Merge pull request #4052 from turbo124/v2 
Fixes for Checkout.com
 2020-09-10 14:42:26 +10:00
David Bomba
f061fd49f9 fixes for checkout payment gateway 2020-09-10 14:41:56 +10:00
David Bomba
d071ed0d3b Attach payment_id to payment_hash 2020-09-10 11:52:17 +10:00
David Bomba
100ca67c5f Add reference to checkout gateways 2020-09-10 11:23:04 +10:00
David Bomba
0c015cb4bc Fixes for recurring invoices 2020-09-10 11:05:42 +10:00
David Bomba
519293c6dd
Merge pull request #4051 from beganovich/v2-design-improvements 
Design improvements
 2020-09-10 07:43:32 +10:00
Benjamin Beganović
3b7bf97dd8 Add $font-size variable & fix insert of designs 2020-09-09 17:14:55 +02:00
Benjamin Beganović
2176518345 Update designs margins, font-size variable 2020-09-09 17:08:31 +02:00
Benjamin Beganović
6288529907 - Accept every design as CUSTOM in PreviewController 
- Logic for excluding elements in table footer
- PdfMaker will now return plain HTML + str_replace filter
- HTMLEngine updated variables and aliases
- Added 'payment_due' translation
- Hipster: Updated variables
 2020-09-09 14:47:26 +02:00
David Bomba
091da7b26a
Merge pull request #4050 from turbo124/v2 
Fixes for Designs
 2020-09-09 20:40:11 +10:00
David Bomba
6147cb1edc Fix for designs 2020-09-09 20:39:35 +10:00
David Bomba
c67fee3fff Fixes for base driver 2020-09-09 20:05:10 +10:00
hillelcoren
455c604ecd New admin portal build 2020-09-09 07:24:07 +00:00
=
1ee6e33bb7 Working on refactoring Checkout.com payment driver to extend BaseDriver 2020-09-09 10:58:35 +10:00
David Bomba
605f4d0b0c Fixes for migrations 2020-09-09 07:37:07 +10:00
David Bomba
b9c868d3ff Sort recurring / invoices transformers for comparison 2020-09-09 07:33:21 +10:00
David Bomba
e341d5fcdd
Merge pull request #4049 from beganovich/v2-design-tfoot 
Invoice/quote designs improvements
 2020-09-09 07:21:28 +10:00
David Bomba
9153bf5392
Merge pull request #4047 from turbo124/v2 
Fix for composer --no-dev
 2020-09-08 23:07:07 +10:00
Benjamin Beganović
3104f4ed06 Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot 2020-09-08 14:37:37 +02:00
Benjamin Beganović
78503c4608 Fix footer position 2020-09-08 14:37:21 +02:00
Benjamin Beganović
2635b8c090 Fix logic for all_pages_header/footer 2020-09-08 14:26:13 +02:00
Benjamin Beganović
14dc3ea2aa Engine for editing templates 2020-09-08 13:21:07 +02:00
David Bomba
f8f8da830e Working on recurring invoices + reminders 2020-09-08 21:01:55 +10:00
David Bomba
84ec6b35cd Add additional fields to company settings auto_bill_date + client_portal_under_payment_minimum 2020-09-08 20:53:16 +10:00
David Bomba
857fa8a57f Force admin only permissions on system logs 2020-09-08 20:49:17 +10:00
David Bomba
3083ab6237 Set unique on Group Settings Name 2020-09-08 20:44:32 +10:00
Benjamin Beganović
2e66a4df83 Update designs @page margin 2020-09-08 12:40:04 +02:00
Benjamin Beganović
0902b903a7 Insert elements as span 2020-09-08 14:30:20 +02:00
Benjamin Beganović
04c807c0b9 Update designs with new table footer 2020-09-08 13:14:44 +02:00
David Bomba
f5eecf0eb6 Working on recurring 2020-09-08 20:34:14 +10:00
David Bomba
c389ff49f2 Add missing data fields from HtmlEngine 2020-09-08 14:06:46 +10:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
David Bomba
a384db6ee8 Fix for composer --no-dev 2020-09-08 07:01:53 +10:00
David Bomba
94a7840fdb
Merge pull request #4043 from turbo124/v2 
Remove dump server
 2020-09-07 20:27:16 +10:00
David Bomba
7356d26827 Remove dump server 2020-09-07 20:26:53 +10:00