1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

2441 Commits

Author SHA1 Message Date
David Bomba
02c810633a Working on invoice delete restore refactor 2020-12-03 21:46:49 +11:00
David Bomba
fceaab9e40 Working on invoice delete restore refactor 2020-12-03 21:46:36 +11:00
David Bomba
d30ef031a2 refactor invoice deletion 2020-12-03 15:30:32 +11:00
David Bomba
f96bde6fca Refactor invoice delete/restore 2020-12-03 15:20:39 +11:00
David Bomba
73c9474912 Working on invoice delete refactor 2020-12-03 14:56:00 +11:00
David Bomba
48f2f469d3 refactor for invoice deletion 2020-12-03 14:11:24 +11:00
David Bomba
e772a2b638 Fix for regression 2020-12-03 11:05:22 +11:00
David Bomba
53c2db072f Fixes for pdf attachment to invoices 2020-12-03 09:26:46 +11:00
Benjamin Beganović
00ab670d71 Checkout.com migration to Frames:
- Changed cardToken to token in CreditCard reference
- Updated checkout.com.js
- Added "Pay" translation
- Fix issue with switching between token & credt card
2020-12-02 15:33:43 +01:00
David Bomba
bcb21fb234 Working on invoice deletion 2020-12-02 22:01:50 +11:00
David Bomba
bc0a925f39 Fixes for include 2020-12-02 19:59:45 +11:00
David Bomba
aa852930e6 refactor from email names to use config() values 2020-12-02 14:08:35 +11:00
David Bomba
b63972e250 fixes for payment refunds 2020-12-02 11:56:29 +11:00
David Bomba
66fc75bb83
Merge pull request #4410 from turbo124/v5-develop
V5 develop
2020-12-02 08:32:45 +11:00
David Bomba
54fd048614
Merge pull request #4408 from turbo124/v5-develop
V5 develop
2020-12-02 07:28:23 +11:00
Benjamin Beganović
9198cf5175 support tasks as of same day 2020-12-01 15:52:12 +01:00
Benjamin Beganović
e5af99d884 fix issue with client date formatc 2020-12-01 15:25:48 +01:00
Benjamin Beganović
1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović
b373a3df52 fix stripe refunding & apply php-cs-fixer 2020-12-01 13:46:09 +01:00
David Bomba
9623dba2c8 fix for showinvoicerequest 2020-12-01 21:22:48 +11:00
David Bomba
a8958f4b09 Minor fixes for batch migrations 2020-11-30 18:43:33 +11:00
David Bomba
1210a81a09 Minor changes to migration 2020-11-30 09:58:31 +11:00
David Bomba
f2f8837269 Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable 2020-11-30 08:32:27 +11:00
David Bomba
4368dc7272
Merge pull request #4392 from turbo124/v5-develop
Fixes for migration file location
2020-11-30 08:31:30 +11:00
David Bomba
d7dd592d18 Fixes for migration file location 2020-11-30 08:28:12 +11:00
Benjamin Beganović
d888780ed8 update quotes logic 2020-11-29 14:20:47 +01:00
Benjamin Beganović
ba6c157128 Surround multiple words with quotes in env file 2020-11-29 13:54:12 +01:00
David Bomba
9aee129737 Fixes for import 2020-11-28 17:22:43 +11:00
David Bomba
7d96a6d389
Merge pull request #4385 from turbo124/v5-develop
Fixes for lock
2020-11-28 15:16:00 +11:00
Benjamin Beganović
4284870c4e Merge remote-tracking branch 'upstream/v5-develop' into v5-paypal-refactor 2020-11-28 01:01:18 +01:00
David Bomba
c0c7fd8de4 Minor fixes 2020-11-28 07:44:27 +11:00
Benjamin Beganović
0aff363f5d php-cs-fixer 2020-11-27 12:08:42 +01:00
Benjamin Beganović
2618a1d3b8 add ability to edit client's phone 2020-11-27 12:08:39 +01:00
Benjamin Beganović
50ae8fd608 php-cs-fixer & required fields check 2020-11-27 11:12:05 +01:00
David Bomba
9f4979095b Temp routes" 2020-11-27 20:21:18 +11:00
David Bomba
3a78326a83 Temp routes" 2020-11-27 20:19:23 +11:00
David Bomba
78e5a91175 Temp routes" 2020-11-27 20:17:47 +11:00
David Bomba
5a3c93bb3c Temp routes" 2020-11-27 20:14:01 +11:00
David Bomba
e410a99f91 Phantom adjustment for preview 2020-11-27 13:31:21 +11:00
David Bomba
b5840f8e45 Phantom adjustment for preview 2020-11-27 13:30:37 +11:00
David Bomba
3cdd5bc544 Phantom adjustment for preview 2020-11-27 13:29:46 +11:00
David Bomba
2d80e12457 Phantom adjustment for preview 2020-11-27 13:24:13 +11:00
David Bomba
a99f871fb7 Phantom adjustment for preview 2020-11-27 13:23:02 +11:00
David Bomba
b593cb0ff3 Fixes for preview PDF using phantom js 2020-11-27 13:02:05 +11:00
David Bomba
2c2d1b50f4 Fix for invitation resolution with PhantomJS 2020-11-27 08:24:25 +11:00
David Bomba
f1e1fa0b82 Fix for invitation resolution with PhantomJS 2020-11-27 08:22:28 +11:00
David Bomba
d07dedf264 Add tax_rates relation to company_user 2020-11-27 08:05:30 +11:00
Benjamin Beganović
5d3d31ddef paypal 2020-11-26 16:36:43 +01:00
David Bomba
1181f9de62
Merge branch 'v5-develop' into authorize_refactor 2020-11-26 22:43:25 +11:00
David Bomba
ccac432978 Fixes for authorize 2020-11-26 22:35:17 +11:00
David Bomba
dff41d4881 Fixes for authorize 2020-11-26 22:27:32 +11:00
David Bomba
0e1b6c9341 Fixes for authorize 2020-11-26 22:22:33 +11:00
David Bomba
a8daa31167 Fixes for authorize 2020-11-26 21:12:36 +11:00
David Bomba
ed1539db50 Fixes for authorize 2020-11-26 21:00:55 +11:00
David Bomba
150bb9c396 Fix for payment method route 2020-11-26 20:53:01 +11:00
David Bomba
5e0bcfbc88 working on authorize 2020-11-26 20:39:35 +11:00
David Bomba
72bbf24c69 Working on refactor 2020-11-26 15:43:53 +11:00
David Bomba
4888a7dc4f Working on authorize refactor 2020-11-26 13:30:36 +11:00
David Bomba
56ac6c7b1f Refactoring authorize 2020-11-26 10:42:59 +11:00
David Bomba
b2c005a1aa Create driver template 2020-11-26 08:07:09 +11:00
David Bomba
b3cdb19b4d
Merge pull request #4362 from beganovich/v5-gateways-required-fields
(v5) Support for pre-checking gateway requirements
2020-11-26 06:57:48 +11:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
Benjamin Beganović
169e5ba93e support for checking requirements based on gateway 2020-11-25 14:38:49 +01:00
David Bomba
137231c95e cs-fixer 2020-11-25 21:30:00 +11:00
David Bomba
79e8f096fe Fix for custom_values breaking invoicesum 2020-11-25 20:53:50 +11:00
David Bomba
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop
Fixes for migrations
2020-11-25 20:24:06 +11:00
David Bomba
b0740b46dd fixes for tests 2020-11-25 20:21:26 +11:00
David Bomba
656bf13510 Fixes for tests 2020-11-25 14:44:37 +11:00
David Bomba
c2b07c3ebc Fixes for migration data checks 2020-11-25 13:59:23 +11:00
David Bomba
2f4b46e435 Refactor webhook handler 2020-11-25 11:23:39 +11:00
Benjamin Beganović
549fd92671 wrap into try catch 2020-11-24 11:52:01 +01:00
Benjamin Beganović
242d48cd1a update variables for .env instead of writing completely new file 2020-11-24 11:45:27 +01:00
David Bomba
ffc87c4dc1 Check Data Script 2020-11-24 21:37:48 +11:00
David Bomba
4f35c6f894 explicit where for client in payment repo 2020-11-24 21:14:06 +11:00
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01:00
David Bomba
63cc567244 Working on migrations 2020-11-24 21:12:05 +11:00
David Bomba
0c9f982bdf Fixes for imports 2020-11-24 16:11:20 +11:00
David Bomba
6f1b4d4548 Change JSON parser 2020-11-24 08:33:37 +11:00
David Bomba
8cbaac53c6 Fixes for projects in migration 2020-11-24 08:00:59 +11:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
David Bomba
0991dbf8d7 Fixes for migrations 2020-11-23 14:51:49 +11:00
David Bomba
4b1aabbac7 Fixes for migration 2020-11-23 12:46:16 +11:00
David Bomba
388c0e8467 Add withTrashed() for queries in migration 2020-11-23 08:25:29 +11:00
David Bomba
9f420ba084
Merge pull request #4346 from turbo124/v5-develop
Change default queue to Database.
2020-11-22 22:22:52 +11:00
David Bomba
e55de0fb1b Change default queue to database 2020-11-22 22:14:49 +11:00
David Bomba
6eaf78a1d5 Fix for casting line items 2020-11-22 16:34:05 +11:00
Benjamin Beganović
18312b9583 always show invoice.totals 2020-11-20 14:31:47 +01:00
Benjamin Beganović
952899c8ec
Merge pull request #4339 from beganovich/v5-fix-issue-with-invitation
(v5) Fix refernece to $invitation in QuoteEmailEngine
2020-11-20 11:38:09 +01:00
Benjamin Beganović
a1c714c51e reference correct invitation 2020-11-20 11:37:07 +01:00
Benjamin Beganović
c434d6313c start database migration with correct key 2020-11-20 10:34:54 +01:00
David Bomba
e82d8e0d8d Fail gracefully if cannot upload logo 2020-11-19 22:33:14 +11:00
David Bomba
4140051877 fixes for check data 2020-11-19 16:16:47 +11:00
David Bomba
4318423a05 fixes for check data 2020-11-19 14:53:32 +11:00
David Bomba
e7376aa42b fixes for check data 2020-11-19 14:52:22 +11:00
David Bomba
7fb9877eca Fixes for currency seeder 2020-11-18 21:46:36 +11:00
David Bomba
e91c82aa8b Fixes for bulk import 2020-11-18 20:35:09 +11:00
David Bomba
6376d5fa98
Merge pull request #4325 from turbo124/v5-develop
Minor fixes for client portal
2020-11-18 08:00:02 +11:00
Benjamin Beganović
f81526af2d
Merge pull request #4322 from beganovich/v5-display-signature-and-terms-on-quotes
(v5) Display signatures & accepting terms for invoices & quotes
2020-11-17 17:00:59 +01:00
Benjamin Beganović
d64308fdd1 production builds 2020-11-17 16:57:42 +01:00
Benjamin Beganović
501f3c9b0e injecting signatures into entity invitations 2020-11-17 16:57:34 +01:00
Benjamin Beganović
1bf6f34c7c Add task to PortalComposer 2020-11-17 15:01:28 +01:00
Benjamin Beganović
1b70f24dbc Update logic for rendering task hours 2020-11-17 14:47:32 +01:00
Benjamin Beganović
3112efcded Support for .description 2020-11-17 14:46:22 +01:00
Benjamin Beganović
2144153e41 pass correct company 2020-11-17 13:28:13 +01:00
Benjamin Beganović
42ca352409 Fix issue with webhook handler 2020-11-17 13:23:16 +01:00
David Bomba
3f9bea3f91 Minor fixes for tests 2020-11-17 20:53:32 +11:00
David Bomba
c231dca308
Merge pull request #4314 from turbo124/v5-develop
Remove redundant entity notification
2020-11-17 20:18:09 +11:00
David Bomba
a182c5a8ca minor fixes for imports 2020-11-17 10:04:10 +11:00
David Bomba
5a6d543e34 Minor fixes for imports 2020-11-17 08:56:52 +11:00
Benjamin Beganović
b886ceac4d
Merge pull request #4311 from beganovich/v5-stripe-failure
(v5) Fix bug with Stripe saving credit card
2020-11-16 22:19:38 +01:00
Benjamin Beganović
8080dffa85 show custom messages in cp 2020-11-16 15:37:09 +01:00
Benjamin Beganović
54014d93ee pass correct $customer->id 2020-11-16 14:10:45 +01:00
Benjamin Beganović
5457838c4d Store 'amount' in payment hash (Stripe/CC) 2020-11-16 13:37:13 +01:00
Benjamin Beganović
1ab8d1322b Logic for getting amount in internallyFailedPayments 2020-11-16 13:36:47 +01:00
Benjamin Beganović
fca1d94afe Support for SYSTEM_LOG_TYPE in:
- Authorize.net
- Stripe
- PayPal
2020-11-16 13:36:29 +01:00
David Bomba
3353527333 Minor fixes for migrations 2020-11-16 21:29:17 +11:00
David Bomba
77929a6bc3 Minor fixes for bulk import 2020-11-16 15:40:52 +11:00
David Bomba
a8f186c921 Remove redundant entity notification 2020-11-16 13:41:43 +11:00
David Bomba
68a6ea4d22
Merge branch 'v5-develop' into v5-develop 2020-11-16 12:20:44 +11:00
Benjamin Beganović
f9b55dcd72 fix pdfmaker issues with special chars 2020-11-16 00:49:44 +01:00
Benjamin Beganović
956e1fe287 notes => description, cost => unit_cost 2020-11-16 00:42:21 +01:00
David Bomba
4b240b05ca Add deleted_at column to paymentables 2020-11-16 08:23:20 +11:00
David Bomba
a1119f9bbe Fix edge cases with cloning invoice 2020-11-15 19:24:57 +11:00
David Bomba
8d62b704e6
Merge pull request #4304 from turbo124/v5-develop
Refactor login route response.
2020-11-14 17:04:46 +11:00
David Bomba
861c4ef4e7
Merge pull request #4296 from beganovich/v5-migration-fixes
(v5) (wip) (no-merge) Refactor accepting new migrations
2020-11-14 17:03:26 +11:00
David Bomba
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +11:00
David Bomba
fe5218fd2c Fixes for resolving company_user from user object 2020-11-13 21:42:06 +11:00
David Bomba
3bec5a4044 Refactor login routes 2020-11-13 20:09:20 +11:00
David Bomba
58c6cb415e
Merge pull request #4302 from turbo124/v5-develop
Mail exceptions
2020-11-13 07:22:28 +11:00
David Bomba
d8bb01430f Fixes for renaming company gateway columns 2020-11-12 22:09:31 +11:00
David Roizenman
039544e753
Use correct formula when adjust_fee_percent=true 2020-11-12 02:53:25 -08:00
David Bomba
f1c1243146 Fixes for mail 2020-11-12 20:41:19 +11:00
Benjamin Beganović
952b6a7e4f Fix the way we process migration 2020-11-12 10:24:59 +01:00
David Bomba
ef9043db44 error handling for mail 2020-11-12 15:37:50 +11:00
David Bomba
5cd2ae0dbe payment listeners 2020-11-12 14:04:27 +11:00
David Bomba
7af791a4c4 Working on from, replyTo and bcc emails 2020-11-12 12:43:32 +11:00
David Bomba
42c1f8fe5f Minor fixes 2020-11-12 07:42:20 +11:00
Benjamin Beganović
d503f1ee58 Refactor accepting new migrations:
- Remove {company} parameter from /migration/start
- Refactor logic for startMigration
2020-11-11 18:26:17 +01:00
David Bomba
ddaba5a953 Fix for refresh query 2020-11-11 19:55:53 +11:00
David Bomba
28cbd75fcb Fixes for credit PDF 2020-11-11 11:13:39 +11:00
David Bomba
c5643bea7b
Merge pull request #4287 from turbo124/v5-develop
Fixes for reminder templates
2020-11-10 19:32:44 +11:00
David Bomba
277eec508a Clean up TODOs 2020-11-10 15:07:25 +11:00
David Bomba
ade0148d67 custom translations 2020-11-10 15:06:46 +11:00
David Bomba
b329d317ef Custom labels 2020-11-10 15:04:53 +11:00
David Bomba
58ef5240cd Custom Translations 2020-11-10 14:36:16 +11:00
David Bomba
efb40f1777 Custom translations 2020-11-10 14:27:25 +11:00
David Bomba
7977b2a1e7 Remove stale classes 2020-11-10 08:04:57 +11:00
David Bomba
284bb9be9f
Merge pull request #4283 from beganovich/v5-fix-quote-approval-status
(v5) Fix quotes approval process in client portal
2020-11-10 07:29:14 +11:00
Benjamin Beganović
4dc3443d16 fix quotes not approving 2020-11-09 16:37:53 +01:00
Benjamin Beganović
f02826deed Don't render delivery-not-table on products/tasks 2020-11-09 16:10:47 +01:00