2345 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	3d8ddb23cf	fix for types	2020-09-01 12:32:36 +10:00
David Bomba	2bd8581592	Fixes for payments with gateway fees	2020-09-01 09:28:37 +10:00
David Bomba	e342c02063	fixes for quote activities	2020-09-01 07:13:00 +10:00
hillelcoren	3098f8c5bd	New admin portal build	2020-08-31 08:15:47 +00:00
David Bomba	bb4aac1aeb	Merge pull request #4025 from turbo124/v2 ... Gateway fees implementation	2020-08-31 17:58:43 +10:00
David Bomba	93a886db08	fixes for tests	2020-08-31 17:51:33 +10:00
David Bomba	217d3be2cb	Fixes for tests	2020-08-31 17:48:30 +10:00
David Bomba	1bd3deca4f	Invoice payments with gateway fees	2020-08-31 14:27:47 +10:00
David Bomba	eb867522df	Working on invoice payments with gateway fees	2020-08-31 12:00:43 +10:00
David Bomba	ac08a146a1	Working on gateway fees	2020-08-30 22:00:19 +10:00
David Bomba	a4d0e7759e	Gateway fees	2020-08-30 20:47:32 +10:00
hillelcoren	26d3cc27b1	New admin portal build	2020-08-30 07:27:10 +00:00
hillelcoren	ac87c48b13	New admin portal build	2020-08-30 07:20:30 +00:00
David Bomba	1bc71fb5d8	Working on gateway fees	2020-08-30 08:00:57 +10:00
David Bomba	32e987a1b2	Remove require NPM/NODE from setup checks	2020-08-29 23:32:11 +10:00
David Bomba	3dde9e5eee	TestS	2020-08-29 23:21:38 +10:00
David Bomba	ccdb55223c	Fixes for conflict	2020-08-29 22:17:47 +10:00
David Bomba	6dea2fe7d2	Add test mode flag to company gateways	2020-08-29 22:16:23 +10:00
Benjamin Beganović	f5cc1f0d22	Preview logic for editing designs	2020-08-28 09:51:02 +02:00
Benjamin Beganović	d508d9b8f2	Merge branch 'v2' into v2-pdfmaker-design-improvements	2020-08-28 08:17:46 +02:00
David Bomba	36c54d8cc3	Working on fees	2020-08-28 11:06:46 +10:00
David Bomba	a5248f7a93	Test mode for company gateway	2020-08-28 07:34:15 +10:00
David Bomba	c9be746583	Merge pull request #4018 from beganovich/v2-repeating-header-and-footer ... Repeating header & footer	2020-08-28 07:07:28 +10:00
David Bomba	39f23a2c2f	Merge pull request #4019 from beganovich/v2-invoice-design-improvements ... Update designs with new margins & paddings	2020-08-27 23:11:13 +10:00
David Bomba	23a8acccc2	Doc todo	2020-08-27 23:10:04 +10:00
David Bomba	1a7d0d3cbd	Working on gateway fees across multiple invoices	2020-08-27 22:12:39 +10:00
Benjamin Beganović	c8ff06e61d	Update designs with new margins & paddings	2020-08-27 13:01:19 +02:00
Benjamin Beganović	53cb0fc076	Fix entity on quote	2020-08-27 10:06:08 +02:00
Benjamin Beganović	af7995815c	Rename all_page_* to all_pages_* for dynamic header/footer	2020-08-27 08:47:51 +02:00
Benjamin Beganović	c893a547ef	Fixes for tests	2020-08-27 08:41:38 +02:00
Benjamin Beganović	edbadabab4	Support for separate variable: all_page_header && all_page_footer	2020-08-27 08:39:14 +02:00
David Bomba	bb71bfe82a	Merge pull request #4016 from beganovich/v2-fix-blank-page-on-downloading-invoices ... Fix blank page when downloading invoices	2020-08-27 07:26:03 +10:00
Benjamin Beganović	971a723607	Create support for recursive copying of DOM	2020-08-26 12:52:20 +02:00
Benjamin Beganović	09dc17d3dc	Separate header section on templates	2020-08-26 12:51:54 +02:00
Benjamin Beganović	e965aded06	engine for repeating headers	2020-08-26 09:02:38 +02:00
Benjamin Beganović	bba9d7dc44	Merge remote-tracking branch 'upstream/v2' into v2-repeating-header-and-footer	2020-08-26 07:53:45 +02:00
David Bomba	ff5d8ad871	Fixes for gateway fees	2020-08-26 11:14:15 +10:00
David Bomba	d57f0f9236	Refactoring client payments	2020-08-26 10:53:11 +10:00
David Bomba	79e0fa56e2	Convert currency string to float	2020-08-26 10:47:50 +10:00
David Bomba	37c5a7adb5	Test for gateway fees appending to invoice	2020-08-26 08:10:49 +10:00
David Bomba	1c55b529a0	Refactor payments	2020-08-25 23:18:17 +10:00
David Bomba	979916adb5	Refactor payments	2020-08-25 23:06:38 +10:00
David Bomba	9f8b7c5d18	Merge pull request #4015 from turbo124/v2 ... Fixes for system logs	2020-08-25 21:40:52 +10:00
David Bomba	136998d020	Fixes for system logs	2020-08-25 21:40:34 +10:00
David Bomba	900f784a4e	Merge pull request #4014 from turbo124/v2 ... Fixes for types	2020-08-25 21:24:14 +10:00
David Bomba	4a704651c7	Fixes for types	2020-08-25 21:23:49 +10:00
Benjamin Beganović	234beee61b	Enable injecting print CSS into document	2020-08-25 10:51:49 +02:00
Benjamin Beganović	5a03d81112	Fix blank page when downloading invoices	2020-08-25 08:55:55 +02:00
David Bomba	fde50b308a	Merge branch 'v2' of https://github.com/turbo124/invoiceninja into v2	2020-08-25 07:09:54 +10:00
David Bomba	7951087c47	Add label to fillable	2020-08-25 07:09:27 +10:00