3918 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hillelcoren	83ca5fe080	New admin portal build	2020-10-15 19:42:02 +00:00
hillelcoren	464cbf5eff	New admin portal build	2020-10-15 17:50:42 +00:00
Benjamin Beganović	32349fe1b3	production builds	2020-10-15 13:04:50 +02:00
David Bomba	be305bd2dd	github actions fixes	2020-10-15 21:45:23 +11:00
David Bomba	3d83be9d08	Merge pull request #4169 from turbo124/v5-develop ... Recurring Invoice Invitations	2020-10-15 21:35:16 +11:00
Benjamin Beganović	97aad702c9	extract stripe payments into partials	2020-10-15 12:23:45 +02:00
David Bomba	3b5217f833	fixes for phpunit tests	2020-10-15 20:45:41 +11:00
David Bomba	2f948b603b	Using Credits for payment	2020-10-15 20:41:59 +11:00
David Bomba	bf592b0805	Merge pull request #4168 from beganovich/v2-cypress-payments-tests ... (v5) Stripe testing using Cypress	2020-10-15 20:16:50 +11:00
Benjamin Beganović	f6346efc99	make tests green & remove unused	2020-10-15 10:50:53 +02:00
Benjamin Beganović	b03387c571	Merge remote-tracking branch 'upstream/v2' into v2-cypress-payments-tests	2020-10-15 10:27:32 +02:00
Benjamin Beganović	6025f8d8b5	wip	2020-10-15 10:27:02 +02:00
David Bomba	5dfc4cf7e1	Merge pull request #4167 from turbo124/v2 ... Credit Payments	2020-10-15 17:30:50 +11:00
David Bomba	52558d5b41	Credit view	2020-10-15 15:08:01 +11:00
David Bomba	27f678bd8c	working on credit payments	2020-10-15 15:07:42 +11:00
David Bomba	901f7c4117	Working on credit payments	2020-10-15 14:35:35 +11:00
David Bomba	c44e8330a5	Fixes for tests	2020-10-15 13:07:48 +11:00
David Bomba	0d17b299a0	Refactor payments for credits	2020-10-15 11:37:16 +11:00
David Bomba	4ca112e61e	Merge pull request #4166 from turbo124/v2 ... Additional fields for company model.	2020-10-15 08:26:24 +11:00
David Bomba	460545882c	Additional fields for company model	2020-10-15 08:25:40 +11:00
David Bomba	944bd1207c	Company entity options	2020-10-15 08:16:20 +11:00
David Bomba	1e10f0297b	Merge pull request #4162 from beganovich/v2-fix-setup-buttons ... (v5) Setup fixes & improvements	2020-10-15 08:15:31 +11:00
David Bomba	b3a74add20	Merge pull request #4163 from beganovich/v2-fix-stripe-adding-card ... (v5) Fix error while adding Stripe credit card	2020-10-15 08:14:47 +11:00
David Bomba	f69a624b48	Merge pull request #4165 from turbo124/v2 ... Fixes for migration	2020-10-15 08:05:06 +11:00
David Bomba	6835c9d3b6	Fixes for migration	2020-10-15 08:04:42 +11:00
David Bomba	00c9cd72da	Merge pull request #4164 from turbo124/v2 ... Add projects to all entities - fixes for gateway casts	2020-10-15 07:58:49 +11:00
David Bomba	3dca6ff171	Add projects to all entities - fixes for gateway casts	2020-10-15 07:58:20 +11:00
Benjamin Beganović	db196911cc	Fix error while adding Stripe CC	2020-10-14 22:32:43 +02:00
Benjamin Beganović	1d89656bad	Setup changes: ... - Return actual SQL error when connection is failing - Update buttons on setup with correct color	2020-10-14 13:40:00 +02:00
David Bomba	60c29a95c9	Merge pull request #4161 from turbo124/v2 ... Expense Categories + Tasks API	2020-10-14 21:46:04 +11:00
David Bomba	0ec89c18ac	Fixes for autobill	2020-10-14 21:45:26 +11:00
David Bomba	99920389b4	Credit payments	2020-10-14 11:11:24 +11:00
David Bomba	a5555cc434	Working on credit payments"	2020-10-14 10:53:20 +11:00
David Bomba	6256b197bf	Merge pull request #4158 from Striffly/features/browsershot-nodepaths ... Add ability to use Browsershot with NODE_PATH & NPM_PATH env variables	2020-10-14 09:30:58 +11:00
Benjamin Beganović	1e480c5c64	wip dynamically switching gateways	2020-10-13 15:46:11 +02:00
David Bomba	8087cd7c88	Fixes for doubling up on company_token with name TOKEN	2020-10-14 00:06:25 +11:00
Clément Gayot	c21c79b8be	✨ Add ability to use Browsershot with NODE_PATH & NPM_PATH .env variables	2020-10-13 14:42:54 +02:00
David Bomba	080c82770e	Working on credit payments	2020-10-13 23:28:30 +11:00
Benjamin Beganović	eacbc138b1	checkout process	2020-10-13 14:25:55 +02:00
Benjamin Beganović	e0046ab817	stripe update extension	2020-10-13 13:37:46 +02:00
Benjamin Beganović	89b950cbfd	Testing Stripe: ... - Changed baseUrl to more generic localhost:8000 - Testing adding Stripe card & paying with it - Added iframe helper functions - Fix issue with processingOverlay when adding stripe credit card - Added few selectors to pages for easier testing	2020-10-13 13:36:56 +02:00
David Bomba	96750d5fdb	Refactor for payments via client portal	2020-10-13 21:32:15 +11:00
David Bomba	f58ba0b502	Fixes for name validation for expense categories	2020-10-13 19:05:12 +11:00
David Bomba	5b2a43bd9a	Fixes for expense categories	2020-10-13 16:02:12 +11:00
David Bomba	28f140ee37	Expense categories	2020-10-13 15:14:13 +11:00
David Bomba	05caec8aef	expense categories	2020-10-13 15:08:56 +11:00
David Bomba	57faf6eeb5	Use credits for payments in client portal	2020-10-13 14:25:51 +11:00
David Bomba	b7292a0432	Update email validation	2020-10-13 08:27:42 +11:00
David Bomba	71535c0e41	Add tasks to API	2020-10-13 07:42:02 +11:00
David Bomba	e583265969	Remove GatewayType from caching	2020-10-12 22:32:31 +11:00