8990 Commits

Author SHA1 Message Date
Dan Holliday
2ef88fb859 Update GoCardlessV2RedirectPaymentDriver.php
Fixed an issue where payments from gocardless were being logged as ACH payments incorrectly.  This then stops the auto billing working for gocardless.
2020-04-07 15:47:49 +01:00
Hillel Coren
b6e925381c Update lang files 2020-04-02 08:51:16 +03:00
Hillel Coren
7f43913a3c Update version 2020-03-31 19:57:40 +03:00
Hillel Coren
762b06667c Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2020-03-31 13:01:02 +03:00
Hillel Coren
eb676a3b9d Update languages 2020-03-31 13:00:20 +03:00
Kristian Feldsam
ecc5a00600
Reports - Added "Total" of all currencies (#3518)
* Reports -  Invoices - Added TAX to totals

Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

* Reports - Add totals calculated from all currencies

Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
2020-03-24 19:51:37 +11:00
Kristian Feldsam
5f5a1a6740
Fix ExportReportResults (#3506)
Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
2020-03-24 19:51:11 +11:00
Hillel Coren
bfd13719c9 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2020-03-15 10:12:06 +02:00
Hillel Coren
84e344b61b Fix typo in texts 2020-03-15 10:11:59 +02:00
Braunson Yager
86750892b5
Fixed Postmark API env variable (#3444)
As per #3443
2020-03-07 09:06:37 +11:00
Hillel Coren
1ed3c9df1f Update lang file 2020-03-01 09:57:50 +02:00
Hillel Coren
91e67eef75 Update lang file 2020-02-23 12:39:23 +02:00
Hillel Coren
6974bab120 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2020-02-23 12:32:16 +02:00
Hillel Coren
fc3074ad51 Fix for localizaition 2020-02-23 12:32:04 +02:00
David Bomba
a98ad5ba02 Additional fixes for Checkout.com 2020-02-17 06:52:43 +11:00
David Bomba
aadda80988
fixes for checkout.com (#3337) 2020-02-16 17:41:23 +11:00
David Bomba
139e0a4b0e
Update credit_card.blade.php 2020-02-12 07:54:36 +11:00
David Bomba
d45ae2c50b
Revert "Revert "Export settings with company array (#3264)" (#3265)" (#3266)
This reverts commit ddf376090a9b477464c1eea69b65819038a94602.
2020-01-30 12:25:44 +11:00
David Bomba
ddf376090a
Revert "Export settings with company array (#3264)" (#3265)
This reverts commit ab4a44ff18ffd9d0370e5f978fa7ee4f59eb6672.
2020-01-30 12:24:55 +11:00
Benjamin Beganović
ab4a44ff18
Export settings with company array (#3264) 2020-01-30 12:24:38 +11:00
Hillel Coren
58a09087db Fix for postmark logs 2020-01-28 19:54:24 +02:00
Benjamin Beganović
161161f628 (Patched) Export contacts with client array #3251 (#3253) 2020-01-28 07:55:35 +11:00
David Bomba
0ffa9a971d Remove last_login from migration array of clients 2020-01-24 13:16:02 +11:00
David Bomba
536c9c4a82 Fixes for export attributes 2020-01-23 09:47:50 +11:00
Benjamin Beganović
869967ba6a (v1): Export data for migration (#3238)
* Scaffold migration controller & steps

* - Basic controller scaffold
- Intro step
- Downloading data

* Import step for the v2

* Export file using account_key property

* Fix button displaying

* Client export mappings

* Company export mappings

* Add withTrashed() for clients

* Export users mappings

* Export invoices mappings

* Export company properties as array

* add withTrashed() for invoices

* Downloading the json file

* Fix 'account_id' for company export
- Code cleanup & leftovers

* Creating zip for logo & storing json as file (wip)

* Zipping & sending migration files (wip)

* Exporting & mappings for quotes

* Re-enable headers for downloading

* Mappings for tax rates

* Mappings for the products

* Fix formattings & php doc messages

* Bring back headers for downloading

* Export 'company_id', 'user_id' with clients

* Export 'id' with users resource

* Remove unused parameter

* Export mappings for payments

* Export 'line_items' with invoices

* Export credits & export client id

* Export 'credits' within main JSON

* Mappings for line_items

* Fix 'is_amount_discount' for invoice export

* Exporting migration file as .zip archive

* Improve settings card for migration

* Removed duplicated keys in texts.php for en

* Fix formatting in en/texts.php

* Integrate the migration part with rest of UI

* Export company as object, not array

* Clean up

* Fixes for V1

* Apply formatting

* Remove comments
- Added 'ext-zip' in composer.json
- Fixed $credits transform

* Remove unused params

Co-authored-by: David Bomba <turbo124@gmail.com>
2020-01-23 08:09:22 +11:00
Rob Peck
1d1c650648 Allow tasks to be associated with products, and pass that data through to the invoice. (#3205) 2020-01-22 08:28:45 +11:00
trevDev()
7c8d9f5c24 allow scrolling in time-tracker task form (#3215) 2020-01-16 20:59:47 +10:00
Hillel Coren
af7510a194 Update prices 2019-12-22 08:54:39 +02:00
Hillel Coren
cb62e92af0 Update version 2019-12-03 11:54:03 +02:00
Hillel Coren
8aa90e1bb7 Minor fixes 2019-12-03 11:28:19 +02:00
Hillel Coren
6bbcad249d Minor fixes 2019-12-03 11:27:50 +02:00
David Bomba
9284d76481
Fixes for Ticket Mailer (#3084)
* Fixes for tickets

* Fixes for markInvitationSent
2019-11-20 18:19:27 +11:00
David Bomba
3c82ba1343
Fixes for tickets (#3083) 2019-11-20 18:12:11 +11:00
Hillel Coren
419d9ea5eb Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2019-11-20 08:43:40 +02:00
Hillel Coren
19080af049 Import currency fix 2019-11-20 08:43:30 +02:00
David Bomba
14ed415051
Fix for regression
Fixes an issue where client statements were not generating. using dispatch_now fixes this as the returning object is not a boolean, but the required payload.
2019-11-14 22:09:43 +11:00
Hillel Coren
b71f32a3af Update lang files 2019-11-04 11:00:57 +02:00
Hillel Coren
5255997eba Fix for mobile translations file 2019-11-04 11:00:43 +02:00
Hillel Coren
3e4bd48ed3 Update lang files 2019-10-27 11:53:55 +02:00
Hillel Coren
ddf2502df3 Minor fixes 2019-10-27 11:41:55 +02:00
Hillel Coren
76153812dc
Merge pull request #3018 from maty-arch/clone-tasks
clone tasks
2019-10-25 04:13:15 +03:00
maty-arch
dc62abd766 clone tasks 2019-10-24 21:31:35 +02:00
Christopher Di Carlo
0fccf69e62 Allow module trans helper to replace values (#3006) 2019-10-22 13:29:22 +11:00
Christopher Di Carlo
429f079cf5 Update fire method reference to handle due to Laravel 5.5 update (#3003) 2019-10-19 13:05:04 +11:00
Christopher Di Carlo
c1f8f93c7f Fix JS when default value not specified for SimpleSelectComponent (#2974) 2019-10-09 17:48:20 +11:00
Christopher Di Carlo
bdd73414c9 Fixed typo (#2972)
Fixed missing character for stub variable
2019-10-09 17:46:25 +11:00
Christopher Di Carlo
f3c6e1148c Fixed incorrect module name expansion (#2971) 2019-10-08 08:19:24 +11:00
Hillel Coren
e106eda7e2 Update lang files 2019-10-06 12:26:26 +03:00
Hillel Coren
21c4721942 Bug fixes 2019-09-29 12:29:51 +03:00
Hillel Coren
ae672a25b1 Duplicate payments 2019-09-29 12:02:51 +03:00