3489 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Benjamin Beganović	e6890e5430	Merge branch 'v5-develop' into v5-custom-payment-driver	2020-12-10 12:40:27 +01:00
Benjamin Beganović	5f796aeab6	php-cs-fixer	2020-12-10 12:38:46 +01:00
Benjamin Beganović	9df4938837	change gateway type & remove processPayment	2020-12-10 12:38:23 +01:00
Benjamin Beganović	5c776d4911	show custom driver with its label	2020-12-10 12:38:07 +01:00
Benjamin Beganović	37f79247ac	remove payment options from custom driver	2020-12-10 12:19:13 +01:00
David Bomba	b6a384737e	Merge pull request #4464 from turbo124/v5-develop ... Fixes for version check + schema fixes	2020-12-10 21:48:39 +11:00
David Bomba	c5a4b1fcfd	Fixes for version check + schema fixes	2020-12-10 21:48:16 +11:00
David Bomba	9227904c8d	Merge pull request #4463 from turbo124/v5-develop ... Fix for User Validation	2020-12-10 21:29:54 +11:00
David Bomba	3fc8374cb5	Fixes for attempting to create a user with duplicate email	2020-12-10 21:28:19 +11:00
David Bomba	bb1ca556c4	wire up custom gateway	2020-12-10 21:20:12 +11:00
David Bomba	1be59fe589	Merge pull request #4462 from turbo124/v5-develop ... Fixes for NPM Status reporting	2020-12-10 21:08:10 +11:00
David Bomba	22cd6cdff0	Fixes for NPM/NODE status	2020-12-10 21:06:24 +11:00
David Bomba	8c46e140af	Also factor in optin and optout for auto_enabled	2020-12-10 19:51:00 +11:00
David Bomba	894481989c	Also factor in optin and optout for auto_enabled	2020-12-10 19:47:17 +11:00
David Bomba	91f90c94e3	Merge pull request #4454 from turbo124/v5-develop ... Notifications clean up.	2020-12-10 07:58:08 +11:00
Benjamin Beganović	d45571d7f9	wip	2020-12-09 15:17:48 +01:00
Benjamin Beganović	a67de4ad7e	Merge pull request #4452 from beganovich/v5-4450 ... (v5) Fix #4450 & apply php-cs-fixer	2020-12-09 13:39:42 +01:00
Benjamin Beganović	23a64562c9	fix issue with setup & apply php-cs-fixer	2020-12-09 13:38:22 +01:00
David Bomba	df9fe5677d	Notification for quotes credits and invoices	2020-12-09 21:05:26 +11:00
David Bomba	7ba78cc342	Reduce notification emails to one per entity	2020-12-09 20:52:08 +11:00
David Bomba	b74d80e091	Merge pull request #4449 from turbo124/v5-stable ... 5.0.34 Enhancments, bug fixes and improvements in app stability	2020-12-09 07:41:12 +11:00
David Bomba	c1d0733f8f	Version bump	2020-12-09 07:40:11 +11:00
David Bomba	7e32c46643	Merge pull request #4448 from turbo124/v5-develop ... Fixes for how to display CHF currency	2020-12-09 07:36:24 +11:00
David Bomba	dc2e5706c6	Fixes for how to display CHF currency	2020-12-09 07:35:26 +11:00
David Bomba	d8498bdd03	Merge pull request #4447 from turbo124/v5-develop ... Multiple fixes	2020-12-09 07:25:23 +11:00
David Bomba	6a03bcc546	Merge branch 'v5-develop' into v5-develop	2020-12-09 07:25:16 +11:00
David Bomba	ed3061fa7d	Remove html tags from texts	2020-12-09 07:22:35 +11:00
hillelcoren	e86eb9a2c4	New admin portal build	2020-12-08 20:14:43 +00:00
David Bomba	7075ec5096	Reorder default includes	2020-12-09 07:12:10 +11:00
Benjamin Beganović	829d4feaff	Merge pull request #4445 from beganovich/v5-task-product-key-to-service ... (v5) Rename task.product_key to taks.service	2020-12-08 16:53:03 +01:00
Benjamin Beganović	76b6fe4979	Merge pull request #4446 from beganovich/v5-support-for-entity-footers ... (v5) Support for entity strings on PDFs	2020-12-08 16:51:09 +01:00
Benjamin Beganović	5d1349393a	update designs to suppport entity string	2020-12-08 16:45:24 +01:00
Benjamin Beganović	ef0584b442	add entity_string in htmlengine	2020-12-08 16:44:35 +01:00
Benjamin Beganović	0f62c6c2f2	remove info()	2020-12-08 16:15:36 +01:00
Benjamin Beganović	53525dc93f	rename task.service to task.product key	2020-12-08 16:10:29 +01:00
Benjamin Beganović	1d611f3bc6	Merge pull request #4444 from beganovich/v5-setup-fixes ... (v5) Setup fixes & improvements	2020-12-08 15:08:57 +01:00
Benjamin Beganović	36e81ce905	production builds of assets	2020-12-08 15:06:06 +01:00
Benjamin Beganović	0155907b27	php-cs-fixer	2020-12-08 15:05:05 +01:00
Benjamin Beganović	82bbe5b389	php-cs-fixer	2020-12-08 15:04:45 +01:00
Benjamin Beganović	1d0f5b2ad7	add post-submit checks to smtp & db	2020-12-08 15:04:07 +01:00
Benjamin Beganović	68a84df0dd	prefix all smtp fields with mail_	2020-12-08 14:29:15 +01:00
Benjamin Beganović	3ffb600117	prefix all db field with db_	2020-12-08 14:21:00 +01:00
Benjamin Beganović	3505c89e2d	remove fallback to log driver	2020-12-08 14:20:24 +01:00
Benjamin Beganović	8ff7f8cbaf	npm audit fix	2020-12-08 14:14:19 +01:00
Benjamin Beganović	047eb32f19	Merge pull request #4443 from beganovich/v5-fix-balance-due-label ... (v5) Fix issue with balance due label	2020-12-08 13:59:54 +01:00
Benjamin Beganović	4bf46a45b1	Update reference on balance due	2020-12-08 13:57:31 +01:00
Benjamin Beganović	b446024596	Merge pull request #4442 from beganovich/v5-delivery-notes-updates ... (v5) Remove balance due & total from delivery note PDFs	2020-12-08 13:21:42 +01:00
Benjamin Beganović	bdedec19db	remove balance due & total from delivery note pdf	2020-12-08 13:19:38 +01:00
Benjamin Beganović	812824100c	wrap getting file into try-catch	2020-12-08 13:10:27 +01:00
David Bomba	634e5cadcc	remove redundant code	2020-12-08 21:49:23 +11:00