Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity
9,038 Commits 7 Branches 917 Tags 2 GiB
c19cebef80
Commit Graph

353 Commits

Author SHA1 Message Date
Hillel Coren
1f01c006eb Support importing settings 2017-03-22 11:50:55 +02:00
Hillel Coren
929a1e1ee0 Improve order of convert quote activities 2017-03-12 22:01:08 +02:00
Hillel Coren
4c5a5ef941 CSV import improvements 2017-03-09 11:55:11 +02:00
Hillel Coren
3dee1692c2 Improvements to CSV import 2017-03-07 11:09:53 +02:00
Hillel Coren
5f478af9a4 Support creating inline vendors and categories 2017-03-02 18:02:48 +02:00
Hillel Coren
5fb0ee1393 Payment amount greater than invoice amount #1317 2017-03-01 11:51:27 +02:00
Hillel Coren
122937f7d2 Working on supporting custom payment terms 2017-02-26 11:39:25 +02:00
Hillel Coren
b432cb55ba Fix for tests 2017-02-09 14:34:26 +02:00
Hillel Coren
403a30685e Check for default payment method 2017-02-02 08:53:40 +02:00
Hillel Coren
d76edb0fce Fix for custom fields in invoice templates 2017-01-31 14:27:43 +02:00
Hillel Coren
30515c69f3 php-cs-fixer 2017-01-30 21:49:42 +02:00
Hillel Coren
c0fbaf1e89 php-cs-fixer cleanup 2017-01-30 21:40:43 +02:00
Hillel Coren
4da2a7125f php-cs-fixer cleanup 2017-01-30 21:17:56 +02:00
Hillel Coren
1eb83a2642 php-cs-fixer clean up 2017-01-30 18:05:31 +02:00
Hillel Coren
18c8dfefb1 Support recurring invoices in Zapier 2017-01-29 13:30:57 +02:00
Hillel Coren
f9fef333ec Support refunding manual payment 2017-01-16 14:51:43 +02:00
Hillel Coren
00ae1d4a1c Support entering payment for draft invoice 2017-01-13 13:53:06 +02:00
Hillel Coren
511375ba45 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2017-01-10 12:25:35 +02:00
Hillel Coren
91e3f5d7b9 Check for duplicates in the JSON import 2017-01-10 10:50:17 +02:00
David Bomba
6a41353a96 Firebase notifications for Android (#1269) 
* revert error reporting

* fix for non boolean output

* Firebase notifications for Android
 2017-01-10 14:35:30 +11:00
Hillel Coren
7711d0a456 Skip blank rows in CSV import 2017-01-08 16:13:23 +02:00
Hillel Coren
7b92eb62fe Improve export CSV import 2017-01-08 16:02:52 +02:00
Hillel Coren
4596ce4095 Support importing exported files 2017-01-08 14:19:40 +02:00
Hillel Coren
86af13f924 Fix for direct payment links 2017-01-08 13:51:53 +02:00
Hillel Coren
7a58108cd0 Refactored number genrating code 2017-01-04 10:11:32 +02:00
Hillel Coren
1a27e28ff5 Support importing products using JSON 2016-12-25 12:32:11 +02:00
Hillel Coren
67b7d6ff21 Make sure invoice is emailed if auto-billing fails 2016-12-22 19:42:21 +02:00
Hillel Coren
92a60221a5 Adjustments to task projects 2016-12-15 15:11:04 +02:00
Hillel Coren
d1f496023b Adjustments to task projects 2016-12-15 14:17:10 +02:00
Hillel Coren
338f3f0c7f CRUD 2016-12-09 13:17:04 +02:00
Hillel Coren
ad07599e92 Hide draft invoices from the client portal 2016-12-05 00:35:08 +02:00
Hillel Coren
8d8156f580 Hide draft invoices from the client portal 2016-12-04 23:26:38 +02:00
Hillel Coren
55340b8d13 Support editing credits 2016-11-30 20:21:50 +02:00
Hillel Coren
0731165d8f Fix for payment buttons in HTML emails 2016-11-29 20:21:17 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
408aede80a Fix for JSON payment import 2016-11-28 10:55:00 +02:00
Hillel Coren
12fd825de5 Working on datatables on vendor page 2016-11-25 16:02:39 +02:00
Hillel Coren
1323f21867 Working on datatables on client page 2016-11-25 12:53:35 +02:00
Hillel Coren
8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren
b39f2f4ba5 Ensure invoice always has an invitation 2016-10-31 09:06:55 +02:00
Hillel Coren
89088e5517 Fix product list filter 2016-10-18 21:15:08 +03:00
Hillel Coren
147df1ef91 Standardize archive/deleted behaviors 2016-10-10 11:40:04 +03:00
Hillel Coren
32f341f448 Fix for payment refund 2016-10-06 08:44:19 +03:00
Hillel Coren
92698f5c26 Improve expense import 2016-10-05 23:56:48 +03:00
Hillel Coren
48d0b1b9cf Improve expense import 2016-10-05 23:46:15 +03:00
Hillel Coren
a1fcc3519a Support validating OAuth token 2016-10-05 21:51:08 +03:00
Hillel Coren
7bd4026e4c Working on importing expenses 2016-10-02 10:10:28 +03:00
Hillel Coren
249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren
b35c44b1e8 Fixes for JSON import 2016-08-15 21:37:47 +03:00
Hillel Coren
f8fda5f241 Working on the bot 2016-08-07 22:42:32 +03:00
Hillel Coren
8dc1786eb2 Fix for archiving API token 2016-08-02 17:38:51 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren
7bb8f0ca4a Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
 2016-07-20 10:49:08 +03:00
Hillel Coren
0caa865f7d Fix for approving quotes 2016-07-20 10:03:46 +03:00
Hillel Coren
a0817d8de3 Check for payment driver 2016-07-19 20:15:03 +03:00
Hillel Coren
9d4c6a12dd Use credits when autobilling invoices 2016-07-19 20:12:28 +03:00
Hillel Coren
bd70b4596c Add batch limits for hosted imports 2016-07-19 18:57:01 +03:00
Hillel Coren
401851e212 Working on buy now buttons 2016-07-12 23:46:41 +03:00
Hillel Coren
b233aa0744 Merge branch 'release-2.6' 
Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php
 2016-07-11 23:33:58 +03:00
Hillel Coren
e6b60c6f1a Working on expense categories 2016-07-07 11:03:43 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Hillel Coren
b5f606df47 Added and as email template variables 2016-07-04 21:47:05 +03:00
Hillel Coren
637f298818 Fix for approving quote 2016-07-04 13:21:40 +03:00
Hillel Coren
9dffc95eab Fixes for refactor 2016-07-04 10:02:18 +03:00
Holger Lösken
0fbda85a59 Code Refactoring 
- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax
 2016-07-03 16:19:22 +00:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
Hillel Coren
1e837c2368 Clarified/documented refund logic 2016-06-07 10:54:20 +03:00
Joshua Dwire
5eb76df20e Fix refunds on Stripe 2016-06-05 15:06:34 -04:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration 
Wepay integration
 2016-06-03 11:20:31 +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
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
8df844ea26 Fix for quotes list action dropdown 2016-05-29 15:45:37 +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
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Joshua Dwire
d19a3715f9 Warn user when editing an ACH auto bill invoice 2016-05-25 11:07:20 -04: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
1f11d88d6b Store ip addresses for payments and payment methods 2016-05-24 18:00:59 -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
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
Hillel Coren
ef65bb7d84 Merge pull request #879 from joshuadwire/wepay-integration 
Wepay integration - Part 3
 2016-05-18 19:22:44 +03:00
Joshua Dwire
f0d276be4c Listen for WePay IPNs 2016-05-18 09:51:20 -04:00
Hillel Coren
2e1d340d27 Merge pull request #875 from joshuadwire/wepay-integration 
Wepay integration - Part 2
 2016-05-17 22:25:59 +03:00
Joshua Dwire
4f3bb7eeb4 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-17 15:07:53 -04:00
Joshua Dwire
43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04: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
a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -04:00
Hillel Coren
6b203fcd5e Fix for creating vendors when importing OFX transactions 2016-05-15 14:07:04 +03:00
Hillel Coren
46cf89361f Support manually importing OFX files 2016-05-15 14:06:25 +03:00
Hillel Coren
b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Joshua Dwire
919aec2192 Better refund handling 2016-05-14 23:03:39 -04:00
Joshua Dwire
65feee34e3 Fox expiration off-by-one error 2016-05-14 22:43:55 -04:00
Joshua Dwire
8bc8b384c5 Fix auto bill error when the user hasn't entered payment information 2016-05-14 22:38:09 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
Joshua Dwire
573c17431f More bug fixes 2016-05-11 14:12:52 -04:00
Joshua Dwire
0d41d8aeb6 Payments bug fixes - Part 2 2016-05-11 12:53:43 -04:00
Joshua Dwire
581ae1baa6 Handle currency not set 2016-05-11 11:30:45 -04:00
Joshua Dwire
981045b28b Better Stripe support 2016-05-11 09:57:44 -04:00
Joshua Dwire
258401715c Update billing address when adding payment method 2016-05-10 22:15:32 -04:00
Joshua Dwire
cc5cb091d7 Store Braintree card summary locally 2016-05-10 19:16:53 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
cf9dbae1d1 Remove duplicate Auth include 2016-05-08 09:33:19 +03:00
Hillel Coren
bacf5bf856 Merge branch 'laravel-acl' of git://github.com/joshuadwire/invoiceninja into joshuadwire-laravel-acl 
Conflicts:
	app/Providers/AuthServiceProvider.php
 2016-05-08 09:27:18 +03:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Joshua Dwire
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Joshua Dwire
815ab471a1 Fix auth bug 2016-05-06 14:55:26 -04:00
Joshua Dwire
475f5430f3 Update BaseService.php 2016-05-06 14:54:58 -04:00
Joshua Dwire
7469ea998c Use new ACL for refunds 2016-05-06 14:19:58 -04:00
Joshua Dwire
9ed44bdfe4 Merge pull request #4 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 14:17:16 -04:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Joshua Dwire
913c6eeff0 Fix error; don't let users try to refund failed or already refunded payments 2016-05-02 18:04:57 -04:00
Hillel Coren
e6bcdb36b3 Removed extra entity load in the repos save function 2016-05-02 20:42:13 +03:00
Hillel Coren
2e2470e11c Send contact's email when creating Stripe token 2016-05-01 09:43:41 +03:00
Joshua Dwire
d78b874838 Add Plaid support 2016-04-30 22:45:51 -04: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
4f926ec8b8 Fix for permissions in base service 2016-04-27 19:13:29 +03:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Hillel Coren
2712f92422 Merge pull request #826 from joshuadwire/laravel-acl 
Laravel ACL
 2016-04-26 23:29:53 +03:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire
b57ebbf8aa Fix card expiration formatting; store card details from all payment triggers 2016-04-25 10:06:27 -04:00
Hillel Coren
604c132a3a Temporary workaround to support not setting the CVC/CVV 2016-04-24 16:14:35 +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
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +03:00
DraperStudio
c67564823b Use initialize method to set configuration 2016-04-19 22:02:46 +02: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
Joshua Dwire
030d4ed4da Fix renewals; fix plan edge cases 2016-04-16 22:09:01 -04:00
Joshua Dwire
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Hillel Coren
3303c00067 Fix for Cybersource 2016-04-11 22:09:05 +03:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
ec1bc6f2cf Bug fixes 2016-03-17 10:11:14 -04:00