Merge branch 'master' of github.com:invoiceninja/invoiceninja

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,7 +9,7 @@ assignees: ''
 
 **What version of Invoice Ninja are you running? ie v4.5.25 / v5.0.30**
 
-**What environment are you running?
+**What environment are you running?**
 Docker
 Shared Hosting
 ZIP

.travis.yml

@@ -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
 

app/Traits/GenerateMigrationResources.php

@@ -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' => '',
@@ -1711,6 +1717,7 @@ trait GenerateMigrationResources
         $fees_and_limits->fee_tax_rate2 = $ags->tax_rate2;
         $fees_and_limits->fee_tax_name3 = '';
         $fees_and_limits->fee_tax_rate3 = 0;
+        $fees_and_limits->is_enabled = true;
 
         return $fees_and_limits;
        // $data = [];

composer.json

@@ -28,8 +28,8 @@
         "cerdic/css-tidy": "~v1.5",
         "chumper/datatable": "dev-add-back-options",
         "cleverit/ubl_invoice": "1.*",
-        "codedge/laravel-selfupdater": "5.x-dev",
+        "codedge/laravel-selfupdater": "2.2.0",
-        "collizo4sky/omnipay-wepay": "dev-address-fix",
+        "collizo4sky/omnipay-wepay": "dev-address-fix#942f3e0",
         "digitickets/omnipay-gocardlessv2": "dev-payment-fix",
         "doctrine/dbal": "2.5.x",
         "dompdf/dompdf": "0.6.2",
@@ -38,12 +38,11 @@
         "google/apiclient": "^2.0",
         "guzzlehttp/guzzle": "^6.3",
         "intervention/image": "dev-master",
-        "invoiceninja/omnipay-collection": "^0.10.0",
         "jaybizzle/laravel-crawler-detect": "1.*",
         "jlapp/swaggervel": "master-dev",
         "jonnyw/php-phantomjs": "dev-fixes",
         "laracasts/presenter": "dev-master",
-        "laravel/framework": "5.5.*",
+        "turbo124/framework": "5.5.51",
         "laravel/legacy-encrypter": "^1.0",
         "laravel/socialite": "3.0.x-dev",
         "laravel/tinker": "^1.0",
@@ -59,11 +58,9 @@
         "nwidart/laravel-modules": "2.0.*",
         "omnipay/authorizenet": "dev-solution-id as 2.5.0",
         "omnipay/firstdata": "^2.4",
-        "omnipay/payfast": "dev-master",
         "patricktalmadge/bootstrapper": "5.5.x",
-        "pragmarx/google2fa-laravel": "^0.1.2",
+        "turbo124/google2fa-laravel": "0.1.2",
         "predis/predis": "^1.1",
-        "roave/security-advisories": "dev-master",
         "simshaun/recurr": "dev-master",
         "stripe/stripe-php": "^6.40",
         "symfony/css-selector": "~3.1",
@@ -71,7 +68,35 @@
         "webpatser/laravel-countries": "dev-master#75992ad",
         "websight/l5-google-cloud-storage": "dev-master",
         "wepay/php-sdk": "^0.2",
-        "wildbit/postmark-php": "^2.5"
+        "wildbit/postmark-php": "^2.5",
+        "abdala/omnipay-pagseguro": "0.2",
+        "agmscode/omnipay-agms": "~1.0",
+        "andreas22/omnipay-fasapay": "1.*",
+        "bramdevries/omnipay-paymill": "^1.0",
+        "cardgate/omnipay-cardgate": "~2.0",
+        "delatbabel/omnipay-fatzebra": "dev-master",
+        "dercoder/omnipay-ecopayz": "~1.0",
+        "dercoder/omnipay-paysafecard": "dev-master",
+        "digitickets/omnipay-barclays-epdq": "~3.0",
+        "digitickets/omnipay-datacash": "~3.0",
+        "digitickets/omnipay-realex": "~5.0",
+        "fotografde/omnipay-checkoutcom": "~2.0",
+        "fruitcakestudio/omnipay-sisow": "~2.0",
+        "justinbusschau/omnipay-secpay": "~2.0",
+        "lokielse/omnipay-alipay": "~1.4",
+        "meebio/omnipay-creditcall": "dev-master",
+        "meebio/omnipay-secure-trading": "dev-master",
+        "mfauveau/omnipay-pacnet": "~2.0",
+        "omnipay/bitpay": "dev-master",
+        "omnipay/braintree": "^1.1",
+        "omnipay/gocardless": "dev-master",
+        "omnipay/mollie": "3.*",
+        "omnipay/omnipay": "~2.3",
+        "omnipay/payfast": "~2.0",
+        "omnipay/stripe": "~2.0",
+        "softcommerce/omnipay-paytrace": "~1.0",
+        "vink/omnipay-komoju": "~1.0",
+        "omnipay/common": "2.5.2"
     },
     "require-dev": {
         "symfony/dom-crawler": "~3.1",
@@ -158,6 +183,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/davidbankes/omnipay-firstdata.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/hillelcoren/omnipay-authorizenet"  
         }
     ]
 }

database/migrations/2021_01_22_101548_remove_cyber_source_gateway.php

@@ -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()
+    {
+        //
+    }
+}

database/seeds/PaymentLibrariesSeeder.php

@@ -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'],