mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 10:17:33 -04:00 
			
		
		
		
	Merge branch 'master' of https://github.com/turbo124/invoiceninja
This commit is contained in:
		
						commit
						71146c9c94
					
				| @ -10,6 +10,7 @@ group: deprecated-2017Q4 | ||||
| 
 | ||||
| php: | ||||
|   - 7.2 | ||||
|   - 7.3 | ||||
| 
 | ||||
| addons: | ||||
|   hosts: | ||||
| @ -29,7 +30,7 @@ env: | ||||
| before_install: | ||||
|   # set GitHub token and update composer | ||||
|   - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; | ||||
|   - composer self-update && composer -V | ||||
|   - composer self-update 1.10.19 && composer -V | ||||
| #  - export USE_ZEND_ALLOC=0 | ||||
|   - rvm use 1.9.3 --install --fuzzy | ||||
| 
 | ||||
|  | ||||
| @ -361,7 +361,7 @@ if (! defined('APP_NAME')) { | ||||
|     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); | ||||
|     define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); | ||||
|     define('NINJA_DATE', '2000-01-01'); | ||||
|     define('NINJA_VERSION', '4.5.29' . env('NINJA_VERSION_SUFFIX')); | ||||
|     define('NINJA_VERSION', '4.5.31' . env('NINJA_VERSION_SUFFIX')); | ||||
|     define('NINJA_TERMS_VERSION', '1.0.1'); | ||||
| 
 | ||||
|     define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); | ||||
|  | ||||
| @ -203,6 +203,10 @@ trait GenerateMigrationResources | ||||
|         $clients = []; | ||||
| 
 | ||||
|         foreach ($this->account->clients()->withTrashed()->get() as $client) { | ||||
|              | ||||
|             $number = $client->id_number; | ||||
|             $id_number = ''; | ||||
|    | ||||
|             $clients[] = [ | ||||
|                 'id' => $client->id, | ||||
|                 'company_id' => $client->account_id, | ||||
| @ -223,7 +227,8 @@ trait GenerateMigrationResources | ||||
|                 'size_id' => $client->size_id, | ||||
|                 'is_deleted' => $client->is_deleted, | ||||
|                 'vat_number' => $client->vat_number, | ||||
|                 'id_number' => $client->id_number, | ||||
|                 'id_number' => $id_number, | ||||
|                 'number' => $number, | ||||
|                 'custom_value1' => $client->custom_value1, | ||||
|                 'custom_value2' => $client->custom_value2, | ||||
|                 'shipping_address1' => $client->shipping_address1, | ||||
| @ -1612,7 +1617,8 @@ trait GenerateMigrationResources | ||||
|                 //'size_id' => $vendor->size_id,
 | ||||
|                 'is_deleted' => $vendor->is_deleted, | ||||
|                 'vat_number' => $vendor->vat_number, | ||||
|                 'id_number' => $vendor->id_number, | ||||
|                 'id_number' => null, | ||||
|                 'number' => $vendor->id_number, | ||||
|                 'custom_value1' => $vendor->custom_value1, | ||||
|                 'custom_value2' => $vendor->custom_value2, | ||||
|                 'custom_value3' => '', | ||||
|  | ||||
| @ -183,6 +183,10 @@ | ||||
|         { | ||||
|             "type": "vcs", | ||||
|             "url": "https://github.com/davidbankes/omnipay-firstdata.git" | ||||
|         }, | ||||
|         { | ||||
|             "type": "vcs", | ||||
|             "url": "https://github.com/hillelcoren/omnipay-authorizenet"   | ||||
|         } | ||||
|     ] | ||||
| } | ||||
|  | ||||
							
								
								
									
										618
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										618
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							| @ -4,7 +4,7 @@ | ||||
|         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", | ||||
|         "This file is @generated automatically" | ||||
|     ], | ||||
|     "content-hash": "9def12c786458c271816b1e2c24d754f", | ||||
|     "content-hash": "0dd03f115e3c89e9594b6965d0b469f4", | ||||
|     "packages": [ | ||||
|         { | ||||
|             "name": "abdala/omnipay-pagseguro", | ||||
| @ -713,12 +713,6 @@ | ||||
|                 "phpstorm", | ||||
|                 "sublime" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/barryvdh", | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-08-10T08:22:48+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -1286,20 +1280,6 @@ | ||||
|                 "ssl", | ||||
|                 "tls" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://packagist.com", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/composer", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/composer/composer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-12T12:10:35+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -1378,20 +1358,6 @@ | ||||
|                 "dependency", | ||||
|                 "package" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://packagist.com", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/composer", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/composer/composer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-12-03T16:20:39+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -1454,20 +1420,6 @@ | ||||
|                 "validation", | ||||
|                 "versioning" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://packagist.com", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/composer", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/composer/composer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-13T08:59:24+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -1528,20 +1480,6 @@ | ||||
|                 "spdx", | ||||
|                 "validator" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://packagist.com", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/composer", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/composer/composer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-12-03T16:04:16+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -1586,20 +1524,6 @@ | ||||
|                 "Xdebug", | ||||
|                 "performance" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://packagist.com", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/composer", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/composer/composer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-13T08:04:11+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -2229,20 +2153,6 @@ | ||||
|                 "redis", | ||||
|                 "xcache" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://www.doctrine-project.org/sponsorship.html", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://www.patreon.com/phpdoctrine", | ||||
|                     "type": "patreon" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-07-07T18:54:01+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -2530,20 +2440,6 @@ | ||||
|                 "uppercase", | ||||
|                 "words" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://www.doctrine-project.org/sponsorship.html", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://www.patreon.com/phpdoctrine", | ||||
|                     "type": "patreon" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-05-29T07:19:59+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -2606,20 +2502,6 @@ | ||||
|                 "parser", | ||||
|                 "php" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://www.doctrine-project.org/sponsorship.html", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://www.patreon.com/phpdoctrine", | ||||
|                     "type": "patreon" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-05-25T17:44:05+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -2719,12 +2601,6 @@ | ||||
|                 "validation", | ||||
|                 "validator" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/egulias", | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-12-29T14:50:06+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -4180,16 +4056,6 @@ | ||||
|                 "thumbnail", | ||||
|                 "watermark" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://www.paypal.me/interventionphp", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/Intervention", | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-06T15:12:52+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -4769,20 +4635,6 @@ | ||||
|                 } | ||||
|             ], | ||||
|             "description": "Update helper", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/kylekatarnls", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://opencollective.com/Carbon", | ||||
|                     "type": "open_collective" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-04-07T20:44:10+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -5142,12 +4994,6 @@ | ||||
|                 "transform", | ||||
|                 "write" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/sponsors/nyamsprod", | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-12-10T19:40:30+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -5233,12 +5079,6 @@ | ||||
|                 "sftp", | ||||
|                 "storage" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://offset.earth/frankdejonge", | ||||
|                     "type": "other" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-08-23T07:39:11+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -5438,16 +5278,6 @@ | ||||
|                 } | ||||
|             ], | ||||
|             "description": "Mime-type detection for Flysystem", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/frankdejonge", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/league/flysystem", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-18T20:58:21+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -6078,16 +5908,6 @@ | ||||
|                 "logging", | ||||
|                 "psr-3" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/Seldaek", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-12-14T12:56:38+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -6306,12 +6126,6 @@ | ||||
|                 "object", | ||||
|                 "object graph" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-13T09:40:50+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -8764,20 +8578,6 @@ | ||||
|                 "x.509", | ||||
|                 "x509" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/terrafrost", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://www.patreon.com/phpseclib", | ||||
|                     "type": "patreon" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-16T17:35:19+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -8908,12 +8708,6 @@ | ||||
|                 "predis", | ||||
|                 "redis" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/sponsors/tillkruss", | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-09-11T19:18:05+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -9666,16 +9460,6 @@ | ||||
|                 "parser", | ||||
|                 "validator" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/Seldaek", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-11T09:19:24+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -9992,16 +9776,6 @@ | ||||
|                 "mail", | ||||
|                 "mailer" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-12T09:35:59+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10061,20 +9835,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Config Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10142,20 +9902,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Console Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10204,20 +9950,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony CssSelector Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10269,20 +10001,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Debug Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10349,20 +10067,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony DependencyInjection Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10468,20 +10172,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Filesystem Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10526,20 +10216,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Finder Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-16T17:02:08+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10589,20 +10265,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony HttpFoundation Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10688,20 +10350,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony HttpKernel Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-27T08:42:42+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10751,20 +10399,6 @@ | ||||
|                 "configuration", | ||||
|                 "options" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10827,20 +10461,6 @@ | ||||
|                 "polyfill", | ||||
|                 "portable" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-07T16:49:33+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10904,20 +10524,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-07T16:49:33+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -10988,20 +10594,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-07T16:49:33+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11069,20 +10661,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-07T17:09:11+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11146,20 +10724,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-07T16:49:33+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11211,20 +10775,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-23T14:02:19+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11276,20 +10826,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-23T14:02:19+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11349,20 +10885,6 @@ | ||||
|                 "portable", | ||||
|                 "shim" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-07T16:49:33+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11407,20 +10929,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Process Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11492,20 +11000,6 @@ | ||||
|                 "uri", | ||||
|                 "url" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11643,20 +11137,6 @@ | ||||
|                 "interoperability", | ||||
|                 "standards" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-09-02T16:08:58+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11721,20 +11201,6 @@ | ||||
|                 "debug", | ||||
|                 "dump" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -11789,20 +11255,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony Yaml Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -12323,16 +11775,6 @@ | ||||
|             "keywords": [ | ||||
|                 "templating" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/twig/twig", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-05T10:10:05+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -12443,16 +11885,6 @@ | ||||
|                 "env", | ||||
|                 "environment" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/GrahamCampbell", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2021-01-20T14:39:13+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -13515,20 +12947,6 @@ | ||||
|                 "constructor", | ||||
|                 "instantiate" | ||||
|             ], | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://www.doctrine-project.org/sponsorship.html", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://www.patreon.com/phpdoctrine", | ||||
|                     "type": "patreon" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-10T18:47:58+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -14253,12 +13671,6 @@ | ||||
|             ], | ||||
|             "description": "Looks up which function or method a line of code belongs to", | ||||
|             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://github.com/sebastianbergmann", | ||||
|                     "type": "github" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-11-30T08:15:22+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -14781,20 +14193,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony BrowserKit Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-12-18T07:41:31+00:00" | ||||
|         }, | ||||
|         { | ||||
| @ -14847,20 +14245,6 @@ | ||||
|             ], | ||||
|             "description": "Symfony DomCrawler Component", | ||||
|             "homepage": "https://symfony.com", | ||||
|             "funding": [ | ||||
|                 { | ||||
|                     "url": "https://symfony.com/sponsor", | ||||
|                     "type": "custom" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://github.com/fabpot", | ||||
|                     "type": "github" | ||||
|                 }, | ||||
|                 { | ||||
|                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", | ||||
|                     "type": "tidelift" | ||||
|                 } | ||||
|             ], | ||||
|             "time": "2020-10-24T10:57:07+00:00" | ||||
|         }, | ||||
|         { | ||||
|  | ||||
| @ -0,0 +1,38 @@ | ||||
| <?php | ||||
| 
 | ||||
| use App\Models\Gateway; | ||||
| use Illuminate\Database\Migrations\Migration; | ||||
| use Illuminate\Database\Schema\Blueprint; | ||||
| use Illuminate\Support\Facades\Schema; | ||||
| 
 | ||||
| class RemoveCyberSourceGateway extends Migration | ||||
| { | ||||
|     /** | ||||
|      * Run the migrations. | ||||
|      * | ||||
|      * @return void | ||||
|      */ | ||||
|     public function up() | ||||
|     { | ||||
| 
 | ||||
|         /* No longer supported for V2 Omnipay */ | ||||
|          | ||||
|         if(Gateway::count() > 0) | ||||
|         { | ||||
|             $cyber = Gateway::where('provider', 'Cybersource')->first(); | ||||
|             $cyber->payment_library_id = 2; | ||||
|             $cyber->save(); | ||||
|         } | ||||
| 
 | ||||
|     } | ||||
| 
 | ||||
|     /** | ||||
|      * Reverse the migrations. | ||||
|      * | ||||
|      * @return void | ||||
|      */ | ||||
|     public function down() | ||||
|     { | ||||
|         //
 | ||||
|     } | ||||
| } | ||||
| @ -57,7 +57,7 @@ class PaymentLibrariesSeeder extends Seeder | ||||
|             ['name' => 'Cardgate', 'provider' => 'Cardgate'], | ||||
|             ['name' => 'Checkout.com', 'provider' => 'CheckoutCom'], | ||||
|             ['name' => 'Creditcall', 'provider' => 'Creditcall'], | ||||
|             ['name' => 'Cybersource', 'provider' => 'Cybersource'], | ||||
|             ['name' => 'Cybersource', 'provider' => 'Cybersource', 'payment_library_id' => 2], | ||||
|             ['name' => 'ecoPayz', 'provider' => 'Ecopayz'], | ||||
|             ['name' => 'Fasapay', 'provider' => 'Fasapay'], | ||||
|             ['name' => 'Komoju', 'provider' => 'Komoju'], | ||||
|  | ||||
| @ -59,7 +59,7 @@ author = u'Invoice Ninja' | ||||
| # The short X.Y version. | ||||
| version = u'4.5' | ||||
| # The full version, including alpha/beta/rc tags. | ||||
| release = u'4.5.29' | ||||
| release = u'4.5.31' | ||||
| 
 | ||||
| # The language for content autogenerated by Sphinx. Refer to documentation | ||||
| # for a list of supported languages. | ||||
|  | ||||
| @ -3897,11 +3897,30 @@ $LANG = array( | ||||
|     'show_product_discount_help' => 'Display a line item discount field', | ||||
|     'tax_name3' => 'Tax Name 3', | ||||
|     'debug_mode_is_enabled' => 'Debug mode is enabled', | ||||
|     'debug_mode_is_enabled_help' => 'Warning: it is intented for use on local machines, it can leak credentials. Click to learn more.', | ||||
|     'debug_mode_is_enabled_help' => 'Warning: it is intended for use on local machines, it can leak credentials. Click to learn more.', | ||||
|     'running_tasks' => 'Running Tasks', | ||||
|     'recent_tasks' => 'Recent Tasks', | ||||
|     'recent_expenses' => 'Recent Expenses', | ||||
|     'upcoming_expenses' => 'Upcoming Expenses', | ||||
|     'search_payment_term' => 'Search 1 Payment Term', | ||||
|     'search_payment_terms' => 'Search :count Payment Terms', | ||||
|     'save_and_preview' => 'Save and Preview', | ||||
|     'save_and_email' => 'Save and Email', | ||||
|     'converted_balance' => 'Converted Balance', | ||||
|     'is_sent' => 'Is Sent', | ||||
|     'document_upload' => 'Document Upload', | ||||
|     'document_upload_help' => 'Enable clients to upload documents', | ||||
|     'expense_total' => 'Expense Total', | ||||
|     'enter_taxes' => 'Enter Taxes', | ||||
|     'by_rate' => 'By Rate', | ||||
|     'by_amount' => 'By Amount', | ||||
|     'enter_amount' => 'Enter Amount', | ||||
|     'before_taxes' => 'Before Taxes', | ||||
|     'after_taxes' => 'After Taxes', | ||||
|     'color' => 'Color', | ||||
|     'show' => 'Show', | ||||
|     'empty_columns' => 'Empty Columns', | ||||
|     'project_name' => 'Project Name', | ||||
| ); | ||||
| 
 | ||||
| return $LANG; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user