Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity
4,782 Commits 7 Branches 917 Tags 2 GiB
f550e2360e
Commit Graph

764 Commits

Author SHA1 Message Date
Hillel Coren
93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +03:00
Hillel Coren
e2ddabe95d Minor fixes for payments 2016-06-22 12:22:38 +03:00
Hillel Coren
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +03:00
David Bomba
e540e98c80 Add company logo_url to UserAccount Transformer 2016-06-21 19:50:26 +10:00
Hillel Coren
3e068be315 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-21 12:31:47 +03:00
David Bomba
aa3e8e7c67 Merge pull request #924 from turbo124/develop 
Add company logo to UserAccount Transformer
 2016-06-21 19:23:17 +10:00
David Bomba
851b3e963c Add company logo to UserAccount Transformer 2016-06-21 19:21:50 +10:00
Hillel Coren
a2c7a0c12f Improvement to Eway payment process 2016-06-21 12:07:16 +03:00
Hillel Coren
b06b437e27 Fix for tests 2016-06-20 22:26:48 +03:00
Hillel Coren
12b754dc32 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-20 17:14:57 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
David Bomba
5fdfa8c466 Add logo into Transformer 2016-06-18 17:56:09 +10:00
David Bomba
abafc4ce6f typo 2016-06-13 20:29:43 +10:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
David Bomba
7237f25cba Expense Category Transformer 2016-06-13 20:05:28 +10:00
Hillel Coren
5489ade5ff Fix for tests 2016-06-07 14:40:54 +03:00
Hillel Coren
f4fcc81871 Fix for tests 2016-06-07 14:39:53 +03:00
Hillel Coren
80202b6d92 Added support for searching by invoice number in the API 2016-06-06 19:04:57 +03:00
Hillel Coren
d032ae00fc Added support for searching by invoice number in the API 2016-06-06 19:04:24 +03:00
Hillel Coren
85d94b5a36 Minor fixes 2016-06-05 19:11:37 +03:00
Hillel Coren
5c7a15ff83 Minor fixes 2016-06-05 19:10:15 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration 
Wepay integration
 2016-06-03 11:20:31 +03:00
Hillel Coren
619938bc72 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-02 22:04:12 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
David Bomba
8b781746fe Update DocumentTransformer.php 2016-06-01 21:36:27 +10:00
David Bomba
7073343756 Update DocumentTransformer.php 2016-06-01 21:35:53 +10:00
Hillel Coren
17eb2a7a79 Support saving invoice_id and expense_id with the document 2016-06-01 12:39:42 +03:00
Hillel Coren
1760d0e0e4 Prevent converting a qoute from incrementing the counter 2016-06-01 10:58:03 +03:00
Hillel Coren
51d9b2b427 Prevent converting a qoute from incrementing the counter 2016-06-01 10:56:44 +03:00
Hillel Coren
e6a05509b1 Enabled importing products 2016-05-31 23:16:05 +03:00
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
2f3c309d41 Remove fallback support for dropzone 2016-05-30 11:51:41 +03:00
Hillel Coren
d175fc872a Don't render pdf if not attached and fix typo 2016-05-29 19:32:45 +03:00
Hillel Coren
a9302d4d01 Fixes for is_quote 2016-05-29 15:34:44 +03:00
Hillel Coren
59d0a1cb80 Fix to support mobile app 2016-05-29 14:22:25 +03:00
Hillel Coren
cca6dcfc4a Merge pull request #878 from benb969/invoices_types 
add support to multiple invoice types
 2016-05-29 12:21:57 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Joshua Dwire
1c119fe35a ACH autobill bug fixes 2016-05-26 15:22:09 -04:00
Hillel Coren
7599edbc8c Fixed date formatting in document list 2016-05-26 18:28:36 +03:00
Hillel Coren
0da3741b56 Fixed date formatting in document list 2016-05-26 18:28:13 +03:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Hillel Coren
afd7b7ed38 check document completed upload before user submitted form 2016-05-25 21:44:06 +03:00
Hillel Coren
85184f9a5b check document completed upload before user submitted form 2016-05-25 21:42:22 +03:00
Joshua Dwire
9d4b42a514 Mention in the invoice notification that the invoice will be auto billed on the due date 2016-05-24 23:14:19 -04:00
Joshua Dwire
a5fdb88d79 Add support for auto bill on due date 2016-05-24 22:49:06 -04:00
Joshua Dwire
f8835268b4 Update DB structure 2016-05-24 14:16:42 -04:00
Joshua Dwire
5958cd2c5e Don't request update URI from WePay 2016-05-24 13:04:55 -04:00
Hillel Coren
406df6f3d8 Fix for payment datatable list 2016-05-23 21:10:40 +03:00
Hillel Coren
b2beb8fb73 Updated vendors to new datatable class 2016-05-23 21:07:06 +03:00
Hillel Coren
541b19cd5f Updated vendor expenses to new datatable class 2016-05-23 21:03:01 +03:00
Hillel Coren
e7bf0599db Separated out entity datatable classes 2016-05-23 19:52:20 +03:00
Hillel Coren
4b1b80886d Implemented base entity presenter 2016-05-23 12:26:08 +03:00
Hillel Coren
86240affab Show company name in client portal dashboard activities 2016-05-23 09:02:31 +03:00
Hillel Coren
4aa11be28f Added user permission to tranformer 2016-05-22 22:02:42 +03:00
Hillel Coren
371f224c24 Minor fixes for invoice export 2016-05-22 20:01:37 +03:00
Hillel Coren
990ba1a89c Merge pull request #881 from turbo124/develop 
Include Documents in Invoice transformer
 2016-05-19 10:57:28 +03:00
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
David Bomba
2034c11795 Include Documents in Invoice transformer 2016-05-19 09:43:03 +10:00
Hillel Coren
3ed5fdf09f Disabled iOS push notifications by default 2016-05-17 14:36:12 +03:00
Hillel Coren
38866ff6f0 Disabled iOS push notifications by default 2016-05-17 14:35:16 +03:00
Hillel Coren
a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php
 2016-05-16 11:34:00 +03:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Joshua Dwire
d99d81d655 Make autobill setting numbers match token settings 2016-05-14 23:15:22 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Hillel Coren
f873998e22 Simplified reseller setup 2016-05-13 12:23:13 +03:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
David Bomba
e738a58a42 Merge pull request #858 from turbo124/develop 
Permissions fields for Invoice Transformer
 2016-05-12 08:29:55 +10:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
David Bomba
050b79cc75 user transformer - add fields 2016-05-10 09:26:44 +10:00
David Bomba
e795ac28cd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-10 09:26:15 +10:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
David Bomba
dbdd1ac155 working with permissions 2016-05-09 10:28:47 +10:00
David Bomba
5233047ab1 working with permissions 2016-05-09 10:09:51 +10:00
David Bomba
985c4eda34 working with permissions 2016-05-09 10:02:15 +10:00
David Bomba
f6abdedfac User Transformer permissions 2016-05-09 09:54:40 +10:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
fec948f1e8 Fixed searching for non-admins 2016-05-08 21:29:49 +03:00
Hillel Coren
7c67e66fb0 Sync ninja client when updating plan 2016-05-08 15:37:32 +03:00
Hillel Coren
eff9ba5ac0 Merge pull request #846 from Rayvw/feature/improve-dynamic-dates 
Improved dynamic dates of recurring invoices
 2016-05-08 11:20:18 +03:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +03:00
Raymond
986156117e Copy custom values of invoice items 2016-05-07 15:29:27 +02:00
Raymond
e4ce4e0fc8 Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer. 2016-05-07 15:06:56 +02:00
Raymond
320e11fedb Fixed bug processing date variables upon saving a recurring invoice 2016-05-07 11:39:34 +02:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Joshua Dwire
e3823775f1 Fix permissions bug 2016-05-06 14:26:37 -04:00
Joshua Dwire
9ed44bdfe4 Merge pull request #4 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 14:17:16 -04:00
Joshua Dwire
9a64db3234 Allow client to choose auto bill settings 2016-05-06 13:26:37 -04:00
Hillel Coren
5322e16a4c Ensure contacts remain in the same order when saved 2016-05-05 23:09:11 +03:00
Hillel Coren
32c912f7b1 Added vat number to ninja clients 2016-05-05 22:34:45 +03:00
Hillel Coren
379e9ff2f8 Added pages to navigations search 2016-05-05 22:31:11 +03:00
Hillel Coren
47cd8a0a33 Added preview for email templates 2016-05-05 19:43:44 +03:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren
9f8865d0f2 Added pages to navigation search 2016-05-05 10:28:23 +03:00
Hillel Coren
db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren
9ebb539cce API optimizations 2016-05-04 14:53:27 +03:00
Hillel Coren
2fcb1d66a5 Fix for travis tests 2016-05-04 09:53:43 +03:00
Hillel Coren
2d878b6480 API optimizations 2016-05-03 23:02:29 +03:00
Hillel Coren
c0a5084282 Added details to cybersource error 2016-05-03 19:06:38 +03:00
Hillel Coren
be420ad1fc API optimizations 2016-05-03 11:39:10 +03:00
Hillel Coren
6cd4ff025e API optimizations 2016-05-03 09:46:24 +03:00
Hillel Coren
e6bcdb36b3 Removed extra entity load in the repos save function 2016-05-02 20:42:13 +03:00
Hillel Coren
325cac1603 Added DocumentTransformer 2016-05-02 20:02:15 +03:00
Hillel Coren
e7f4368cbb Working on permissions in the API 2016-05-02 16:12:37 +03:00
Hillel Coren
933f2968d6 Working on form requests 2016-05-01 22:30:39 +03:00
Hillel Coren
2efd419791 Moving permissions to form requests 2016-05-01 15:04:55 +03:00
Hillel Coren
05bd8d9318 Moving permissions to form requests 2016-05-01 14:31:10 +03:00
Hillel Coren
1647effb20 Fix for client portal invoice table 2016-05-01 11:43:10 +03:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Hillel Coren
9979eba5d9 Working on custom route model binding 2016-04-28 15:16:33 +03:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Hillel Coren
ce2392563d Removed checkSubPermissions flag 2016-04-27 23:56:14 +03:00
Hillel Coren
ee4591c3c6 Fix for recurring invoice list 2016-04-27 19:25:24 +03:00
Hillel Coren
6ba27c2475 Fixed problem sorting data tables by client 2016-04-27 11:49:54 +03:00
Hillel Coren
782cda4004 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-26 23:31:31 +03:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire
af415afd2f Show payments without card details 2016-04-25 11:06:52 -04:00
Hillel Coren
71b1a9c209 Improved filtering the payment list 2016-04-24 16:34:48 +03:00
Joshua Dwire
42c1f537bc Store/display credit card type, expiration and last 4 digits 2016-04-23 22:10:51 -04:00
Joshua Dwire
b8170f0324 Support refunds from the admin UI 2016-04-23 16:40:19 -04:00
Hillel Coren
9281cd5ba2 Fix for default quote terms 2016-04-20 11:04:54 +03:00
Hillel Coren
fb975db1f2 Merge pull request #815 from joshuadwire/enterprise-plan 
Enterprise plan bug fixes
 2016-04-19 17:40:17 +03:00
Joshua Dwire
0fd39e5be0 Only allow pro trials 2016-04-19 10:28:27 -04:00
Hillel Coren
a805e2b8bb Merge pull request #814 from joshuadwire/enterprise-plan 
Enterprise plan
 2016-04-19 12:01:56 +03:00
Joshua Dwire
22f65e8108 Finalize multi-plan support 
* Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts
 2016-04-18 22:35:18 -04:00
Hillel Coren
4248963d92 Check if is_primary is set when sorting contacts 2016-04-17 14:03:37 +03:00
David Bomba
d19c43edce contacts array sorter 2016-04-17 20:53:53 +10:00
David Bomba
7f6f34b302 contacts array sorter 2016-04-17 20:50:06 +10:00
David Bomba
57c0a91de8 contacts array sorter 2016-04-17 20:45:24 +10:00
David Bomba
edf7b6eb37 contacts array sorter 2016-04-17 20:42:51 +10:00
David Bomba
b022ae0c77 contacts array sorter 2016-04-17 20:42:30 +10:00
David Bomba
b49938e36d contacts array sorter 2016-04-17 20:40:23 +10:00
Joshua Dwire
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Hillel Coren
2f2081b4b0 Fix for #808 Set date to today when cloning 2016-04-14 16:35:03 +03:00
David Bomba
043e4ce729 Minor fix to invoice item transformer 2016-04-08 21:25:06 +10:00
David Bomba
e1b829c04b Bug fixes on invoice transformer 2016-04-04 20:10:00 +10:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00
Hillel Coren
3e9802502c Show all invoiced documents in the client portal 2016-03-29 17:30:06 +03:00
Hillel Coren
c076f2887c Merge pull request #785 from joshuadwire/attached-documents 
Add support for attached documents
 2016-03-27 18:04:09 +03:00
Joshua Dwire
b5a948583e Remove debug code and fix minor bugs 2016-03-24 19:55:56 -04:00
Joshua Dwire
24d186da16 Set document mime type when storing 2016-03-24 19:00:08 -04:00
Joshua Dwire
b7f0d2a33f More intuitive document permissions 2016-03-24 18:33:28 -04:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
bff6782026 Add support for uploading documents on older browsers 2016-03-24 15:13:54 -04:00
Joshua Dwire
d328db2f54 Document support for quotes, recurring invoices, and cloning 2016-03-24 12:54:38 -04:00
Joshua Dwire
cd8290946e Add client portal documents tab 2016-03-24 11:58:30 -04:00
Joshua Dwire
1c5c45a1e1 Improved handling of various document types; better documents zip 2016-03-24 11:33:28 -04:00
Joshua Dwire
e6056104bd Display documents and zip download on client invoice page 2016-03-23 22:41:19 -04:00
Joshua Dwire
2a7e8cb4b7 Add documents placeholder for emails 2016-03-23 21:25:33 -04:00
Joshua Dwire
ae6fa5ab9b Improve document upload efficiency 2016-03-23 19:52:51 -04:00
Joshua Dwire
f7d8f819b6 Add option to attach documents to invoice email 2016-03-23 19:20:08 -04:00
Joshua Dwire
942f543bbb Display documents in invoice PDF 2016-03-23 18:40:42 -04:00
Joshua Dwire
d810ba7f6b Improved document support 2016-03-23 15:41:05 -04:00
Hillel Coren
aae4f57c09 Prevent duplicate deletions 2016-03-23 15:02:05 +02:00
Joshua Dwire
88808d44bf Add support for invoice attachments 2016-03-22 22:23:45 -04:00
Joshua Dwire
5640c74f35 Migrate logos to use Laravel Filesystem 2016-03-22 16:19:55 -04:00
Hillel Coren
b0a4a9b31c Cleaning up log files 2016-03-22 17:14:40 +02:00
Hillel Coren
ddbc254d4b Add link to payments from invoice page 2016-03-22 15:17:46 +02:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02:00
Joshua Dwire
90e1f6695c Improve user permission support 
* Hide links based on permissions
* Restrict editing/creating within other UI
 2016-03-15 22:07:11 -04:00
Joshua Dwire
0148d06205 Add user permission support 2016-03-15 19:08:00 -04:00
Hillel Coren
ed7cbf1d2b Support searching by custom client fields 2016-03-14 10:09:18 +02:00
Hillel Coren
b5784f2137 Update ContactMailer.php #760 2016-03-09 11:15:53 +02:00
Hillel Coren
7ee4219480 Enabled registering through the API 2016-03-08 23:34:59 +02:00
Hillel Coren
3c1084ffe0 Minor fixes 2016-03-08 20:38:28 +02:00
Hillel Coren
86a851a05a Merge pull request #757 from joshuadwire/client-portal-password 
Client portal password support
 2016-03-08 19:32:04 +02:00
Joshua Dwire
82fadab632 Finalize support for emailing passwords 2016-03-07 20:25:26 -05:00
Joshua Dwire
0166576987 Fix password placeholder in email template 2016-03-05 18:16:23 -05:00
Joshua Dwire
d0d30e1e26 Add support for including password in email; include portal customizations 2016-03-05 18:09:50 -05:00
Hillel Coren
ee677554c9 Datatable fixes for L5.2 2016-03-04 15:55:15 +02:00
Hillel Coren
9efaada9f5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-02 15:36:48 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
David Bomba
1e39a85066 merge 2016-03-02 06:46:47 +11:00
David Bomba
0155f08d0d Merge pull request #743 from turbo124/push_notifications 
Push notifications
 2016-03-01 15:27:03 +11:00
David Bomba
f1bc597034 Push Notifications 2016-03-01 13:57:59 +11:00
David Bomba
57a4a24294 Push Notifications 2016-03-01 11:31:16 +11:00
Hillel Coren
dade97fbfa Merged minor fixes 2016-02-29 13:25:32 +02:00
David Bomba
f6be1041b7 iOS Push Notifications 2016-02-29 22:21:15 +11:00
Hillel Coren
1602832fb6 Corrected invoice renewel date 2016-02-29 13:19:16 +02:00
David Bomba
2cd3571f25 iOS Push Notifications 2016-02-29 21:35:14 +11:00
David Bomba
50ddbcf609 iOS Push Notifications 2016-02-29 21:31:58 +11:00
Hillel Coren
f4fd45118c Added support for currency_code in API 2016-02-29 12:01:43 +02:00
Hillel Coren
6a9b2130c5 Added fuzzy search using fuse.js 2016-02-28 22:43:43 +02:00
Hillel Coren
553c548f31 Enabled setting recurring invoice number prefix 2016-02-28 20:36:11 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
David Bomba
f323c8e06e user transformer fields 2016-02-26 18:48:06 +11:00
Hillel Coren
308e5a1656 Improvements to search 2016-02-25 23:33:48 +02:00
Hillel Coren
01f9634237 Improvements to data export 2016-02-25 11:25:07 +02:00
Hillel Coren
88fcc05902 Implemented basic expense report 2016-02-24 23:54:43 +02:00
Hillel Coren
a1d13cc84c Improvements to the tax report 2016-02-24 22:58:42 +02:00
Hillel Coren
1c864f4304 Added tax report 2016-02-23 23:32:39 +02:00
Hillel Coren
3ca89b2792 Added navigation to search 2016-02-22 23:23:28 +02:00
Hillel Coren
826d1b868b Enable auto renewing and updated Travis config 2016-02-22 21:23:15 +02:00
Hillel Coren
b4c03e5cf8 Prevent product without product key 2016-02-19 10:56:48 +02:00
Hillel Coren
ed941fef89 Enabled downloading PDF through route 2016-02-17 21:13:55 +02:00
Hillel Coren
25d2af4891 Working on download PDF route 2016-02-17 17:50:01 +02:00
Hillel Coren
fdab849705 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-17 15:55:47 +02:00
Hillel Coren
611d908112 Fixed sorting expenses by status 2016-02-17 15:55:31 +02:00
David Bomba
992802c164 Working on API functionality 2016-02-17 21:50:52 +11:00
David Bomba
6d09bda646 Working on API functionality 2016-02-17 21:16:13 +11:00
David Bomba
aef4658873 Api work/Bug fixes 2016-02-17 19:10:33 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
David Bomba
1fde9261e6 Improving error reporting API 2016-02-17 09:38:23 +11:00
David Bomba
4a033ce925 Improving error reporting API 2016-02-17 08:57:06 +11:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
Hillel Coren
0ea8461706 Fixed problem with search when using foreign language 2016-02-15 20:15:45 +02:00
Hillel Coren
3520c0fa79 Added custom invoice text fields to transformer 2016-02-15 19:39:26 +02:00
Hillel Coren
a30153cabe Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-11 17:12:34 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
David Bomba
498d7cbca9 Revert "Table locking for public_id integrity" 2016-02-10 12:32:12 +11:00
David Bomba
67b74b2a34 Table locking for public_id integrity 2016-02-10 11:26:21 +11:00
ridgarou
60530d3cbc Update AccountRepository.php 2016-02-09 12:37:23 +01:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
Hillel Coren
db4ec4fb62 Added statust to client view page 2016-02-04 20:36:39 +02:00
Hillel Coren
5f709f76a8 Bug fix: notification emails have the wrong entity type 2016-02-03 22:53:18 +02:00
Hillel Coren
cc49415a78 Added invoiceDate as email template variable 2016-02-03 22:10:09 +02:00
Hillel Coren
e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren
021f195c45 Implemented UpdateAccountRequest 2016-02-03 14:41:40 +02:00
Hillel Coren
86b6d9dc10 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-03 10:08:35 +02:00
Hillel Coren
37ffd01463 Filtered out quotes from reminder emails 2016-02-03 10:08:12 +02:00
David Bomba
ead2b335d5 Added Credit Transformer 2016-02-03 14:21:13 +11:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
David Bomba
eef8ad22d0 Merge pull request #677 from turbo124/master 
Archive Product via API
 2016-02-01 13:33:27 +11:00
David Bomba
31b026d08f Added Archive Product via API 2016-02-01 13:32:12 +11:00
Hillel Coren
646c239cd8 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-31 15:10:40 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
David Bomba
32acb8b86a Add send_invoice boolean in contact transformer 2016-01-29 10:08:11 +11:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
9d3d58def1 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-28 14:05:01 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
David Bomba
8d6b4af8ba Added quote_invoice_id to Invoice transformer 2016-01-28 09:19:54 +11:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
David Bomba
84895907d1 Merge pull request #662 from turbo124/master 
update invoice status via API
 2016-01-27 21:01:24 +11:00
David Bomba
fa2187ce20 update invoice status via API 2016-01-27 21:00:00 +11:00
Hillel Coren
9c96f09fc0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-26 22:22:40 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
David Bomba
f80e738882 Bug Fix in taxrate transformer 2016-01-26 22:47:19 +11:00
Hillel Coren
c0531a8a06 Merge pull request #649 from sakalauskas/dev-api 
Add ability to include invoice invitations via API
 2016-01-25 09:38:13 +02:00
Laurynas Sakalauskas
cfe1836770 Added invitation transformer 2016-01-24 18:55:36 +00:00
Laurynas Sakalauskas
91d44dd301 Add ability to include invoice invitations via API 2016-01-24 18:37:24 +00:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +02:00
Hillel Coren
b24a6109ba Working on expenses 2016-01-21 21:15:30 +02:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
Hillel Coren
9287118cd0 Merging: Bugfixed version of Vendor / Expense module #635 2016-01-20 16:06:17 +02:00
Hillel Coren
bf778aa616 Initial work on OFX support 2016-01-20 01:07:31 +02:00
steenrabol
2525f68a39 Expense / Vendor module bug fix 2016-01-19 20:35:15 +01:00
steenrabol
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01:00
Hillel Coren
86f1e13c87 Fix for #632 2016-01-18 16:09:06 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
Hillel Coren
32ff390fea Revert change to hide unsent invoices 2016-01-17 15:07:32 +02:00
Hillel Coren
feb62b1253 Fix for #625 2016-01-13 20:06:01 +02:00
Hillel Coren
bc0ab97279 Enable setting the recurring due date through the API 2016-01-12 14:24:25 +02:00
David Bomba
6c4fe3f613 Revert "Working on API" 2016-01-12 21:17:08 +11:00
David Bomba
4e6d44fa87 Merge branch 'master' of https://github.com/turbo124/invoice-ninja 2016-01-12 20:28:34 +11:00
David Bomba
2b784ee85d If no invoice_number is set from API, automatically generate invoice_number 2016-01-12 20:28:20 +11:00
steenrabol
6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja 
# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php
 2016-01-11 20:39:18 +01:00
Hillel Coren
61f3bedc48 Added check for mail config settings 2016-01-11 13:07:41 +02:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00
steenrabol
d8cb1b436d Expense module 2016-01-09 09:08:24 +01:00
steenrabol
d0bfe82512 Expense module 2016-01-09 06:24:43 +01:00
steenrabol
d89dc2e827 Expenses 2016-01-08 19:01:00 +01:00
steenrabol
d8a501ed95 Posibility to modify payment terms 2016-01-07 20:39:51 +01:00
steenrabol
eed8ee55a1 Vendor 2016-01-07 16:21:13 +01:00
steenrabol
17af1e2b9c Expenses 2016-01-07 16:14:11 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01:00
Hillel Coren
7beeb78126 Enabled updating/archiving invoice through the API 2016-01-06 22:46:11 +02:00
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00
steenrabol
d1bef24ede Expenses 2016-01-06 16:49:06 +01:00
steenrabol
dba3a39559 Vendor management 2016-01-06 15:23:58 +01:00
Hillel Coren
6e98e9b60d Merge pull request #594 from joshuadwire/more-payment-terms 
Add due date settings for recurring invoices
 2016-01-06 12:07:05 +02:00
Hillel Coren
c91b15590c Fixes #601 2016-01-06 09:55:36 +02:00
Hillel Coren
18155a9482 Working on data import tranformers 2016-01-06 09:52:26 +02:00
David Bomba
f66539b0da Integrate Payments into API 2016-01-05 23:51:27 +11:00
Hillel Coren
56330c1281 Merge pull request #588 from joshuadwire/custom-css 
Add custom CSS support
 2016-01-03 14:45:16 +02:00
Hillel Coren
139088086f Fixed problem with empty fields in CSV import 2016-01-01 10:34:32 +02:00
Joshua Dwire
7e336ec118 Add due date settings for recurring invoices 
* Specific due date settings for weekly and monthly/annual cycles
* Display scheduled due dates in editor
* English-only text
 2015-12-31 23:59:02 -05:00
Hillel Coren
06c1534093 Added getString helper to CSV import 2015-12-31 17:09:45 +02:00
Hillel Coren
2144870b96 Removed getInvoiceId from non-Wave transformers 2015-12-31 16:14:30 +02:00
Hillel Coren
e5ca3973d8 Revert "Revert "Re-revert "Improve Import Support"""" 2015-12-31 16:11:44 +02:00
Hillel Coren
f5530a30b2 Revert "Re-revert "Improve Import Support""" 2015-12-31 15:36:53 +02:00
Hillel Coren
e60c52e93c Revert "Revert "Improve Import Support"" 2015-12-31 15:06:30 +02:00
Hillel Coren
fc0313bade Revert "Improve Import Support" 2015-12-31 13:46:56 +02:00
Hillel Coren
7e325662bf Merge pull request #586 from joshuadwire/wave-invoice-import 
Improve Import Support
 2015-12-31 13:39:54 +02:00
Hillel Coren
35bb36fd34 Bug fixes 2015-12-31 12:23:39 +02:00
Hillel Coren
c2c51360dd Fixes for #584 2015-12-31 10:04:12 +02:00
Joshua Dwire
b7687967a6 Add custom CSS support 
* Allow custom CSS for self-hosted white-label users or Pro
invoiceninja.com users
* Restrictive sanitization for CSS on invoiceninja.com
* Add .body class to body element to allow styling the body
* Add client_view_css column to accounts table
* English-only translation text
 2015-12-30 13:11:51 -05:00
Joshua Dwire
5932a837dd Improve Import Support 
* Add support for payment imports
* Add support for Wave Invoice import
* Add ability to merge invoice line items into a single invoice
 2015-12-30 00:14:14 -05:00
Hillel Coren
d1de95303b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-28 12:16:03 +02:00
Hillel Coren
2ead34fef0 Enabled setting reminder before/after due date or invoice date 2015-12-28 12:15:56 +02:00
David Bomba
4bcf8c1922 date formatting products 2015-12-28 20:14:21 +11:00
Hillel Coren
c493f6e49a Working on the API 2015-12-27 13:08:58 +02:00
Hillel Coren
c0409b86fd Added custom labels to email variables 2015-12-23 16:21:48 +02:00
Hillel Coren
3f1891fa3b Bug fixes 2015-12-23 13:49:49 +02:00
Hillel Coren
9341ea0c87 Bug fixes 2015-12-22 14:06:53 +02:00
Hillel Coren
8739a1b46b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-21 21:58:02 +02:00
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
David Bomba
68ee5d04a4 Tax Rate Transformer added 2015-12-21 18:36:29 +11:00
David Bomba
083e995e2b Working on API Transformers 2015-12-20 08:30:06 +11:00
David Bomba
79bef21e82 Added currency_id to client transformer 2015-12-18 19:33:14 +11:00
Hillel Coren
14152fd3f1 Added HTML formatting to system emails 2015-12-17 20:03:32 +02:00
Hillel Coren
b57866456c Bug fixes 2015-12-17 10:21:31 +02:00
Hillel Coren
c854f6ba16 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-17 10:20:02 +02:00
Hillel Coren
372ffb0ea9 Bug fixes 2015-12-17 10:19:56 +02:00
David Bomba
75fa8566c3 custom taxes boolean added to transformer 2015-12-17 13:33:40 +11:00
Hillel Coren
4dc7a8d5f1 Working on email markup 2015-12-16 13:49:26 +02:00
David Bomba
bc41eb0c42 Working on API 2015-12-15 22:03:01 +11:00
Hillel Coren
e893d74b41 Added company website 2015-12-14 23:05:17 +02:00
Hillel Coren
c5c5ff3458 Working on data import 2015-12-14 22:07:48 +02:00
Hillel Coren
19d5d49e63 Working on #427 2015-12-13 22:12:54 +02:00
Hillel Coren
1783cb5129 Working on data import 2015-12-10 15:35:40 +02:00
Hillel Coren
ff139bc09c Working on data import 2015-12-10 12:57:51 +02:00
Hillel Coren
6fc8f76ea8 Working on data import 2015-12-08 12:10:20 +02:00
Hillel Coren
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
f600cbb6dd Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-07 15:35:02 +02:00
Hillel Coren
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +02:00
David Bomba
def729bfac Added additional fields to invoice transformer 2015-12-04 10:02:31 +11:00
David Bomba
7182078acb Added additional fields to transformer 2015-12-04 10:00:39 +11:00
Hillel Coren
c5a1abf66f Added HTML email designs 2015-12-02 15:26:06 +02:00
Hillel Coren
30631b2bc4 Optimized client view page 2015-11-29 18:00:50 +02:00
Hillel Coren
44336fd7c4 Bug fixes 2015-11-29 12:58:40 +02:00
Hillel Coren
cf458c52a2 Working on the API 2015-11-27 14:55:28 +02:00
Hillel Coren
bc14df4658 Working on invoice CSV import 2015-11-24 22:41:08 +02:00
Hillel Coren
ae57fdf9a3 Updated readme 2015-11-24 21:45:38 +02:00
Hillel Coren
9b0426f4ab Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-21 23:10:35 +02:00
Hillel Coren
61ed298699 Minor improvements 2015-11-21 23:10:26 +02:00
David Bomba
6461ff3d4f added user_id to invoicetransformer 2015-11-21 20:31:31 +11:00
Hillel Coren
d35b0f7f35 Added products to the API 2015-11-19 13:50:35 +02:00
David Bomba
43b6e749c3 transformation of IDs to PUBLIC_IDs 2015-11-19 19:42:53 +11:00
David Bomba
2866201416 swapped out user_id for public_id 2015-11-19 13:58:40 +11:00
Hillel Coren
73a0192446 Working on import 2015-11-18 18:08:37 +02:00
Hillel Coren
5c6b2fe906 Working on import 2015-11-18 16:40:50 +02:00
Hillel Coren
24bcb0e2e5 Merging import changes 2015-11-17 15:53:14 +02:00
Hillel Coren
b4e5690103 Fixed problem creating client with invoice in the API 2015-11-17 10:46:14 +02:00
Hillel Coren
cd3aecdf5b Clarifying email errors 2015-11-16 21:51:34 +02:00
Hillel Coren
3767a8a6a7 Bug fixes 2015-11-16 21:29:22 +02:00
Hillel Coren
e93a7aa915 Bug fixes 2015-11-16 14:30:44 +02:00
David Bomba
325605de8f Merge pull request #527 from turbo124/master 
Flattened API JSON output
 2015-11-15 22:08:13 +11:00
David Bomba
d5cf1279c7 Modifying JSON structure for API 2015-11-15 22:04:06 +11:00
David Bomba
e3c7fa572b Modifying JSON structure for API 2015-11-15 21:43:32 +11:00
Hillel Coren
c7a92e4862 Bug fixes 2015-11-15 11:50:21 +02:00
David Bomba
3ce55d22ef hello 2015-11-14 19:28:17 +11:00
Hillel Coren
f574a79fe6 Improved data export 2015-11-12 22:36:28 +02:00
Hillel Coren
7273e39f1e Bug fixes 2015-11-11 14:17:58 +02:00
David Bomba
36ccb4e331 shift SITE_URL into user_accounts key path 2015-11-10 20:32:45 +11:00
Hillel Coren
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +02:00
Hillel Coren
eed345cff6 Bug fixes 2015-11-09 13:46:53 +02:00